tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option. @@ -4238,8 +3127,7 @@ .fi .TP 3 \-title\ title -\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. -.LP +\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. .TP 3 \-header\ header Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped. @@ -4249,28 +3137,30 @@ % \fP\f3javadoc \-header "Java 2 Platform v1.4" com.mypackage\fP .fl .fi -.LP .TP 3 \-footer\ footer Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped. -.LP +.TP 3 +\-top +Specifies the text to be placed at the top of each output file. .TP 3 \-bottom\ text -Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. -.LP +Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. .TP 3 \-link\ extdocURL -Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: -.LP +Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: .RS 3 .TP 2 o -\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. -.LP -You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. -.LP -When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. -.LP +\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. +.br +.br +You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. +.br +.br +When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. +.br +.br In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the .na \f2URL Memo\fP @ @@ -4288,8 +3178,11 @@ \f2\-link <directory>/<directory>/.../<name>\fP .RE .RE -.LP -You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. \f3Choosing between \-linkoffline and \-link\fP: +You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. +.br +.br +\f3Choosing between \-linkoffline and \-link\fP: +.br .br Use \f2\-link\fP: .RS 3 @@ -4306,16 +3199,17 @@ o when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side. .RE -.LP +.br +.br \f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running: @@ -4325,17 +3219,21 @@ % \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP .fl .fi -.LP -Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). -.LP -\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. -.LP -Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) -.LP -This option can create links in several places in the generated documentation. -.LP -Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. -.LP +Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). +.br +.br +\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. +.br +.br +Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) +.br +.br +This option can create links in several places in the generated documentation. +.br +.br +Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. +.br +.br \f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced: .RS 3 .TP 2 @@ -4353,16 +3251,17 @@ .br The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement. .RE -.LP -An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. -.LP -\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. -.LP +An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. +.br +.br +\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. +.br +.br For example, the package list for the Java SE 6 API is located at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list. and starts as follows: +http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows: .nf \f3 .fl @@ -4384,31 +3283,39 @@ .fl \fP .fi -.LP -When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. -.LP -In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. -.LP -\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. -.LP -Specify a different link option for each external document to link to: -.LP -\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP -.LP -where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. -.LP -\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. -.LP -In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. -.LP +When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. +.br +.br +In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. +.br +.br +\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. +.br +.br +Specify a different link option for each external document to link to: +.br +.br +\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP +.br +.br +where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. +.br +.br +\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. +.br +.br +In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. .TP 3 \-linkoffline\ extdocURL\ packagelistLoc -This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. -.LP -More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. -.LP -Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. -.LP +This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. +.br +.br +More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. +.br +.br +Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. +.br +.br The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP: .RS 3 .TP 2 @@ -4418,35 +3325,39 @@ o \f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename. .RE -.LP -You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) -.LP -\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://java.sun.com/javase/6/docs/api\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at +You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) +.br +.br +\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi -.LP -\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. -.LP -\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. -.LP -\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): -.LP +\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. +.br +.br +\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. +.br +.br +\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): +.br +.br \f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP .br \f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP .br -\f2\ \ \ \ \ \ \ \ \ \ ...\fP -.LP -\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. -.LP +\f2\ \ \ \ \ \ \ \ \ \ ...\fP +.br +.br +\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. +.br +.br First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update: .nf \f3 @@ -4454,14 +3365,15 @@ % \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP .fl .fi -When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. -.LP +When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. .TP 3 \-linksource\ -Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. -.LP -\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. -.LP +Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. +.br +.br +\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. +.br +.br Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button": .nf \f3 @@ -4482,7 +3394,6 @@ .fl \fP .fi -.LP .TP 3 \-group\ groupheading\ packagepattern:packagepattern:... Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP. @@ -4494,16 +3405,12 @@ o \f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP). .RE -.RS 3 - -.LP -.LP \f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP -.LP -.RE -.LP -If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". -.LP +.br +.br +If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". +.br +.br For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package. .nf \f3 @@ -4517,7 +3424,6 @@ .fi This results in the groupings: .RS 3 -.RS 3 .TP 3 Core Packages \f2java.lang\fP @@ -4530,38 +3436,27 @@ Other Packages \f2java.new\fP .RE - -.LP -.RE -.LP .TP 3 \-nodeprecated -Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. -.LP +Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. .TP 3 \-nodeprecatedlist -Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. -.LP +Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. .TP 3 \-nosince -Omits from the generated docs the "Since" sections associated with the @since tags. -.LP +Omits from the generated docs the "Since" sections associated with the @since tags. .TP 3 \-notree -Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. -.LP +Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. .TP 3 \-noindex -Omits the index from the generated docs. The index is produced by default. -.LP +Omits the index from the generated docs. The index is produced by default. .TP 3 \-nohelp -Omits the HELP link in the navigation bars at the top and bottom of each page of output. -.LP +Omits the HELP link in the navigation bars at the top and bottom of each page of output. .TP 3 \-nonavbar -Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. -.LP +Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. .TP 3 \-helpfile\ path/filename Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example: @@ -4582,8 +3477,7 @@ .fi .TP 3 \-serialwarn -Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. -.LP +Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. .TP 3 \-charset\ name Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the @@ -4609,10 +3503,10 @@ .na \f2HTML standard\fP @ .fi -http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) -.LP +http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) +.br +.br Also see \-encoding and \-docencoding. -.LP .TP 3 \-docencoding\ name Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the @@ -4626,12 +3520,12 @@ % \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP .fl .fi -Also see \-encoding and \-charset. -.LP +Also see \-encoding and \-charset. .TP 3 \-keywords -Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) -.LP +Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) +.br +.br The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords: .nf \f3 @@ -4646,16 +3540,21 @@ .fl \fP .fi -.LP .TP 3 \-tag\ \ tagname:Xaoptcmf:"taghead" -Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. -.LP -The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. -.LP -The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. -.LP -\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: \f4X\fP (disable tag) +Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. +.br +.br +The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. +.br +.br +The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. +.br +.br +\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: +.br +.br +\f4X\fP (disable tag) .br \f4a\fP (all) .br @@ -4670,7 +3569,8 @@ \f4m\fP (methods) .br \f4f\fP (fields) -.LP +.br +.br \f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is: .nf \f3 @@ -4715,8 +3615,9 @@ .fl \fP .fi -\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. -.LP +\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. +.br +.br You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use: .nf \f3 @@ -4733,13 +3634,15 @@ .fl \fP .fi -.LP -The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. -.LP -\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. -.LP -If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. -.LP +The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. +.br +.br +\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. +.br +.br +If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. +.br +.br \f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed): .nf \f3 @@ -4758,21 +3661,23 @@ .fl \fP .fi -.LP -When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. -.LP -The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. -.LP -\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Sun will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Sun. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Sun later creates a standard tag of the same name. -.LP +When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. +.br +.br +The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. +.br +.br +\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name. +.br +.br \f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See .na \f2Comparing Annotations and Javadoc Tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations -.LP -You can also create more complex block tags, or custom inline tags with the \-taglet option. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations< +.br +.br +You can also create more complex block tags, or custom inline tags with the \-taglet option. .TP 3 \-taglet\ \ class Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see: @@ -4782,13 +3687,14 @@ .na \f2Taglet Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/taglet/overview.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html .RE -.LP -Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. -.LP -Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. -.LP +Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. +.br +.br +Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. +.br +.br Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages: .nf \f3 @@ -4809,25 +3715,21 @@ .fl \fP .fi -.LP -Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. -.LP +Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. .TP 3 \-tagletpath\ \ tagletpathlist -Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. -.LP +Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. .TP 3 \-docfilessubdirs\ -Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. -.LP +Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. .TP 3 \-excludedocfilessubdir\ \ name1:name2... -Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. -.LP +Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. .TP 3 \-noqualifier\ \ all\ | \ packagename1:packagename2:... -Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. -.LP +Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. +.br +.br The following example omits all package qualifiers: .nf \f3 @@ -4852,8 +3754,7 @@ .fl \fP .fi -Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. -.LP +Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. .TP 3 \-notimestamp\ Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this: @@ -4864,53 +3765,40 @@ .fl \fP .fi -.LP .TP 3 \-nocomment\ Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project. +.TP 3 +\-sourcetab tabLength +Specify the number of spaces each tab takes up in the source. .RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP -.LP To shorten or simplify the javadoc command line, you can specify one or more files that themselves contain arguments to the \f2javadoc\fP command (except \f2\-J\fP options). This enables you to create javadoc commands of any length on any operating system. .LP -.LP An argument file can include javac options and source filenames in any combination. The arguments within a file can be space\-separated or newline\-separated. If a filename contains embedded spaces, put the whole filename in double quotes. .LP -.LP Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. .LP -.LP When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list. -.LP .SS Example \- Single Arg File .LP -.LP You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments: -.LP .nf \f3 .fl % \fP\f3javadoc @argfile\fP .fl .fi - -.LP .LP This argument file could contain the contents of both files shown in the next example. -.LP .SS Example \- Two Arg Files .LP -.LP You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.) .LP -.LP Create a file named "\f2options\fP" containing: -.LP .nf \f3 .fl @@ -4920,13 +3808,13 @@ .fl \-splitindex .fl - \-windowtitle 'Java(TM) SE 7 API Specification' -.fl - \-doctitle 'Java(TM) SE 7 API Specification' -.fl - \-header 'Java(TM); SE 7' -.fl - \-bottom 'Copyright 1993\-2009 Sun Microsystems, Inc. All Rights Reserved.' + \-windowtitle 'Java SE 7 API Specification' +.fl + \-doctitle 'Java SE 7 API Specification' +.fl + \-header 'Java(TM) SE 7' +.fl + \-bottom 'Copyright © 1993\-2011 Oracle and/or its affiliates. All rights reserved.' .fl \-group "Core Packages" "java.*" .fl @@ -4936,11 +3824,8 @@ .fl \fP .fi - -.LP .LP Create a file named "\f2packages\fP" containing: -.LP .nf \f3 .fl @@ -4952,120 +3837,85 @@ .fl \fP .fi - -.LP .LP You would then run javadoc with: -.LP .nf \f3 .fl % \fP\f3javadoc @options @packages\fP .fl .fi - -.LP .SS Example \- Arg Files with Paths .LP -.LP The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP): -.LP .nf \f3 .fl % \fP\f3javadoc @path1/options @path2/packages\fP .fl .fi - -.LP .SS Example \- Option Arguments .LP -.LP Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument: -.LP .nf \f3 .fl -'<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a -.fl -bug or feature</a> Java is a trademark or registered trademark of -.fl -Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-2000 Sun -.fl -Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl -All Rights Reserved.' + +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners. .fl \fP .fi - -.LP .LP Then run the Javadoc tool with: -.LP .nf \f3 .fl % \fP\f3javadoc \-bottom @bottom @packages\fP .fl .fi - -.LP .LP Or you could include the \f2\-bottom\fP option at the start of the argument file, and then just run it as: -.LP .nf \f3 .fl % \fP\f3javadoc @bottom @packages\fP .fl .fi - -.LP - -.LP .SH "Name" Running -.LP .SH "RUNNING JAVADOC" .LP - -.LP -.LP \f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP. .LP -.LP \f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see .na \f2Standard Doclet\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. .LP \f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP .SH "SIMPLE EXAMPLES" .LP - -.LP -.LP You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP. -.LP .SS Documenting One or More Packages .LP -.LP To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP. .LP -.LP You can run javadoc either by changing directories (with \f2cd\fP) or by using \f2\-sourcepath\fP option. The examples below illustrate both alternatives. -.LP .RS 3 .TP 2 o @@ -5108,17 +3958,12 @@ .fl .fi .RE - -.LP .LP Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages. -.LP .SS Documenting One or More Classes .LP -.LP The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes. -.LP .RS 3 .TP 2 o @@ -5155,93 +4000,76 @@ .fi This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP. .RE - -.LP .SS Documenting Both Packages and Classes .LP -.LP You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes. -.LP .nf \f3 .fl % \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP .fl .fi - -.LP .LP This example generates HTML\-formatted documentation for the package \f2java.awt\fP and class \f2Applet\fP. (The Javadoc tool determines the package name for \f2Applet\fP from the package declaration, if any, in the \f2Applet.java\fP source file.) -.LP .SH "REAL WORLD EXAMPLE" .LP - -.LP -.LP The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2. .LP -.LP The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory. -.LP .SS Command Line Example .LP -.LP -This command line example is over 900 characters, which is too long for some shells, such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. -.LP +The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. .nf \f3 .fl -% javadoc \-sourcepath /java/jdk/src/share/classes \\ -.fl - \-overview /java/jdk/src/share/classes/overview.html \\ -.fl - \-d /java/jdk/build/api \\ -.fl - \-use \\ -.fl - \-splitIndex \\ -.fl - \-windowtitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-doctitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-header 'Java(TM) SE 7' \\ -.fl - \-bottom '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl -a bug or feature</a> Java is a trademark or registered trademark of Sun Microsystems, -.fl -Inc. in the US and other countries. Copyright 1993\-1999 Sun Microsystems, Inc. -.fl -901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All Rights Reserved.' \\ +% javadoc \-sourcepath /java/jdk/src/share/classes \\ +.fl + \-overview /java/jdk/src/share/classes/overview.html \\ +.fl + \-d /java/jdk/build/api \\ +.fl + \-use \\ +.fl + \-splitIndex \\ +.fl + \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-header 'Java(TM) SE 7' \\ +.fl + \-bottom ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl - \-group "Extension Packages" "javax.*" \\ -.fl - \-J\-Xmx180m \\ + \-group "Extension Packages" "javax.*" \\ +.fl + \-J\-Xmx180m \\ .fl @packages .fl \fP .fi - -.LP .LP where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below. -.LP .SS Makefile Example .LP -.LP This is an example of a GNU makefile. For an example of a Windows makefile, see .na \f2creating a makefile for Windows\fP @ .fi http://java.sun.com/j2se/javadoc/faq/index.html#makefiles. -.LP .nf \f3 .fl @@ -5283,15 +4111,15 @@ .fl HEADER = 'Java(TM) SE 7' .fl -BOTTOM = '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl - a bug or feature</a> Java is a trademark or registered trademark -.fl - of Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-1999 -.fl - Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl - All Rights Reserved.' +BOTTOM = ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -5301,14 +4129,10 @@ .fl \fP .fi - -.LP .LP Single quotes are used to surround makefile arguments. .LP -.LP \f3NOTES\fP -.LP .RS 3 .TP 2 o @@ -5320,15 +4144,9 @@ o Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP. .RE - -.LP .SH "TROUBLESHOOTING" -.LP - -.LP .SS General Troubleshooting -.LP .RS 3 .TP 2 o @@ -5347,37 +4165,23 @@ o \f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename. .RE - -.LP .SS Errors and Warnings .LP -.LP Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment. -.LP .RS 3 .TP 2 o \f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP. .RE - -.LP .SH "ENVIRONMENT" -.LP - -.LP .RS 3 .TP 3 CLASSPATH Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example: .:/home/classes:/usr/local/java/classes .RE - -.LP .SH "SEE ALSO" -.LP - -.LP .RS 3 .TP 2 o @@ -5399,75 +4203,24 @@ .na \f2Javadoc Home Page\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general .TP 2 o .na \f2How Javac and Javadoc Find Classes\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) .RE - -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 80 0 -.80 -.rm 80 -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 3869 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.fc -.nr T. 1 -.T# 1 -.35 -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-3 - -.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javah.1 --- a/jdk/src/linux/doc/man/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,38 +19,28 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "02 Jun 2010" +.TH javah 1 "10 May 2011" .LP .SH "Name" javah \- C Header and Stub File Generator .LP -.RS 3 - -.LP .LP \f3javah\fP produces C header files and C source files from a Java class. These files provide the connective glue that allow your Java and C code to interact. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . .fl -javah_g [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . -.fl \fP .fi .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3javah\fP generates C header and source files that are needed to implement native methods. The generated header and source files are used by C programs to reference an object's instance variables from native source code. The .h file contains a struct definition whose layout parallels the layout of the corresponding class. The fields in the struct correspond to instance variables in the class. .LP @@ -63,13 +53,8 @@ .LP The new native method interface, Java Native Interface (JNI), does not require header information or stub files. \f3javah\fP can still be used to generate native method function proptotypes needed for JNI\-style native methods. \f3javah\fP produces JNI\-style output by default, and places the result in the .h file. .LP -.LP -\f3javah_g\fP is a non\-optimized version of \f3javah\fP suitable for use with debuggers like jdb(1). -.LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-o outputfile @@ -110,11 +95,10 @@ .fl \fP .fi -.LP As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -132,8 +116,6 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH @@ -150,8 +132,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javap(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javap.1 --- a/jdk/src/linux/doc/man/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,21 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "02 Jun 2010" +.TH javap 1 "10 May 2011" .LP .SH "Name" javap \- The Java Class File Disassembler .LP -.RS 3 - -.LP .LP Disassembles class files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -47,13 +41,21 @@ .LP .SH "DESCRIPTION" .LP +.LP +The \f3javap\fP command disassembles one or more class files. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. +.LP +.RS 3 +.TP 3 +options +Command\-line options. +.TP 3 +classes +List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP). +.RE .LP .LP -The \f3javap\fP command disassembles a class file. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. For example, compile the following class declaration: -.LP -.RS 3 - +For example, compile the following class declaration: .LP .nf \f3 @@ -96,166 +98,160 @@ .fl \fP .fi -.RE .LP .LP -The output from \f3javap DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl \fP .fi -.RE .LP .LP -The output from \f3javap \-c DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap \-c DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 <Method java.applet.Applet()> + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."<init>":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 <Method void resize(int, int)> + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 <String "LAST_UPDATED"> + 10: aload_0 .fl - 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 <Field java.lang.String date> + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 <String "EMAIL"> + 20: aload_0 .fl - 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 <Field java.lang.String email> + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 <Class java.lang.StringBuffer> + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 <Method java.lang.StringBuffer()> + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V .fl - 9 getfield #5 <Field java.lang.String date> + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 <String " by "> + 15: ldc #11 // String by .fl - 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 <Method java.lang.String toString()> + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 <Field java.lang.String email> + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 43: return .fl - 43 return +} .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 -\-help +\-help \-\-help \-? Prints out help message for \f3javap\fP. .TP 3 +\-version +Prints out version information. +.TP 3 \-l Prints out line and local variable tables. .TP 3 @@ -268,14 +264,11 @@ \-package Shows only package, protected, and public classes and members. This is the default. .TP 3 -\-private +\-private \-p Shows all classes and members. .TP 3 \-Jflag Pass \f2flag\fP directly to the runtime system. Some examples: -.RS 3 - -.LP .nf \f3 .fl @@ -285,11 +278,16 @@ .fl \fP .fi -.RE .TP 3 \-s Prints internal type signatures. .TP 3 +\-sysinfo +Shows system information (path, size, date, MD5 hash) of the class being processed. +.TP 3 +\-constants +Shows static final constants. +.TP 3 \-c Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the .na @@ -301,22 +299,7 @@ Prints stack size, number of \f2locals\fP and \f2args\fP for methods. .TP 3 \-classpath path -Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.nf -\f3 -.fl - .:<your_path> -.fl -\fP -.fi -For example: -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -326,32 +309,8 @@ .RE .LP -.SH "ENVIRONMENT VARIABLES" -.LP - -.LP -.RS 3 -.TP 3 -CLASSPATH -Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example, For example: -.RS 3 - -.LP -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE -.RE - -.LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javah(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javaws.1 --- a/jdk/src/linux/doc/man/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,30 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "02 Jun 2010" +.TH javaws 1 "10 May 2011" .LP .SH "Name" \f2javaws\fP Command Line .LP -.LP -\ -.LP -.SS -NAME -.LP -.RS 3 - +.SH "NAME" .LP .LP \f2javaws\fP \- Java Web Start launcher command .LP -.RE -.SS -SYNOPSIS -.LP -.RS 3 - +.SH "SYNOPSIS" .LP .LP \f2javaws [run\-options] <jnlp>\fP @@ -50,49 +38,27 @@ .LP \f2javaws [control\-options]\fP .LP -.RE -.SS -PARAMETERS -.LP -.RS 3 - +.SH "PARAMETERS" .LP .LP \f2[run\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below. .LP -.RE .LP \f2<jnlp>\fP .LP -.RS 3 - -.LP .LP This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file. .LP -.RE .LP \f2[control\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below. .LP -.RE -.RE -.SS -DESCRIPTION -.LP -.RS 3 - +.SH "DESCRIPTION" .LP .LP The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network. @@ -103,256 +69,154 @@ .LP The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release. .LP -.RE -.SS -RUN\-OPTIONS -.LP -.RS 3 - +.SH "RUN\-OPTIONS" .LP .LP \f2\-offline\fP .LP -.RS 3 - -.LP .LP -run Java Web Start in offline mode. +Run Java Web Start in offline mode. .LP -.RE .LP \f2\-Xnosplash\fP .LP -.RS 3 - +.LP +Do not display the initial splash screen. .LP .LP -disable the display of the initial splash screen. -.LP -.RE -.LP \f2\-open <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP. .LP -.RE .LP \f2\-print <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP. .LP -.RE .LP \f2\-online\fP .LP -.RS 3 - -.LP .LP -run in online mode (default behavior). +Use online mode (default behavior). .LP -.RE .LP \f2\-wait\fP .LP -.RS 3 - -.LP .LP -If specified, the \f2javaws\fP process will not exit until the application exits. +If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms. .LP -.RE .LP \f2\-verbose\fP .LP -.RS 3 - -.LP .LP -display additional output. +Display additional output. .LP -.RE .LP \f2\-J<option>\fP .LP -.RS 3 - -.LP .LP -supply options to the vm. +Supply options to the VM. .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP -.LP -run the application from the system cache only. .LP -.RE -.RE -.SS -CONTROL\-OPTIONS +Run the application from the system cache only. .LP -.RS 3 - +.SH "CONTROL\-OPTIONS" .LP .LP \f2\-viewer\fP .LP -.RS 3 - +.LP +Show the Cache Viewer in the Java Control Panel. .LP .LP -show the Cache Viewer in the java control panel +\f2\-clearcache\fP +.LP .LP -.RE +Remove all non\-installed applications from the cache. +.LP .LP \f2\-userConfig <property name>\fP .LP -.RS 3 - -.LP .LP -clear the specified deployment property. +Clear the specified deployment property. .LP -.RE .LP \f2\-userConfig <property name> <property value>\fP .LP -.RS 3 - -.LP .LP -set the specified deployment property to the specified value. +Set the specified deployment property to the specified value. .LP -.RE .LP \f2\-uninstall\fP .LP -.RS 3 - -.LP .LP -remove all applications from the cache. +Remove all applications from the cache. .LP -.RE .LP \f2\-uninstall <jnlp>\fP .LP -.RS 3 - -.LP .LP -remove the application from the cache. +Remove the application from the cache. .LP -.RE .LP \f2\-import [import\-options] <jnlp>\fP .LP -.RS 3 - -.LP .LP -import the application to the cache. +Import the application to the cache. .LP -.RE -\f3IMPORT\-OPTIONS\fP +.SH "IMPORT\-OPTIONS" .LP .LP \f2\-silent\fP .LP -.RS 3 - -.LP .LP -import silently (with no user interface). +Import silently (with no user interface). .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP .LP -import application to the system cache. +Import application to the system cache. .LP -.RE .LP \f2\-codebase <url>\fP .LP -.RS 3 - -.LP .LP -retrieve resources from the given codebase. +Retrieve resources from the given codebase. .LP -.RE .LP \f2\-shortcut\fP .LP -.RS 3 - -.LP .LP -install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. +Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE .LP \f2\-association\fP .LP -.RS 3 - -.LP -.LP -install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE -.RE -.SS -FILES +Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RS 3 - +.SH "FILES" .LP .LP For information about the user and system cache and deployment.properties files, see .na \f2System\- and User\-Level Properties\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html. +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html. .LP -.RE -.SS -MORE INFORMATION -.LP -.RS 3 - +.SH "MORE INFORMATION" .LP .LP For more information about Java Web Start, see .na \f2Java Web Start\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html. -.LP -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html. .LP -\ -.LP -.RE -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jconsole.1 --- a/jdk/src/linux/doc/man/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "02 Jun 2010" +.TH jconsole 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,41 +39,40 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 connection = pid | host:port | jmxUrl .RS 3 -\f2pid\fP\ \ \ Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See +.TP 2 +o +\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2host\fP:\f2port\fP\ \ Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2jmxUrl\fP\ \ Address of the JMX agent to be connected to as described in +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2jmxUrl\fP Address of the JMX agent to be connected to as described in .na \f2JMXServiceURL\fP @ .fi -http://java.sun.com/javase/6/docs/api/javax/management/remote/JMXServiceURL.html. +http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. .RE .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jconsole\fP command launches a graphical console tool that enables you to monitor and manage Java applications and virtual machines on a local or remote machine. .LP @@ -84,17 +81,15 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-interval=n Set the update interval to \f2n\fP seconds (default is 4 seconds). .TP 3 -\-notile\ +\-notile Do not tile windows initially (for two or more connections). .TP 3 -\-pluginpath\ plugins +\-pluginpath plugins Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named: .br .nf @@ -104,20 +99,19 @@ .fl \fP .fi -.LP containing one line for each plugin specifying the fully qualified class name of the class implementing the .na \f2com.sun.tools.jconsole.JConsolePlugin\fP @ .fi -http://java.sun.com/javase/6/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. +http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. .TP 3 -\-version\ +\-version Output version information and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jconsole is run. .RE @@ -130,13 +124,13 @@ .na \f2Using JConsole\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html .TP 2 o .na \f2Monitoring and Management for Java Platform\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jdb.1 --- a/jdk/src/linux/doc/man/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "02 Jun 2010" +.TH jdb 1 "10 May 2011" .LP .SH "Name" jdb \- The Java Debugger .LP -.RS 3 - -.LP .LP \f3jdb\fP helps you find and fix bugs in Java language programs. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified below. @@ -60,24 +51,18 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the .na \f2Java Platform Debugger Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. .LP .SS Starting a jdb Session .LP -.RS 3 - -.LP .LP There are many ways to start a jdb session. The most frequently used way is to have \f3jdb\fP launch a new Java Virtual Machine (VM) with the main class of the application to be debugged. This is done by substituting the command \f3jdb\fP for \f3java\fP in the command line. For example, if your application's main class is MyClass, you use the following command to debug it under JDB: .LP @@ -137,7 +122,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the .na \f21.4.2 documentation\fP @ .fi @@ -150,9 +135,6 @@ The following is a list of the basic \f3jdb\fP commands. The Java debugger supports other commands which you can list using \f3jdb\fP's \f2help\fP command. .LP .RS 3 - -.LP -.RS 3 .TP 3 help, or ? The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description. @@ -164,10 +146,12 @@ Continues execution of the debugged application after a breakpoint, exception, or step. .TP 3 print -Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. -.LP -\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. -.LP +Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. +.br +.br +\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. +.br +.br \f2print\fP supports many simple Java expressions including those with method invocations, for example: .RS 3 .TP 2 @@ -188,15 +172,13 @@ .RE .TP 3 dump -For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. -.LP -The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. +For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. +.br +.br +The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. .TP 3 threads List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example: -.RS 3 - -.LP .nf \f3 .fl @@ -204,26 +186,22 @@ .fl \fP .fi -.RE In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running, .TP 3 thread Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above. .TP 3 where -\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. -.LP -If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. +\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. +.br +.br +If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. .RE .LP -.RE .SS Breakpoints .LP -.RS 3 - -.LP .LP Breakpoints can be set in \f3jdb\fP at line numbers or at the first instruction of a method, for example: .LP @@ -249,23 +227,15 @@ .LP The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution. .LP -.RE .SS Stepping .LP -.RS 3 - -.LP .LP The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame. .LP -.RE .SS Exceptions .LP -.RS 3 - -.LP .LP When an exception occurs for which there isn't a catch statement anywhere in the throwing thread's call stack, the VM normally prints an exception trace and exits. When running under \f3jdb\fP, however, control returns to \f3jdb\fP at the offending throw. You can then use \f3jdb\fP to diagnose the cause of the exception. .LP @@ -278,12 +248,8 @@ .LP \f2NOTE: The \fP\f2ignore\fP command does not cause the debugged VM to ignore specific exceptions, only the debugger. .LP -.RE -.RE .SH "Command Line Options" .LP - -.LP .LP When you use \f3jdb\fP in place of the Java application launcher on the command line, \f3jdb\fP accepts many of the same options as the java command, including \f2\-D\fP, \f2\-classpath\fP, and \f2\-X<option>\fP. .LP @@ -335,7 +301,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection alternatives. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives. .LP .SS Options Forwarded to Debuggee Process @@ -358,8 +324,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), javah(1), javap(1), javadoc(1). .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jhat.1 --- a/jdk/src/linux/doc/man/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "02 Jun 2010" +.TH jhat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,17 +39,17 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 heap\-dump\-file Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3". -.SH "DESCRIPTION" +.RE + +.LP +.SH "DESCRIPTION" .LP .LP The \f3jhat\fP command parses a java heap dump file and launches a webserver. jhat enables you to browse heap dumps using your favorite webbrowser. jhat supports pre\-designed queries (such as 'show all instances of a known class "Foo"') as well as \f3OQL\fP (\f3O\fPbject \f3Q\fPuery \f3L\fPanguage) \- a SQL\-like query language to query heap dumps. Help on OQL is available from the OQL help page shown by jhat. With the default port, OQL help is available at http://localhost:7000/oqlhelp/ @@ -69,7 +67,7 @@ .na \f2HotSpotDiagnosticMXBean\fP @ .fi -http://java.sun.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; +http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; .TP 2 o Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option; @@ -86,7 +84,8 @@ .LP \f3NOTE:\fP This tool is \f3experimental\fP and may \f3not\fP be available in future versions of the JDK. .LP -.SH "OPTIONS" +.SH "OPTIONS" +.LP .RS 3 .TP 3 \-stack false/true @@ -107,21 +106,22 @@ \-debug int Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes. .TP 3 -\-version\ +\-version Report version number and exit. .TP 3 -\-h\ +\-h Output help message and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB. .RE .LP -.SH "SEE ALSO" +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -136,5 +136,6 @@ .fi http://java.sun.com/developer/technicalArticles/Programming/HPROF.html .RE -.RE + +.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jinfo.1 --- a/jdk/src/linux/doc/man/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "02 Jun 2010" +.TH jinfo 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,54 +41,55 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option Options are mutually exclusive. Option, if used, should follow immediately after the command name. +.RE + +.LP .RS 3 .TP 3 pid process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. .RE + +.LP .RS 3 .TP 3 executable Java executable from which the core dump was produced. .RE + +.LP .RS 3 .TP 3 core core file for which the configuration info is to be printed. .RE + +.LP .RS 3 .TP 3 remote\-hostname\-or\-IP remote debug server's (see jsadebugd(1)) hostname or IP address. .RE + +.LP .RS 3 .TP 3 server\-id optional unique id, if multiple debug servers are running on the same remote host. .RE -.RE .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jinfo\fP prints Java configuration information for a given Java process or core file or a remote debug server. Configuration information includes Java System properties and Java virtual machine command line flags. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br - +jinfo \-J\-d64 \-sysprops pid .LP -.RS 3 - -.LP -jinfo \-J\-d64 \-sysprops pid -.RE .LP \f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' need to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP .LP @@ -99,8 +98,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jmap.1 --- a/jdk/src/linux/doc/man/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "02 Jun 2010" +.TH jmap 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,8 +41,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option @@ -74,14 +70,9 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jmap\fP prints shared object memory maps or heap memory details of a given process or core file or a remote debug server. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -89,10 +80,11 @@ .fl \fP .fi -.RE .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP +\f3NOTE: This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP .LP \f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP @@ -101,12 +93,10 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> -When no option is used \f3jmap\fP prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. +When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. .br .TP 3 \-dump:[live,]format=b,file=<filename> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jps.1 --- a/jdk/src/linux/doc/man/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "02 Jun 2010" +.TH jps 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,8 +39,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -55,8 +51,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jps\fP tool lists the instrumented HotSpot Java Virtual Machines (JVMs) on the target system. The tool is limited to reporting information on JVMs for which it has the access permissions. .LP @@ -77,8 +71,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jps\fP command supports a number of options that modify the output of the command. These options are subject to change or removal in the future. .LP @@ -107,9 +99,6 @@ .SS HOST IDENTIFIER .LP -.RS 3 - -.LP .LP The host identifier, or \f2hostid\fP is a string that indicates the target system. The syntax of the \f2hostid\fP string largely corresponds to the syntax of a URI: .LP @@ -140,11 +129,8 @@ .RE .LP -.RE .SH "OUTPUT FORMAT" .LP - -.LP .LP The output of the \f3jps\fP command follows the following pattern: .LP @@ -169,8 +155,6 @@ .LP .SH "EXAMPLES" .LP - -.LP .LP This section provides examples of the \f3jps\fP command. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jrunscript.1 --- a/jdk/src/linux/doc/man/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "02 Jun 2010" +.TH jrunscript 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jrunscript\fP is a command line script shell. jrunscript supports both an interactive (read\-eval\-print) mode and a batch (\-f option) mode of script execution. This is a scripting language independent shell. By default, JavaScript is the language used, but the \-l option can be used to specify a different language. Through Java to scripting language communication, jrunscript supports "exploratory programming" style. .LP @@ -63,8 +57,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath path @@ -112,10 +104,8 @@ .LP .SH "EXAMPLES" .LP -\f3Executing inline scripts\fP -.LP -.RS 3 - +.SS +Executing inline scripts .LP .nf \f3 @@ -126,13 +116,10 @@ .fl \fP .fi -.RE .LP -\f3Use specified language and evaluate given script file\fP -.LP -.RS 3 - +.SS +Use specified language and evaluate given script file .LP .nf \f3 @@ -141,42 +128,42 @@ .fl \fP .fi -.RE .LP -\f3Interactive mode\fP -.LP -.RS 3 - +.SS +Interactive mode .LP .nf \f3 .fl jrunscript .fl -js>print('hello world'); +js> print('Hello World\\n'); +.fl +Hello World .fl -hello world +js> 34 + 55 .fl -js>34 + 55 +89.0 .fl -89 +js> t = new java.lang.Thread(function() { print('Hello World\\n'); }) +.fl +Thread[Thread\-0,5,main] .fl -js> thread(function() { print('hello world'); } +js> t.start() .fl -hello world +js> Hello World +.fl + .fl js> .fl \fP .fi -.RE .LP -\f3Run script file with script arguments\fP -.LP -.RS 3 - +.SS +Run script file with script arguments .LP .nf \f3 @@ -185,13 +172,16 @@ .fl \fP .fi -.RE .LP test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array. .SH "SEE ALSO" .LP .LP -If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in jsdocs. +If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in +.na +\f2jsdocs\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jsadebugd.1 --- a/jdk/src/linux/doc/man/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "02 Jun 2010" +.TH jsadebugd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,35 +39,16 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 pid process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process. -.RE - -.LP -.RS 3 .TP 3 executable -.RE - -.LP -.RS 3 -.TP 3 Java executable from which the core dump was produced -.RE - -.LP -.RS 3 .TP 3 core Core file to which the debug server should attach. -.RE - -.LP -.RS 3 .TP 3 server\-id Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique. @@ -78,17 +57,12 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP, .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi must be started with: -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with: .LP .nf \f3 @@ -97,17 +71,16 @@ .fl \fP .fi -.RE .LP .LP where \f2$JAVA_HOME\fP is the JDK installation directory. If rmiregistry was not started, jsadebugd will start an rmiregistry in a standard (1099) port internally. Debug server may be stopped by sending SIGINT (pressing Ctrl\-C) to it. .LP .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +\f3NOTE\fP \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \f2PATH\fP environment variable should contain the location of \f2jvm.dll\fP used by the target process or the location from which the Crash Dump file was produced. .LP .LP -\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP +For example, \f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP .SH "SEE ALSO" .LP @@ -129,7 +102,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jstack.1 --- a/jdk/src/linux/doc/man/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "02 Jun 2010" +.TH jstack 1 "10 May 2011" .LP .SH "Name" @@ -29,8 +29,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,8 +43,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .LP Options are mutually exclusive. Option, if used, should follow immediately after the command name. See OPTIONS. .LP @@ -78,16 +74,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jstack\fP prints Java stack traces of Java threads for a given Java process or core file or a remote debug server. For each Java frame, the full class name, method name, 'bci' (byte code index) and line number, if available, are printed. With the \-m option, jstack prints both Java and native frames of all threads along with the 'pc' (program counter). For each native frame, the closest native symbol to 'pc', if available, is printed. C++ mangled names are not demangled. To demangle C++ names, the output of this command may be piped to \f3c++filt\fP. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br .LP -.RS 3 - -.LP .nf \f3 .fl @@ -95,7 +86,6 @@ .fl \fP .fi -.RE .LP .LP @@ -106,8 +96,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-F @@ -118,7 +106,7 @@ .na \f2ownable synchronizers\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. +http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. .TP 3 \-m prints mixed mode (both Java and native C/C++ frames) stack trace. @@ -154,8 +142,6 @@ .LP .SH "KNOWN BUGS" .LP - -.LP .LP Mixed mode stack trace, the \-m option, does not work with the remote debug server. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jstat.1 --- a/jdk/src/linux/doc/man/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "02 Jun 2010" +.TH jstat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 generalOption @@ -60,17 +56,15 @@ The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details. .TP 3 interval[s|ms] -Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds.\ Must be a positive integer.\ If specified, \f3jstat\fP will produce its output at each interval. +Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval. .TP 3 count -Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated.\ Must be a positive integer. +Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer. .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstat\fP tool displays performance statistics for an instrumented HotSpot Java virtual machine (JVM). The target JVM is identified by its virtual machine identifier, or \f2vmid\fP option described below. .LP @@ -82,9 +76,6 @@ .SS VIRTUAL MACHINE IDENTIFIER .LP -.RS 3 - -.LP .LP The syntax of the \f2vmid\fP string largely corresponds to the syntax of a URI: .LP @@ -115,11 +106,8 @@ .RE .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The \f3jstat\fP command supports two types of options, general options and output options. General options cause \f3jstat\fP to display simple usage and version information. Output options determine the content and format of the statistical output. .br @@ -150,14 +138,11 @@ .SS OUTPUT OPTIONS .LP -.RS 3 - +.LP +If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J). The \f2statOption\fP must come first. .LP .LP -If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J).\ The \f2statOption\fP must come first. -.LP -.LP -Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns.\ Use the \f3\-h\fP option to set the frequency at which the header is displayed.\ Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. +Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns. Use the \f3\-h\fP option to set the frequency at which the header is displayed. Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. .LP .LP Use the \f3\-t\fP option to display a time stamp column, labeled \f2Timestamp\fP as the first column of output. The \f2Timestamp\fP column contains the elapsed time, in seconds, since startup of the target JVM. The resolution of the time stamp is dependent on various factors and is subject to variation due to delayed thread scheduling on heavily loaded systems. @@ -171,11 +156,10 @@ .RS 3 .TP 3 \-statOption -Determines the statistics information that \f3jstat\fP displays. The following table lists the available options.\ Use the \f3\-options\fP general option to display the list of options for a particular platform installation. +Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation. .br .br .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -457,7 +441,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 230 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 215 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -683,7 +667,6 @@ .rm j+ .rm k+ .rm l+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-52 .TP 3 \-h n @@ -697,13 +680,9 @@ .RE .LP -.RE .SS STATOPTIONS AND OUTPUT .LP -.RS 3 - -.LP .LP The following tables summarize the columns that \f3jstat\fP outputs for each \f2statOption\fP. .br @@ -713,7 +692,6 @@ \-class Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -825,7 +803,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 280 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 261 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -910,7 +888,6 @@ .rm a+ .rm b+ .rm c+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-21 .LP @@ -918,7 +895,6 @@ \-compiler Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -1082,7 +1058,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 316 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 297 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1210,7 +1186,6 @@ .rm d+ .rm e+ .rm f+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-29 .LP @@ -1218,7 +1193,6 @@ \-gc Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -1546,7 +1520,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 386 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 367 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1814,7 +1788,6 @@ .rm l+ .rm m+ .rm n+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-63 .LP @@ -1822,7 +1795,6 @@ \-gccapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2170,7 +2142,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 460 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 441 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2455,7 +2427,6 @@ .rm m+ .rm n+ .rm o+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-67 .LP @@ -2466,7 +2437,6 @@ This option displays the same summary of garbage collection statistics as the \f3\-gcutil\fP option, but includes the causes of the last garbage collection event and (if applicable) the current garbage collection event. In addition to the columns listed for \f3\-gcutil\fP, this option adds the following columns: .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2550,7 +2520,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 483 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 464 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2610,7 +2580,6 @@ .35 .rm a+ .rm b+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-13 .LP @@ -2618,7 +2587,6 @@ \-gcnew Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2866,7 +2834,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 537 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 518 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3066,7 +3034,6 @@ .rm h+ .rm i+ .rm j+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-47 .LP @@ -3074,7 +3041,6 @@ \-gcnewcapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -3094,15 +3060,14 @@ .rm 80 81 .nr 34 \n(.lu .eo -.am 80 +.am 81 .br .di a+ .35 .ft \n(.f .ll \n(34u*1u/3u -.if \n(.l<\n(80 .ll \n(80u +.if \n(.l<\n(81 .ll \n(81u .in 0 -NGCMN\ \ \ \ \ \ \ \ \ T}~T{ Minimum new generation capacity (KB). .br .di @@ -3262,9 +3227,11 @@ .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \w\f3Column\fP .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGCMX \ \ \ +.nr 38 \wNGCMN .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGC \ \ \ +.nr 38 \wNGCMX +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \wNGC .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \wS0CMX .if \n(80<\n(38 .nr 80 \n(38 @@ -3284,8 +3251,6 @@ .if \n(80<\n(38 .nr 80 \n(38 .80 .rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 .nr 81 0 .nr 38 \w\f3Description\fP .if \n(81<\n(38 .nr 81 \n(38 @@ -3293,6 +3258,8 @@ .if \n(81<\n(38 .nr 81 \n(38 .81 .rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(b- .if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(c- @@ -3321,7 +3288,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 593 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 572 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3348,11 +3315,11 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'\h'|\n(41u' +\&\h'|\n(40u'NGCMN\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v -.nr 37 \n(40u +.nr 37 \n(41u .in +\n(37u .a+ .in -\n(37u @@ -3364,7 +3331,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGCMX \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGCMX\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3380,7 +3347,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGC \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGC\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3521,15 +3488,13 @@ .rm h+ .rm i+ .rm j+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-49 +.if \n-(b.=0 .nr c. \n(.c-\n(d.-47 .LP .SS \-gcold Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -3717,7 +3682,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 635 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 614 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3866,7 +3831,6 @@ .rm e+ .rm f+ .rm g+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-35 .LP @@ -3874,7 +3838,6 @@ \-gcoldcapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -4062,7 +4025,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 677 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 656 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4211,7 +4174,6 @@ .rm e+ .rm f+ .rm g+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-35 .LP @@ -4219,7 +4181,6 @@ \-gcpermcapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -4407,7 +4368,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 719 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 698 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4556,7 +4517,6 @@ .rm e+ .rm f+ .rm g+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-35 .LP @@ -4564,7 +4524,6 @@ \-gcutil Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -4792,7 +4751,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 769 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 748 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4975,7 +4934,6 @@ .rm g+ .rm h+ .rm i+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-43 .LP @@ -4983,7 +4941,6 @@ \-printcompilation Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -5091,7 +5048,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 795 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 774 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -5172,14 +5129,10 @@ .rm a+ .rm b+ .rm c+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-19 .LP -.SS - -.LP -.SH "" +.SH "EXAMPLES" .LP .LP This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891. @@ -5355,7 +5308,6 @@ .LP The \f2lvmid\fP is combined with the name of the remote host to construct a \f2vmid\fP of \f240496@remote.domain\fP. This \f2vmid\fP results in the use of the \f3rmi\fP protocol to communicate to the default \f3jstatd\fP server on the remote host. The \f3jstatd\fP server is located using the \f3rmiregistry\fP on \f2remote.domain\fP that is bound to the default \f3rmiregistry\fP port (port 1099). .LP -.RE .SH "SEE ALSO" .LP .RS 3 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jstatd.1 --- a/jdk/src/linux/doc/man/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "02 Jun 2010" +.TH jstatd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -42,8 +40,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstatd\fP tool is an RMI server application that monitors for the creation and termination of instrumented HotSpot Java virtual machines (JVMs) and provides a interface to allow remote monitoring tools to attach to JVMs running on the local host. .LP @@ -66,8 +60,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jstatd\fP command supports the following options: .LP @@ -89,8 +81,6 @@ .LP .SH "SECURITY" .LP - -.LP .LP The \f3jstatd\fP server can only monitor JVMs for which it has the appropriate native access permissions. Therefor the \f3jstatd\fP process must be running with the same user credentials as the target JVMs. Some user credentials, such as the \f2root\fP user in UNIX(TM) based systems, have permission to access the instrumentation exported by any JVM on the system. A \f3jstatd\fP process running with such credentials can monitor any JVM on the system, but introduces additional security concerns. .LP @@ -102,7 +92,7 @@ .na \f2Policy File Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html. .LP .LP The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server. @@ -145,15 +135,11 @@ .LP .SH "REMOTE INTERFACE" .LP - -.LP .LP The interface exported by the \f3jstatd\fP process is proprietary and is guaranteed to change. Users and developers are discouraged from writing to this interface. .LP .SH "EXAMPLES" .LP - -.LP .LP Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background. .LP @@ -264,7 +250,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jvisualvm.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/linux/doc/man/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,104 @@ +." Copyright (c) 2008, 2011, 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. +." +.TH jvisualvm 1 "10 May 2011" + +.LP +.SH "Name" +\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool +.LP +.SH "SYNOPSIS" +.LP +.nf +\f3 +.fl + \fP\f3jvisualvm\fP [ \f2options\fP ] +.fl +.fi + +.LP +.SH "PARAMETERS" +.LP +.LP +Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below. +.LP +.SH "DESCRIPTION" +.LP +.LP +Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP. +.LP +.LP +Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins. +.LP +.SH "OPTIONS" +.LP +.LP +The following option is possible when you launch Java VisualVM. +.LP +.RS 3 +.TP 3 +\-J<jvm_option>\ +Pass this \f2<jvm_option>\fP to the JVM software. +.RE + +.LP +.SH "USAGE" +.LP +.LP +Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus. +.LP +.LP +Start Java VisualVM with the following command: +.LP +.nf +\f3 +.fl +% jvisualvm \fP\f4<options>\fP\f3 +.fl +\fP +.fi + +.LP +.SH "SEE ALSO" +.LP +.LP +For more details about Java VisualVM see the following pages. +.LP +.RS 3 +.TP 2 +o +.na +\f2Java VisualVM developers' site\fP @ +.fi +http://visualvm.java.net +.TP 2 +o +.na +\f2Java VisualVM in Java SE platform documentation\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html +.RE + +.LP +.LP +\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/keytool.1 --- a/jdk/src/linux/doc/man/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,21 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "02 Jun 2010" +.TH keytool 1 "10 May 2011" .LP .SH "Name" keytool \- Key and Certificate Management Tool .LP -.RS 3 - .LP Manages a keystore (database) of cryptographic keys, X.509 certificate chains, and trusted certificates. -.RE +.LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP \f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers. .LP A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it. @@ -57,14 +51,12 @@ \f3keytool\fP also enables users to administer secret keys used in symmetric encryption/decryption (e.g. DES). .LP .LP -\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. +\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. .LP .SH "COMMAND AND OPTION NOTES" .LP - .LP -.LP -The various commands and their options are listed and described below . Note: +The various commands and their options are listed and described below. Note: .LP .RS 3 .TP 2 @@ -114,6 +106,7 @@ .fl \fP .fi +.LP is equivalent to .nf \f3 @@ -128,10 +121,9 @@ .SS Option Defaults .LP -.RS 3 - .LP -Below are the defaults for various option values. +Below are the defaults for various option values. +.LP .nf \f3 .fl @@ -153,12 +145,16 @@ .fl 1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA") .fl + 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC") +.fl 56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES") .fl 168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede") .fl .fl + +.fl \-validity 90 .fl @@ -169,7 +165,7 @@ .fl \-storetype the value of the "keystore.type" property in the security properties file, .fl - which is returned by the static \fP\f4getDefaultType\fP\f3 method in + which is returned by the static \fP\f4getDefaultType\fP\f3 method in .fl \fP\f4java.security.KeyStore\fP\f3 .fl @@ -181,25 +177,39 @@ .fl \-protected false .fl - -.fl \fP .fi .LP -In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA", and if the underlying private key is of type "RSA", \f2\-sigalg\fP defaults to "SHA256withRSA". Please consult the +.LP +In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: +.LP +.RS 3 +.TP 2 +o +If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA" +.TP 2 +o +If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA". +.TP 2 +o +If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA". +.RE + +.LP +.LP +Please consult the .na \f2Java Cryptography Architecture API Specification & Reference\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. +.LP .SS Common Options .LP -.RS 3 - .LP -The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +.LP .LP There is also a \f2\-J\fP\f2javaoption\fP option that may appear for any command. If it appears, the specified \f2javaoption\fP string is passed through directly to the Java interpreter. This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .LP @@ -209,46 +219,65 @@ .RS 3 .TP 3 \-storetype storetype -This qualifier specifies the type of keystore to be instantiated. +.LP +This qualifier specifies the type of keystore to be instantiated. .TP 3 \-keystore keystore +.LP The keystore location. .LP If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device). .TP 3 -\-storepass storepass +\-storepass[:env|:file] argument +.LP The password which is used to protect the integrity of the keystore. .LP -\f2storepass\fP must be at least 6 characters long. It must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +.LP +\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).) +.LP +The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. .LP When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed. .TP 3 \-providerName provider_name -Used to identify a cryptographic service provider's name when listed in the security properties file. +.LP +Used to identify a cryptographic service provider's name when listed in the security properties file. .TP 3 \-providerClass provider_class_name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. +.LP +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. .TP 3 \-providerArg provider_arg -Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. +.LP +Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. .TP 3 \-protected +.LP Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. .LP Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively. .TP 3 \-ext {name{:critical}{=value}} -Denotes an X.509 certificate extension. The option can be used in \f2\-genkeypair\fP and \f2\-gencert\fP to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2":critical"\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. -.RS 3 +.LP +Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP. +.RE .LP .LP Currently keytool supports these named extensions (case\-insensitive): .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -478,7 +507,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 289 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 319 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -649,7 +678,6 @@ .rm h+ .rm i+ .rm j+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-38 .LP @@ -657,7 +685,7 @@ For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then. .LP .LP -A special name \f2"honored"\fP, used in \-gencert only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma\-seperated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. +A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. .LP .LP If, besides the \-ext honored option, another named or OID \-ext option is provided, this extension will be added to those already honored. However, if this name (or OID) also appears in the honored value, its value and criticality overrides the one in the request. @@ -668,32 +696,61 @@ .LP \f3Note:\fP Users should be aware that some combinations of extensions (and other certificate fields) may not conform to the Internet standard. See Warning Regarding Certificate Conformance for details. .LP -.RE -.RE -.RE .SH "COMMANDS" .LP - -.LP .SS Creating or Adding Data to the Keystore .LP .RS 3 - +.TP 3 +\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP -.RS 3 -.TP 3 -\-gencert {\-infile infile} {\-outfile outfile} {\-dname dname} {\-ext ext}* {\-rfc} {\-alias alias} {\-sigalg sigalg} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] [\-keypass keypass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. .LP -Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from infile (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into outfile (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. -.LP -\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. valDays tells the number of days for which the certificate should be considered valid. +\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid. .LP If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used. .LP -\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +.LP +The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain. +.LP +The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP: +.nf +\f3 +.fl +keytool \-alias ca \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca1 \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca2 \-dname CN=CA \-genkeypair +.fl +keytool \-alias e1 \-dname CN=E1 \-genkeypair +.fl +\fP +.fi +.LP +The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued: +.nf +\f3 +.fl +keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert +.fl +keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert +.fl +\fP +.fi +.LP +The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain: +.nf +\f3 +.fl +keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert +.fl +\fP +.fi .TP 3 -\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP. .LP @@ -704,30 +761,18 @@ \f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long. .LP \f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field. -.RS 3 - .LP -.LP -The option value can be set in one of these two forms: -.LP +The option value can be set in one of these two forms: .RS 3 .TP 3 1. -.LP -([+\-]\f2nnn\fP[ymdHMS])+ +([+\-]\f2nnn\fP[ymdHMS])+ .TP 3 2. -.LP -[yyyy/mm/dd] [HH:MM:SS] +[yyyy/mm/dd] [HH:MM:SS] .RE - -.LP .LP -With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: -.LP -.RS 3 - -.LP +With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: .nf \f3 .fl @@ -743,16 +788,10 @@ .fl \fP .fi -.RE - -.LP .LP -With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local timezone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. -.LP +With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. .LP -When the option is not provided, the start date is the current time. The option can be provided at most once. -.LP -.RE +When the option is not provided, the start date is the current time. The option can be provided at most once. .LP \f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid. .LP @@ -790,25 +829,17 @@ \f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply. .RE \f3Importing a New Trusted Certificate\fP -.RS 3 -.LP -Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. -.LP .LP -If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". +Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. .LP -.LP -If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. +If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". .LP -.RE +If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. \f3Importing a Certificate Reply\fP -.RS 3 .LP -When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). -.LP +When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). .LP -The methods of determining whether the certificate reply is trusted are described in the following: -.LP +The methods of determining whether the certificate reply is trusted are described in the following: .RS 3 .TP 2 o @@ -817,12 +848,8 @@ o \f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it. .RE - .LP -.LP -If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. -.LP -.RE +If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. .LP This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward. .TP 3 @@ -842,14 +869,12 @@ .LP Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input. .RE -.RE + +.LP .SS Exporting Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP @@ -879,14 +904,10 @@ .RE .LP -.RE .SS Displaying Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption} .LP @@ -896,27 +917,36 @@ .LP You cannot specify both \f2\-v\fP and \f2\-rfc\fP. .TP 3 -\-printcert {\-file cert_file | \-sslserver host[:port]} {\-rfc} {\-v} {\-Jjavaoption} +\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption} .LP +Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin. .LP If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard. .LP If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard .LP -If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the JSSE Reference Guide for more information. +If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the +.na +\f2JSSE Reference Guide\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information. +.LP +\f3Note\fP: This option can be used independently of a keystore. +.TP 3 +\-printcrl \-file crl_ {\-v} +.LP +Reads the certificate revocation list (CRL) from the file \f2crl_file\fP. +.LP +A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP. .LP \f3Note\fP: This option can be used independently of a keystore. .RE .LP -.RE .SS Managing the Keystore .LP .RS 3 - -.LP -.RS 3 .TP 3 \-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} .LP @@ -940,46 +970,45 @@ .RE .LP -.RE .SS Getting Help .LP .RS 3 - -.LP -.RS 3 .TP 3 \-help .LP -Lists the basic commands and their options. +Lists the basic commands and their options. +.LP +For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command: +.nf +\f3 +.fl + keytool \-\fP\f4command_name\fP\f3 \-help +.fl +\fP +.fi .RE .LP -.RE .SH "EXAMPLES" .LP - -.LP .LP Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust. .LP .SS Generating Your Key Pair .LP -.RS 3 - -.LP .LP The first thing you need to do is create a keystore and generate the key pair. You could use a command such as the following: .LP .nf \f3 .fl - keytool \-genkeypair \-dname "cn=Mark Jones, ou=JavaSoft, o=Sun, c=US" + keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180 .fl \fP .fi @@ -989,10 +1018,10 @@ (Please note: This must be typed as a single line. Multiple lines are used in the examples just for legibility purposes.) .LP .LP -This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password "ab987c". It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "JavaSoft", organization of "Sun" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. +This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password specified by \f2<new password for keystore>\fP. It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "Java", organization of "Oracle" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. .LP .LP -It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password "kpi135". +It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password specified by \f2<new password for private key>\fP. .LP .LP The command could be significantly shorter if option defaults were accepted. As a matter of fact, no options are required; defaults are used for unspecified options that have default values, and you are prompted for any required values. Thus, you could simply have the following: @@ -1006,17 +1035,15 @@ .fi .LP -In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. +.LP +In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. .LP -The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (a private key password of "kpi135", etc.) .LP -.RE +The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US"). +.LP .SS Requesting a Signed Certificate from a Certification Authority .LP -.RS 3 - -.LP .LP So far all we've got is a self\-signed certificate. A certificate is more likely to be trusted by others if it is signed by a Certification Authority (CA). To get such a signature, you first generate a Certificate Signing Request (CSR), via the following: .LP @@ -1029,14 +1056,12 @@ .fi .LP +.LP This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.) -.RE +.LP .SS Importing a Certificate for the CA .LP -.RS 3 - -.LP .LP You need to replace your self\-signed certificate with a certificate chain, where each certificate in the chain authenticates the public key of the signer of the previous certificate in the chain, up to a "root" CA. .LP @@ -1054,7 +1079,7 @@ .LP .LP -The "cacerts" keystore file ships with five VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". +The "cacerts" keystore file ships with several VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". .LP .LP A certificate from a CA is usually either self\-signed, or signed by another CA (in which case you also need a certificate authenticating that CA's public key). Suppose company ABC, Inc., is a CA, and you obtain a file named "ABCCA.cer" that is purportedly a self\-signed certificate from ABC, authenticating that CA's public key. @@ -1074,14 +1099,12 @@ .fi .LP +.LP This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry. -.RE +.LP .SS Importing the Certificate Reply from the CA .LP -.RS 3 - -.LP .LP Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file. .LP @@ -1095,16 +1118,14 @@ .fl \fP .fi -.RE .LP .SS Exporting a Certificate Authenticating Your Public Key .LP -.RS 3 - .LP -Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +.LP .LP One way they can do this is by first importing your public key certificate into their keystore as a "trusted" entry. You can export the certificate and supply it to your clients. As an example, you can copy your certificate to a file named \f2MJ.cer\fP via the following, assuming the entry is aliased by "mykey": .LP @@ -1117,14 +1138,12 @@ .fi .LP +.LP Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature. -.RE +.LP .SS Importing Keystore .LP -.RS 3 - -.LP .LP The command "importkeystore" is used to import an entire keystore into another keystore, which means all entries from the source keystore, including keys and certificates, are all imported to the destination keystore within a single command. You can use this command to import entries from a different type of keystore. During the import, all new entries in the destination keystore will have the same alias names and protection passwords (for secret keys and private keys). If \f3keytool\fP has difficulties recover the private keys or secret keys from the source keystore, it will prompt you for a password. If it detects alias duplication, it will ask you for a new one, you can specify a new alias or simply allow \f3keytool\fP to overwrite the existing one. .LP @@ -1134,128 +1153,108 @@ .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \fP .fi .LP .LP -The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the desination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. In this way, you can issue a \f3keytool\fP command that will never ask you a question. This makes it very convenient to include a \f3keytool\fP command into a script file, like this: +The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the destination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. The following command demonstrates this: .LP .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3 .fl \-noprompt .fl \fP .fi -.RE .LP .SS -Generating Certificates for a typical SSL Server -.LP -.RS 3 - +Generating Certificates for a Typical SSL Server .LP .LP -Keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermadiate CA (ca), and SSL server (server) are as follows: +The following are keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermediate CA (ca), and SSL server (server). Ensure that you store all the certificates in the same keystore. In these examples, it is recommended that you specify RSA as the key algorithm. .LP .nf \f3 .fl -keytool \-keystore root.jks \-genkeypair \-alias root \-ext bc:c +keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c .fl -keytool \-keystore ca.jks \-alias ca +keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c .fl -keytool \-keystore server.jks \-alias server +keytool \-genkeypair \-keystore server.jks \-alias server .fl - + .fl -keytool \-keystore root.jks \-alias root \-exportcert > root.pem +keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem .fl - + .fl -keytool \-keystore ca.jks \-certreq \-alias ca | keytool \-keystore root.jks \-gencert \-alias root \-ext BC=0 > ca.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem .fl keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem .fl - + .fl -keytool \-keystore server.jks \-certreq \-alias server | keytool \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE >server.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem .fl cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server .fl \fP .fi -.RE .LP .SH "TERMINOLOGY and WARNINGS" .LP - -.LP .SS KeyStore .LP -.RS 3 - .LP A keystore is a storage facility for cryptographic keys and certificates. -.RE +.LP .RS 3 .TP 2 o -.TP 2 -o \f3KeyStore Entries\fP -.RS 3 - .LP Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include: .RS 3 .TP 3 1. -\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types od entry, while \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. +\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. .TP 3 2. \f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate. .RE - -.LP -.RE .TP 2 o \f3KeyStore Aliases\fP -.RS 3 .LP -All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. -.LP +All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. .LP -An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. -.LP +An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. .LP -For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: -.LP +For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: .nf \f3 .fl @@ -1263,9 +1262,8 @@ .fl \fP .fi - .LP -This specifies an inital password of "dukekeypasswd" required by subsequent commands to access the private key assocated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: +This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: .nf \f3 .fl @@ -1273,49 +1271,37 @@ .fl \fP .fi - .LP This changes the password from "dukekeypasswd" to "newpass". .LP -Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. -.LP -.RE +Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. .TP 2 o \f3KeyStore Implementation\fP -.RS 3 +.LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP -Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. -.LP +Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. .LP -There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. -.LP +There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. .LP Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP -Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. -.LP +Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. -.LP +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP -For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. -.LP +For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. .LP -If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP +If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. -.LP +Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. .LP -The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): -.LP +The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): .nf \f3 .fl @@ -1323,11 +1309,8 @@ .fl \fP .fi - .LP -.LP -The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file: -.LP +The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file: .nf \f3 .fl @@ -1335,14 +1318,10 @@ .fl \fP .fi - -.LP .LP -To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. -.LP +To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. .LP -For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to -.LP +For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to .nf \f3 .fl @@ -1350,50 +1329,45 @@ .fl \fP .fi +.LP +Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". +.RE .LP -Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". -.RE -.RE .SS Certificate .LP +A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. .RS 3 - -.LP -A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. -.RE -.RS 3 -.TP 2 -o .TP 2 o \f3Certificate Terms\fP .RS 3 - -.LP -.RS 3 .TP 3 Public Keys -These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. +.LP +These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. .TP 3 Digitally Signed -If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. +.LP +If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. .TP 3 Identity -A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. +.LP +A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. .TP 3 Signature -A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). +.LP +A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). .TP 3 Private Keys -These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. +.LP +These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. .TP 3 Entity -An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. +.LP +An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. .RE - -.LP .LP Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as .na @@ -1407,26 +1381,22 @@ .na \f2Entrust\fP @ .fi -http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as the Netscape/Microsoft Certificate Servers or the Entrust CA product for your organization. -.LP -.LP -Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. +http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization. .LP +Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. .LP -\f3keytool\fP currently handles X.509 certificates. -.LP -.RE +\f3keytool\fP currently handles X.509 certificates. .TP 2 o \f3X.509 Certificates\fP -.RS 3 +.LP The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data. .LP -All X.509 certificates have the following data, in addition to the signature: -.LP +All X.509 certificates have the following data, in addition to the signature: .RS 3 .TP 3 Version +.LP This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates. .LP \f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic. @@ -1436,475 +1406,86 @@ \f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use. .TP 3 Serial Number -The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). +.LP +The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). .TP 3 Signature Algorithm Identifier -This identifies the algorithm used by the CA to sign the certificate. +.LP +This identifies the algorithm used by the CA to sign the certificate. .TP 3 Issuer Name -The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) +.LP +The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) .TP 3 Validity Period -Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. +.LP +Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. .TP 3 Subject Name +.LP The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example, .nf \f3 .fl - CN=Java Duke, OU=Java Software Division, O=Sun Microsystems Inc, C=US + CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US .fl \fP .fi -(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) +.LP +(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) .TP 3 Subject Public Key Information -This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. -.RE - .LP +This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. .RE .TP 2 o \f3Certificate Chains\fP -.RS 3 .LP -\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. -.LP +\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. .LP -When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. -.LP +When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. .LP -Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. -.LP +Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. .LP -In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. -.LP +In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. .LP -Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. -.LP +Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. .LP -A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. -.LP +A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. .LP -The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's webpage, etc.). -.LP -.RE +The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.). .TP 2 o \f3The cacerts Certificates File\fP -.RS 3 .LP -A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP -.LP -The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with several root CA certificates with the following aliases and X.500 owner distinguished names: +A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -.RS 3 -.TP 2 -* -\f3Alias\fP: thawtepersonalfreemailca -.br -\f3Owner DN\fP: EmailAddress=personal\-freemail@thawte.com, -.br -CN=Thawte Personal Freemail CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalbasicca -.br -\f3Owner DN\fP: EmailAddress=personal\-basic@thawte.com, -.br -CN=Thawte Personal Basic CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalpremiumca -.br -\f3Owner DN\fP: EmailAddress=personal\-premium@thawte.com, -.br -CN=Thawte Personal Premium CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawteserverca -.br -\f3Owner DN\fP: EmailAddress=server\-certs@thawte.com, -.br -CN=Thawte Server CA, OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepremiumserverca -.br -\f3Owner DN\fP: EmailAddress=premium\-server@thawte.com, -.br -CN=Thawte Premium Server CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: verisignclass1ca -.br -\f3Owner DN\fP: OU=Class 1 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2ca -.br -\f3Owner DN\fP: OU=Class 2 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3ca -.br -\f3Owner DN\fP: OU=Class 3 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignserverca -.br -\f3Owner DN\fP: OU=Secure Server Certification Authority, -.br -O="RSA Data Security, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 1 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 1 Public Primary Certification Authority \- G3, OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 2 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 2 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 3 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 3 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: baltimorecodesigningca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Code Signing Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrustglobalca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Global Root, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: baltimorecybertrustca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrust5ca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Root 5, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: entrustclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab., -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustglobalclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/GCCA_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrust2048ca -.br -\f3Owner DN\fP: CN=Entrust.net Certification Authority (2048), -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrustsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustgsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/SSL_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: godaddyclass2ca -.br -\f3Owner DN\fP: OU=Go Daddy Class 2 Certification Authority, -.br -O="The Go Daddy Group, Inc.", C=US -.TP 2 -* -\f3Alias\fP: starfieldclass2ca -.br -\f3Owner DN\fP: OU=Starfield Class 2 Certification Authority, -.br -O="Starfield Technologies, Inc.", C=US -.TP 2 -* -\f3Alias\fP: valicertclass2ca -.br -\f3Owner DN\fP: EMAILADDRESS=info@valicert.com, -.br -CN=http://www.valicert.com/, -.br -OU=ValiCert Class 2 Policy Validation Authority, -.br -O="ValiCert, Inc.", L=ValiCert Validation Network -.TP 2 -* -\f3Alias\fP: geotrustglobalca -.br -\f3Owner DN\fP: CN=GeoTrust Global CA, -.br -O=GeoTrust Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureca -.br -\f3Owner DN\fP: OU=Equifax Secure Certificate Authority, -.br -O=Equifax, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca2 -.br -\f3Owner DN\fP: OU=Equifax Secure eBusiness CA\-2, -.br -O=Equifax Secure, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureglobalebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure Global eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: soneraclass1ca -.br -\f3Owner DN\fP: CN=Sonera Class1 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: soneraclass2ca -.br -\f3Owner DN\fP: CN=Sonera Class2 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: comodoaaaca -.br -\f3Owner DN\fP: CN=AAA Certificate Services, -.br -O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB -.TP 2 -* -\f3Alias\fP: addtrustclass1ca -.br -\f3Owner DN\fP: CN=AddTrust Class 1 CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustexternalca -.br -\f3Owner DN\fP: CN=AddTrust External CA Root, -.br -OU=AddTrust External TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustqualifiedca -.br -\f3Owner DN\fP: CN=AddTrust Qualified CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: utnuserfirsthardwareca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Hardware, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstclientauthemailca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Client Authentication and Email, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utndatacorpsgcca -.br -\f3Owner DN\fP: CN=UTN \- DATACorp SGC, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstobjectca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Object, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.RE - +The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command: +.nf +\f3 +.fl +keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts +.fl +\fP +.fi .LP -.LP -The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. -.LP -.RS 3 - -.LP - +The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. .LP -\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP -.br - -.LP -Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. -.br - -.LP -.RE - -.LP -.RE +\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. .TP 2 o \f3The Internet RFC 1421 Certificate Encoding Standard\fP -.RS 3 -.LP -Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP +Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP -Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. -.LP +Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. .LP -The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. -.LP +The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. .LP -The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. -.LP +The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. .LP -In its printable encoding format, the encoded certificate is bounded at the beginning by -.LP +In its printable encoding format, the encoded certificate is bounded at the beginning by .nf \f3 .fl @@ -1912,11 +1493,8 @@ .fl \fP .fi - .LP -.LP -and at the end by -.LP +and at the end by .nf \f3 .fl @@ -1925,23 +1503,21 @@ \fP .fi .RE -.RE .LP .SS X.500 Distinguished Names .LP -.RS 3 - .LP -X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +.LP .RS 3 .TP 2 o \f2commonName\fP \- common name of a person, e.g., "Susan Jones" .TP 2 o -\f2organizationUnit\fP \- small organization (e.g, department or division) name, e.g., "Purchasing" +\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing" .TP 2 o \f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc." @@ -1975,7 +1551,7 @@ .nf \f3 .fl - CN=commonName + CN=commonName .fl OU=organizationUnit .fl @@ -1997,17 +1573,19 @@ .nf \f3 .fl -CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US +CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US .fl \fP .fi .LP -and a sample command using such a string is +.LP +and a sample command using such a string is +.LP .nf \f3 .fl -keytool \-genkeypair \-dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, +keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, .fl S=California, C=US" \-alias mark .fl @@ -2024,7 +1602,7 @@ .nf \f3 .fl -CN=Steve Meier, OU=SunSoft, O=Sun, C=US +CN=Steve Meier, OU=Java, O=Oracle, C=US .fl \fP .fi @@ -2036,7 +1614,7 @@ .nf \f3 .fl - cn=peter schuster, o=Sun Microsystems\\, Inc., o=sun, c=us + cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US .fl \fP .fi @@ -2045,14 +1623,12 @@ .LP It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\". .LP -.RE .SS WARNING Regarding Importing Trusted Certificates .LP -.RS 3 - .LP -IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +.LP .LP View it first (using the \f2\-printcert\fP command, or the \f2\-importcert\fP command without the \f2\-noprompt\fP option), and make sure that the displayed certificate fingerprint(s) match the expected ones. For example, suppose someone sends or emails you a certificate, and you put it in a file named \f2/tmp/cert\fP. Before you consider adding the certificate to your list of trusted certificates, you can execute a \f2\-printcert\fP command to view its fingerprints, as in .LP @@ -2083,17 +1659,15 @@ .fi .LP -Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP +Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP .LP Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user. .LP -.RE .SS Warning Regarding Passwords .LP -.RS 3 - -.LP .LP Most commands operating on a keystore require the store password. Some commands require a private/secret key password. .LP @@ -2103,13 +1677,9 @@ .LP If you don't specify a required password option on a command line, you will be prompted for it. .LP -.RE .SS Warning Regarding Certificate Conformance .LP -.RS 3 - -.LP .LP The Internet standard .na @@ -2117,39 +1687,31 @@ .fi http://tools.ietf.org/rfc/rfc5280.txt has defined a profile on conforming X.509 certificates, which includes what values and value combinations are valid for certificate fields and extensions. \f3keytool\fP has not enforced all these rules so it can generate certificates which do not conform to the standard, and these certificates might be rejected by JRE or other applications. Users should make sure that they provide the correct options for \f2\-dname\fP, \f2\-ext\fP, etc. .LP -.RE .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o -.LP -jar(1) tool documentation +jar(1) tool documentation .TP 2 o -.LP -jarsigner(1) tool documentation +jarsigner(1) tool documentation .TP 2 o -.LP the .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial for examples of the use of \f3keytool\fP +http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP .RE .LP .SH "CHANGES" .LP - -.LP .LP The command interface for keytool changed in Java SE 6. .LP @@ -2184,19 +1746,19 @@ .na \f2\-keyclone\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#keycloneCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd .TP 2 o .na \f2\-identitydb\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#identitydbCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd .TP 2 o .na \f2\-selfcert\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#selfcertCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/native2ascii.1 --- a/jdk/src/linux/doc/man/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "02 Jun 2010" +.TH native2ascii 1 "10 May 2011" .LP .SH "Name" native2ascii \- Native\-to\-ASCII Converter .LP -.RS 3 - -.LP .LP -Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters. +Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -46,31 +40,29 @@ .LP .SH "DESCRIPTION" .LP - .LP -.LP -The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters. +\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion. .LP .LP If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-reverse -Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters. +Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment. .br .br .TP 3 \-encoding encoding_name -Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the +Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the .na \f4Supported Encodings\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document. +http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document. +.br +.br .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/orbd.1 --- a/jdk/src/linux/doc/man/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,15 +19,12 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "02 Jun 2010" +.TH orbd 1 "10 May 2011" .LP .SH "Name" orbd \- The Object Request Broker Daemon .LP -.RS 3 - -.LP .LP \f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. .LP @@ -36,13 +33,10 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,8 +48,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages: .LP @@ -77,7 +69,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "OPTIONS" .LP @@ -141,11 +133,11 @@ .na \f2CORBA objects\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The .na \f2name binding\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. .LP .LP Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service. @@ -224,7 +216,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "Server Manager" .LP @@ -239,7 +231,7 @@ .na \f2sample tutorial\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: .LP .LP Start \f2orbd\fP. @@ -362,7 +354,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .br .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/pack200.1 --- a/jdk/src/linux/doc/man/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "02 Jun 2010" +.TH pack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line or in a properties file supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -51,11 +46,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f2pack200\fP tool is a Java application that transforms a JAR file into a compressed \f2pack200\fP file using the Java \f2gzip\fP compressor. The \f2pack200\fP files are highly compressed files that can be directly deployed, saving bandwidth and reducing download time. .LP @@ -65,83 +57,56 @@ .SS Typical usage: .LP -.RS 3 - -.LP .LP \f2% pack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, \f2myarchive.pack.gz\fP is produced using the default \f2pack200\fP settings. .LP .SH "OPTIONS" .LP - -.LP .LP \f4\-r \-\-repack\fP .LP -.RS 3 - -.LP .LP Produces a JAR file by packing the file \f2myarchive.jar\fP and unpacking it. The resulting file can be used as an input to the \f2jarsigner(1)\fP tool. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP .LP .LP \f2% pack200 \-\-repack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-g \-\-no\-gzip\fP .LP -.RS 3 - -.LP .LP Produces a \f2pack200\fP file. With this option a suitable compressor must be used, and the target system must use a corresponding decompresser. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-G \-\-strip\-debug\fP .LP -.RS 3 - -.LP .LP Strips attributes used for debugging from the output. These include \f2SourceFile\fP, \f2LineNumberTable\fP, \f2LocalVariableTable\fP and \f2LocalVariableTypeTable\fP. Removing these attributes reduces the size of both downloads and installations but reduces the usefulness of debuggers. .LP -.RE +.LP +\f4\-\-keep\-file\-order\fP +.LP +.LP +Preserve the order of files in the input file; this is the default behavior. +.LP .LP \f4\-O \-\-no\-keep\-file\-order\fP .LP -.RS 3 - -.LP .LP The packer will reorder and transmit all elements. Additionally, the packer may remove JAR directory names. This will reduce the download size; however, certain JAR file optimizations, such as indexing, may not work correctly. .LP -.RE .LP \f4\-Svalue \-\-segment\-limit=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The value is the estimated target size N (in bytes) of each archive segment. If a single input file requires .br @@ -151,31 +116,23 @@ The size of each segment is estimated by counting the size of each input file to be transmitted in the segment, along with the size of its name and other transmitted properties. .LP .LP -The default is \f21000000\fP (a million bytes). This allows input JAR files of moderate size to be transmitted in one segment. It also puts a limit on memory requirements for packers and unpackers. +The default is \-1, which means the packer will always create a single segment output file. In cases where extremely large output files are generated, users are strongly encouraged to use segmenting or break up the input file into smaller JARs. .LP .LP A 10MB JAR packed without this limit will typically pack about 10% smaller, but the packer may require a larger Java heap (about ten times the segment limit). .LP -.RE .LP \f4\-Evalue \-\-effort=\fP\f2value\fP .LP -.RS 3 - -.LP .LP If the value is set to a single decimal digit, the packer will use the indicated amount of effort in compressing the archive. Level \f21\fP may produce somewhat larger size and faster compression speed, while level \f29\fP will take much longer but may produce better compression. The special value \f20\fP instructs the packer to copy through the original JAR file directly with no compression. The JSR 200 standard requires any unpacker to understand this special case as a pass\-through of the entire archive. .LP .LP The default is \f25\fP, investing a modest amount of time to produce reasonable compression. .LP -.RE .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Overrides the default, which preserves the input information, but may cause the transmitted archive to be larger. The possible values are: .LP @@ -195,13 +152,9 @@ .RE .LP -.RE .LP \f4\-mvalue \-\-modification\-time=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The possible values are: .LP @@ -215,23 +168,15 @@ .RE .LP -.RE .LP \f4\-Pfile \-\-pass\-file=\fP\f2file\fP .LP -.RS 3 - -.LP .LP Indicates that a file should be passed through bytewise with no compression. By repeating the option, multiple files may be specified. There is no pathname transformation, except that the system file separator is replaced by the JAR file separator "\f2/\fP". The resulting file names must match exactly as strings with their occurrences in the JAR file. If file is a directory name, all files under that directory will be passed. .LP -.RE .LP \f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP .LP -.RS 3 - -.LP .LP Overrides the default behavior; i.e., the classfile containing the unknown attribute will be passed through with the specified action. The possible values for actions are: .LP @@ -248,7 +193,6 @@ .RE .LP -.RE .LP \f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP .br @@ -258,9 +202,6 @@ .br \f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP .LP -.RS 3 - -.LP .LP With the above four options, the attribute layout can be specified for a class entity, such as Class attribute, Field attribute, Method attribute, and Code attribute. The attribute\-name is the name of the attribute for which the layout or action is being defined. The possible values for action are: .LP @@ -282,19 +223,12 @@ .LP Example: \f2\-\-class\-attribute=CompilationID=pass\fP will cause the class file containing this attribute to be passed through without further action by the packer. .LP -.RE .LP \f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP .LP -.RS 3 - -.LP .LP A configuration file, containing Java properties to initialize the packer, may be specified on the command line. .LP -.RS 3 - -.LP .LP \f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP .br @@ -318,69 +252,53 @@ .br \f2segment.limit=\-1\fP .LP -.RE -.RE -.RS 3 - -.LP .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP .LP -\f4\-Joption\fP +Prints help information about this command. .LP -.RS 3 - +.LP +\f4\-V \-\-version\fP .LP .LP -Passes option to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP .LP -.RE -.RE +.LP +Passes \f2option\fP to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP for successful completion; .LP .LP \f2>0\fP if an error occurs. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -392,13 +310,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -413,8 +331,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2pack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/policytool.1 --- a/jdk/src/linux/doc/man/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "02 Jun 2010" +.TH policytool 1 "10 May 2011" .LP .SH "Name" @@ -28,8 +28,6 @@ \f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 \ @@ -57,7 +55,7 @@ .na \f2the Policytool Users Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html. .SH "OPTIONS" .RS 3 .TP 3 @@ -67,22 +65,22 @@ .na \f2Default Policy Implementation and Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html .br .na \f2Policy Tool Users' Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html .br .na \f2Security Permissions\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html .br .na \f2Security Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html .br .RE .RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/rmic.1 --- a/jdk/src/linux/doc/man/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "02 Jun 2010" +.TH rmic 1 "10 May 2011" .LP .SH "Name" rmic \- The Java RMI Compiler .LP -.RS 3 - -.LP .LP \f3rmic\fP generates stub, skeleton, and tie classes for remote objects using either the JRMP or IIOP protocols. Also generates OMG IDL. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmic\fP compiler generates stub and skeleton class files (JRMP protocol) and stub and tie class files (IIOP protocol) for remote objects. These classes files are generated from compiled Java programming language classes that are remote object implementation classes. A remote implementation class is a class that implements the interface \f2java.rmi.Remote\fP. The class names in the \f3rmic\fP command must be for classes that have been compiled successfully with the \f3javac\fP command and must be fully package qualified. For example, running \f3rmic\fP on the class file name \f2HelloImpl\fP as shown here: .LP @@ -81,8 +73,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-bootclasspath path @@ -90,9 +80,6 @@ .TP 3 \-classpath path Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.RS 3 - -.LP .nf \f3 .fl @@ -100,11 +87,7 @@ .fl \fP .fi -.RE For example: -.RS 3 - -.LP .nf \f3 .fl @@ -112,13 +95,9 @@ .fl \fP .fi -.RE .TP 3 \-d directory Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command -.RS 3 - -.LP .nf \f3 .fl @@ -126,7 +105,6 @@ .fl \fP .fi -.RE would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.) .br \ @@ -136,16 +114,16 @@ .TP 3 \-g Enables generation of all debugging information, including local variables. By default, only line number information is generated. -.LP .TP 3 \-idl Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the .na \f2Java Language to IDL Mapping\fP @ .fi -http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. -.LP -When the \f2\-idl\fP option is used, other options also include: +http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. +.br +.br +When the \f2\-idl\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -160,31 +138,22 @@ \-idlFile\ fromJavaPackage[.class]\ toIDLFile Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\ .RE -.LP .TP 3 \-iiop -Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. -.LP +Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. +.br +.br Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention: -.RS 3 - -.LP .nf \f3 .fl _<implementationName>_stub.class .fl -\fP -.br -\f3 -.fl _<interfaceName>_tie.class .fl \fP .fi -.RE -.LP -When the \f2\-iiop\fP option is used, other options also include: +When the \f2\-iiop\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -197,13 +166,11 @@ Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option. .TP 3 \-poa -Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. -.LP -The \f2PortableServer\fP module for the +Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the .na \f2Portable Object Adapter\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. .RE .TP 3 \-J @@ -214,18 +181,18 @@ .TP 3 \-nowarn Turns off warnings. If used the compiler does not print out any warnings. -.LP +.TP 3 +\-nowrite +Does not write compiled classes to the file system. .TP 3 \-vcompat Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation. .TP 3 \-verbose Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded. -.LP .TP 3 \-v1.1 Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used). -.LP .TP 3 \-v1.2 (default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine. @@ -234,15 +201,10 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example, -.RS 3 - -.LP .nf \f3 .fl @@ -251,18 +213,15 @@ \fP .fi .RE -.RE .LP .SH "SEE ALSO" .LP - -.LP .LP java(1), javac(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/rmid.1 --- a/jdk/src/linux/doc/man/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "02 Jun 2010" +.TH rmid 1 "10 May 2011" .LP .SH "Name" rmid \- The Java RMI Activation System Daemon .LP -.RS 3 - -.LP .LP \f3rmid\fP starts the activation system daemon that allows objects to be registered and activated in a virtual machine (VM). .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,18 +41,16 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the .na \f2Java RMI Specification\fP @ .fi -http://java.sun.com/javase/6/docs/platform/rmi/spec/rmiTOC.html and +http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and .na \f2Activation tutorials\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. .LP .LP The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows: @@ -133,8 +125,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-C<someCommandLineOption> @@ -169,7 +159,6 @@ .TP 3 \-J\-Dsun.rmi.activation.execPolicy=<policy> Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP: -.LP .RS 3 .TP 2 o @@ -255,17 +244,9 @@ The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups. .LP To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example: -.RS 3 - .LP -.LP -\f2rmid \-J\-Djava.security.policy=rmid.policy\fP -.LP +\f2rmid \-J\-Djava.security.policy=rmid.policy\fP .RE -.RE -.TP 2 -o -.LP .TP 2 o \f4<policyClassName>\fP @@ -285,7 +266,6 @@ \fP .fi Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object. -.LP .TP 2 o \f3none\fP @@ -318,9 +298,9 @@ \-stop Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098. .RE -.SH "ENVIRONMENT VARIABLES" + .LP - +.SH "ENVIRONMENT VARIABLES" .LP .RS 3 .TP 3 @@ -338,13 +318,11 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP rmic(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath, java(1) +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/rmiregistry.1 --- a/jdk/src/linux/doc/man/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,19 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "02 Jun 2010" +.TH rmiregistry 1 "10 May 2011" .LP .SH "Name" rmiregistry \- The Java Remote Object Registry .LP .RS 3 +The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. +.RE .LP -.LP -The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. -.LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmiregistry\fP command creates and starts a remote object registry on the specified \f2port\fP on the current host. If \f2port\fP is omitted, the registry is started on port 1099. The \f3rmiregistry\fP command produces no output and is typically run in the background. For example: .LP @@ -69,8 +63,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-J @@ -80,17 +72,12 @@ .LP .SH "SEE ALSO" .LP - -.LP -.LP java(1), .na \f2java.rmi.registry.LocateRegistry\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/registry/LocateRegistry.html and +http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and .na \f2java.rmi.Naming\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/Naming.html -.LP - +http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/schemagen.1 --- a/jdk/src/linux/doc/man/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "02 Jun 2010" +.TH schemagen 1 "10 May 2011" .LP .SH "Name" @@ -30,8 +30,7 @@ .br \f3Implementation Version:\fP 2.1.3 .LP -.SS -Launching schemagen +.SH "Launching schemagen" .LP .LP The schema generator can be launched using the appropriate \f2schemagen\fP shell script in the \f2bin\fP directory for your platform. @@ -46,9 +45,6 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -58,19 +54,13 @@ .fl \fP .fi -.RE .LP .LP If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema. .LP -.RS 3 - -.LP -\f3Command Line Options\fP -.LP -.RS 3 - +.SS +Command Line Options .LP .nf \f3 @@ -79,24 +69,29 @@ .fl .fl -Options: +Options: +.fl + \-d <path> : specify where to place processor and javac generated class files .fl - \-d <path> : Specify where to place processor and javac generated class files + \-cp <path> : specify where to find user specified files +.fl + \-classpath <path> : specify where to find user specified files .fl - \-cp <path> : Specify where to find user specified files + \-encoding <encoding> : specify encoding to be used for apt/javac invocation +.fl + .fl - \-classpath <path> : Specify where to find user specified files + \-episode <file> : generate episode file for separate compilation .fl - \-help : Display this usage message + \-version : display version information +.fl + \-help : display this usage message .fl \fP .fi -.RE .LP -.RE -.SS -Generated Resource Files +.SH "Generated Resource Files" .LP .LP The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use @@ -105,7 +100,8 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.SH "See Also" +.SH "Name" +See Also .LP .RS 3 .TP 2 @@ -124,7 +120,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/serialver.1 --- a/jdk/src/linux/doc/man/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "02 Jun 2010" +.TH serialver 1 "10 May 2011" .LP .SH "Name" serialver \- The Serial Version Command .LP -.RS 3 - -.LP .LP The \f3serialver\fP command returns the \f2serialVersionUID\fP. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified in this document. @@ -57,18 +48,13 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f3serialver\fP returns the \f2serialVersionUID\fP for one or more classes in a form suitable for copying into an evolving class. When invoked with no arguments it prints a usage line. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath <directories and zip/jar files separated by :> @@ -88,36 +74,24 @@ .LP .SH "NOTES" .LP - -.LP .LP The \f3serialver\fP command loads and initializes the specified classes in its virtual machine, and by default, it does not set a security manager. If \f3serialver\fP is to be run with untrusted classes, a security manager can be set with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.manager\fP .LP -.RE .LP and, if necessary, a security policy can be specified with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.policy=<policy file>\fP .LP -.RE .SH "SEE ALSO" .LP - -.LP .LP .na \f2java.io.ObjectStreamClass\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/io/ObjectStreamClass.html +http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/servertool.1 --- a/jdk/src/linux/doc/man/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "02 Jun 2010" +.TH servertool 1 "10 May 2011" .LP .SH "Name" servertool \- The Java(TM) IDL Server Tool .LP -.RS 3 - -.LP -\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. -.RE +\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,15 +48,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f2servertool\fP provides the command\-line interface for the application programmers to register, unregister, startup, and shutdown a persistent server. Other commands are provided to obtain various statistical information about the server. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-ORBInitialHost nameserverhost @@ -75,8 +65,6 @@ .LP .SH "COMMANDS" .LP - -.LP .RS 3 .TP 3 register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ] @@ -122,6 +110,4 @@ .LP .SH "SEE ALSO" .LP - -.LP orbd(1) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/tnameserv.1 --- a/jdk/src/linux/doc/man/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "02 Jun 2010" +.TH tnameserv 1 "10 May 2011" .LP .SH "Name" @@ -30,7 +30,7 @@ .na \f2Java IDL Naming Service Included with ORBD\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html topic. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic. .LP .LP Topics in this section include: @@ -120,11 +120,11 @@ .na \f2The Hello World Example Using RMI\-IIOP\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. .na \f2Java IDL: Running the Hello World Example on TWO Machines\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. .LP .LP For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP. @@ -170,16 +170,12 @@ .LP This command\-line option is available for use with \f2tnameserve\fP: .RS 3 - -.LP -.RS 3 .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine. .RE .LP -.RE .SH "Stopping the Java\ IDL Transient Naming Service" .LP .LP @@ -190,28 +186,27 @@ .LP The following sample program illustrates how to add names to the namespace. It is a self\-contained Transient Naming Service client that creates the following simple tree. .LP -.nf -\f3 -.fl -\fP\f3 -.fl - \fP\f4Initial\fP\f3 -.fl - \fP\f4Naming Context\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - plans \fP\f4Personal\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - calendar schedule\fP -.fl -.fi +.RS 3 +.TP 2 +o +\f4Initial Naming Context\fP +.RS 3 +.TP 2 +* +\f3plans\fP +.TP 2 +* +\f4Personal\fP +.RS 3 +.TP 2 +- +\f3calendar\fP +.TP 2 +- +\f3schedule\fP +.RE +.RE +.RE .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/unpack200.1 --- a/jdk/src/linux/doc/man/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "02 Jun 2010" +.TH unpack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 input\-file Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker. @@ -48,107 +43,78 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage: .LP -.RS 3 - -.LP .LP \f2% unpack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings. .LP .SH "OPTIONS" .LP -.SS -Standard Options -.LP -.RS 3 - -.LP .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file. .LP -.RE -.RE -.SS -Non\-Standard Options -.LP -.RS 3 - -.LP .LP \f4\-r \-\-remove\-pack\-file\fP .LP -.RS 3 - -.LP .LP Removes the input packed file. .LP -.RE .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP +.LP +Prints help information about this command. +.LP +.LP +\f4\-V \-\-version\fP +.LP +.LP +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP +.LP +.LP +Passes \f2option\fP to the Java launcher called by \f2unpack200\fP. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP if successful completion; .LP .LP \f2>0\fP if an error occurred. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -160,13 +126,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -181,8 +147,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/wsgen.1 --- a/jdk/src/linux/doc/man/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "02 Jun 2010" +.TH wsgen 1 "10 May 2011" .SH "Name" wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 -.RS 3 - -.LP .LP \f3Specification Version:\fP 2.1 .br \f3Implementation Version:\fP 2.1.1 .LP -.LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation -.LP -.RE .SH "Overview" .LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see @@ -83,7 +77,6 @@ The following table lists the \f2wsgen\fP options. .br .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -354,7 +347,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 139 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 133 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -571,7 +564,6 @@ .rm i+ .rm j+ .rm k+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-53 .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/wsimport.1 --- a/jdk/src/linux/doc/man/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "02 Jun 2010" +.TH wsimport 1 "10 May 2011" .SH "Name" wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 .LP @@ -88,7 +88,6 @@ .LP The following table lists the \f2wsimport\fP options. .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -676,7 +675,6 @@ .rm l+ .rm m+ .rm n+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-66 .LP Multiple JAX\-WS and JAXB binding files can be specified using \f2\-b\fP option and they can be used to customize various things like package names, bean names, etc. More information on JAX\-WS and JAXB binding files can be found in the @@ -685,14 +683,293 @@ .fi https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html. .LP +The following table lists \f2wsimport\fP non\-standard options: +.LP +.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 +.de 35 +.ps \n(.s +.vs \n(.vu +.in \n(.iu +.if \n(.u .fi +.if \n(.j .ad +.if \n(.j=0 .na +.. +.nf +.nr #~ 0 +.if n .nr #~ 0.6n +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.fc +.nr 33 \n(.s +.rm 80 81 +.nr 34 \n(.lu +.eo +.am 81 +.br +.di a+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Map headers not bound to request or response message to Java method parameters. +.br +.di +.nr a| \n(dn +.nr a- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di b+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +WSDL URI that specifies the file that contains authorization information; this URI is in the following format: http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl +.br +.di +.nr b| \n(dn +.nr b- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di c+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Print debugging information. +.br +.di +.nr c| \n(dn +.nr c- \n(dl +.. +.ec \ +.eo +.am 80 +.br +.di d+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(80 .ll \n(80u +.in 0 +\f3\-Xno\-addressing\-databinding\fP +.br +.di +.nr d| \n(dn +.nr d- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di e+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Enable binding of W3C \f2EndpointReferenceType\fP to Java. +.br +.di +.nr e| \n(dn +.nr e- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di f+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Do not compile generated Java files. +.br +.di +.nr f| \n(dn +.nr f- \n(dl +.. +.ec \ +.35 +.nf +.ll \n(34u +.nr 80 0 +.nr 38 \w\f3Option\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-XadditionalHeaders\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xauthfile <file>\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xdebug\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xnocompile\fP +.if \n(80<\n(38 .nr 80 \n(38 +.80 +.rm 80 +.nr 38 \n(d- +.if \n(80<\n(38 .nr 80 \n(38 +.nr 81 0 +.nr 38 \w\f3Description\fP +.if \n(81<\n(38 .nr 81 \n(38 +.81 +.rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(b- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(c- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(e- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(f- +.if \n(81<\n(38 .nr 81 \n(38 +.35 +.nf +.ll \n(34u +.nr 38 1n +.nr 79 0 +.nr 40 \n(79+(0*\n(38) +.nr 80 +\n(40 +.nr 41 \n(80+(3*\n(38) +.nr 81 +\n(41 +.nr TW \n(81 +.if t .if \n(TW>\n(.li .tm Table at line 193 file Input is too wide - \n(TW units +.fc +.nr #T 0-1 +.nr #a 0-1 +.eo +.de T# +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.mk ## +.nr ## -1v +.ls 1 +.ls +.. +.ec +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP +.ne \n(a|u+\n(.Vu +.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.a+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(b|u+\n(.Vu +.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.b+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(c|u+\n(.Vu +.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.c+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(d|u+\n(.Vu +.ne \n(e|u+\n(.Vu +.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v) +.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(40u +.in +\n(37u +.d+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.e+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(f|u+\n(.Vu +.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.f+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.fc +.nr T. 1 +.T# 1 +.35 +.rm a+ +.rm b+ +.rm c+ +.rm d+ +.rm e+ +.rm f+ +.if \n-(b.=0 .nr c. \n(.c-\n(d.-26 + +.LP .SH "Example" .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -This will generate the Java artifacts and compile them by importing the \f2http://stockquote.xyz/quote?wsdl\fP. +This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP. .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/xjc.1 --- a/jdk/src/linux/doc/man/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,19 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "02 Jun 2010" +.TH xjc 1 "10 May 2011" .LP -.ad c .SH "Name" xjc \- Java(TM) Architecture for XML Binding .br -Binding Compiler +Binding Compiler +.LP .LP \f3Specification Version:\fP 2.1 .br -\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l - +\f3Reference Implementation (RI) Version:\fP 2.1.3 .LP .SH "Launching xjc" .LP @@ -42,84 +41,87 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html. .LP -.RS 3 - -.LP .LP \f2% xjc \-help\fP .LP -.RE -\f3Output\fP -.LP -.RS 3 - +.SS +Output .LP .nf \f3 .fl -Usage: xjc [\-options ...] <schema_file/URL/dir> ... [\-b <bindinfo>] ... +Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ... +.fl +If dir is specified, all schema files in it will be compiled. +.fl +If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled. .fl Options: .fl - \-nv : do not perform strict validation of the input schema(s) + \-nv : do not perform strict validation of the input schema(s) .fl - \-extension : allow vendor extensions \- do not strictly follow the + \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec .fl - Compatibility Rules and App E.2 from the JAXB Spec + \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched .fl - \-b <file/dir> : specify external bindings files (each <file> must have its own \-b) + \-d <dir> : generated files will go into this directory +.fl + \-p <pkg> : specifies the target package .fl - If a directory is given, **/*.xjb is searched + \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort .fl - \-d <dir> : generated files will go into this directory + \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password .fl - \-p <pkg> : specifies the target package + \-classpath <arg> : specify where to find user class files .fl - \-httpproxy <proxy> : set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort + \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format .fl - \-httpproxyfile <file>: set the proxy string (same format as above). + \-readOnly : generated files will be in read\-only mode .fl - \-classpath <arg> : specify where to find user class files + \-npa : suppress generation of package level annotations (**/package\-info.java) +.fl + \-no\-header : suppress generation of a file header with timestamp .fl - \-catalog <file> : specify catalog files to resolve external entity references + \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features .fl - support TR9401, XCatalog, and OASIS XML Catalog format. + \-xmlschema : treat input as W3C XML Schema (default) .fl - \-readOnly : generated files will be in read\-only mode + \-relaxng : treat input as RELAX NG (experimental,unsupported) .fl - \-npa : suppress generation of package level annotations (**/package\-info.java) + \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) .fl - \-no\-header : suppress generation of a file header with timestamp + \-dtd : treat input as XML DTD (experimental,unsupported) .fl - \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features. + \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +.fl + \-verbose : be extra verbose .fl - \-xmlschema : treat input as W3C XML Schema (default) + \-quiet : suppress compiler output .fl - \-relaxng : treat input as RELAX NG (experimental,unsupported) + \-help : display this help message .fl - \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) + \-version : display version information +.fl + .fl - \-dtd : treat input as XML DTD (experimental,unsupported) + .fl - \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +Extensions: .fl - \-verbose : be extra verbose + \-Xlocator : enable source location support for generated code .fl - \-quiet : suppress compiler output + \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword .fl - \-help : display this help message + \-mark\-generated : mark the generated code as @javax.annotation.Generated .fl - \-version : display version information + \-episode <FILE> : generate the episode file for separate compilation .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-nv @@ -129,15 +131,9 @@ By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions .TP 3 \-b <file> -Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: -.RS 3 - -.LP -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP +Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP .br -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP -.RE -In addition, the ordering of the schema files and binding files on the command line does not matter. +\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter. .TP 3 \-d <dir> By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you. @@ -199,12 +195,30 @@ <schema file/URL/dir> Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them. .RE + +.LP .SS -Summary of Deprecated and Removed Command Line Options +Non\-Standard Command Line Options .LP .RS 3 +.TP 3 +\-Xlocator +Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling. +.TP 3 +\-Xsync\-methods +Causes all of the generated method signatures to include the \f2synchronized\fP keyword. +.TP 3 +\-mark\-generated +Mark the generated code with the annotation \f2@javax.annotation.Generated\fP. +.TP 3 +\-episode <file> +Generate the specified episode file for separate compilation. +.RE .LP +.SS +Deprecated and Removed Command Line Options +.LP .RS 3 .TP 3 \-host & \-port @@ -215,13 +229,9 @@ .TP 3 \-source The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase. -.TP 3 -\-Xlocator & \-Xsync\-methods -These switches have been disabled for now. We plan on releasing this functionality as a separate download in the future. .RE .LP -.RE .SS Compiler Restrictions .LP @@ -280,7 +290,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties --- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Sat May 14 11:52:15 2011 -0700 @@ -131,7 +131,7 @@ # accessible states # managesDescendants=gestiona descendientes -indeterminate=indeterminado +indeterminate=indeterminada truncated=truncado # new for J2SE 1.6.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Sat May 14 11:52:15 2011 -0700 @@ -56,9 +56,9 @@ FileChooser.renameFileButtonText=Rename File FileChooser.renameFileButtonMnemonic=82 FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 +#FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 +#FileChooser.saveButtonMnemonic=79 FileChooser.openButtonText=OK FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=Save @@ -79,9 +79,5 @@ FileChooser.renameFileErrorTitle=Error FileChooser.renameFileErrorText=Error renaming file "{0}" to "{1}" -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Cancel -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Sat May 14 11:52:15 2011 -0700 @@ -24,7 +24,7 @@ GTKColorChooserPanel.hueMnemonic=70 GTKColorChooserPanel.redText=Rot: -GTKColorChooserPanel.redMnemonic=79 +GTKColorChooserPanel.redMnemonic=82 GTKColorChooserPanel.saturationText=S\u00E4ttigung: GTKColorChooserPanel.saturationMnemonic=83 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valor: GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Vert : -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valeur : GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valore: GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=OK(O) +FileChooser.saveButtonText=OK FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK(O) +FileChooser.openButtonText=OK FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u4FDD\u5B58 FileChooser.openDialogTitleText=\u958B\u304F @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC FileChooser.renameFileErrorText=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F -# dummy resource added for translation automation -OptionPane.okButtonText=OK(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\u53D6\u6D88(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\uCDE8\uC18C(C) +FileChooser.cancelButtonText=\uCDE8\uC18C FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\uD655\uC778(O) +FileChooser.saveButtonText=\uD655\uC778 FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\uD655\uC778(O) +FileChooser.openButtonText=\uD655\uC778 FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\uC800\uC7A5 FileChooser.openDialogTitleText=\uC5F4\uAE30 @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\uC624\uB958 FileChooser.renameFileErrorText="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. -# dummy resource added for translation automation -OptionPane.okButtonText=\uD655\uC778(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\uCDE8\uC18C(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=68 GTKColorChooserPanel.valueText=Valor: GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -39,7 +39,7 @@ GTKColorChooserPanel.blueMnemonic=66 GTKColorChooserPanel.colorNameText=F\u00E4rgnamn: -GTKColorChooserPanel.colorNameMnemonic=78 +GTKColorChooserPanel.colorNameMnemonic=70 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u786E\u5B9A(O) +FileChooser.saveButtonText=\u786E\u5B9A FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u786E\u5B9A(O) +FileChooser.openButtonText=\u786E\u5B9A FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u4FDD\u5B58 FileChooser.openDialogTitleText=\u6253\u5F00 @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\u9519\u8BEF FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519 -# dummy resource added for translation automation -OptionPane.okButtonText=\u786E\u5B9A(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\u53D6\u6D88(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u78BA\u5B9A(O) +FileChooser.saveButtonText=\u78BA\u5B9A FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u78BA\u5B9A(O) +FileChooser.openButtonText=\u78BA\u5B9A FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u5132\u5B58 FileChooser.openDialogTitleText=\u958B\u555F @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\u932F\u8AA4 FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4 -# dummy resource added for translation automation -OptionPane.okButtonText=\u78BA\u5B9A(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\u53D6\u6D88(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java --- a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Sat May 14 11:52:15 2011 -0700 @@ -92,4 +92,39 @@ * @return the total amount of physical memory in bytes. */ public long getTotalPhysicalMemorySize(); + + /** + * Returns the "recent cpu usage" for the whole system. This value is a + * double in the [0.0,1.0] interval. A value of 0.0 means that all CPUs + * were idle during the recent period of time observed, while a value + * of 1.0 means that all CPUs were actively running 100% of the time + * during the recent period being observed. All values betweens 0.0 and + * 1.0 are possible depending of the activities going on in the system. + * If the system recent cpu usage is not available, the method returns a + * negative value. + * + * @return the "recent cpu usage" for the whole system; a negative + * value if not available. + * @since 1.7 + */ + public double getSystemCpuLoad(); + + /** + * Returns the "recent cpu usage" for the Java Virtual Machine process. + * This value is a double in the [0.0,1.0] interval. A value of 0.0 means + * that none of the CPUs were running threads from the JVM process during + * the recent period of time observed, while a value of 1.0 means that all + * CPUs were actively running threads from the JVM 100% of the time + * during the recent period being observed. Threads from the JVM include + * the application threads as well as the JVM internal threads. All values + * betweens 0.0 and 1.0 are possible depending of the activities going on + * in the JVM process and the whole system. If the Java Virtual Machine + * recent CPU usage is not available, the method returns a negative value. + * + * @return the "recent cpu usage" for the Java Virtual Machine process; + * a negative value if not available. + * @since 1.7 + */ + public double getProcessCpuLoad(); + } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java --- a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1666,7 +1666,7 @@ */ protected void removeCurrentRow() { ((Row)getCurrentRow()).setDeleted(); - rvh.remove(cursorPos); + rvh.remove(cursorPos - 1); --numRows; } @@ -6349,7 +6349,6 @@ // this can happen if deleted rows are being shown if (row.getDeleted() == true) { removeCurrentRow(); - --numRows; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java --- a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -395,7 +395,13 @@ private boolean succeeded = false; private boolean commitSucceeded = false; private String username; + + // Encryption keys calculated from password. Assigned when storekey == true + // and useKeyTab == false (or true but not found) private EncryptionKey[] encKeys = null; + + KeyTab ktab = null; + private Credentials cred = null; private PrincipalName principal = null; @@ -663,28 +669,49 @@ (krb5PrincName.toString(), PrincipalName.KRB_NT_PRINCIPAL); } + + /* + * Before dynamic KeyTab support (6894072), here we check if + * the keytab contains keys for the principal. If no, keytab + * will not be used and password is prompted for. + * + * After 6894072, we normally don't check it, and expect the + * keys can be populated until a real connection is made. The + * check is still done when isInitiator == true, where the keys + * will be used right now. + * + * Probably tricky relations: + * + * useKeyTab is config flag, but when it's true but the ktab + * does not contains keys for principal, we would use password + * and keep the flag unchanged (for reuse?). In this method, + * we use (ktab != null) to check whether keytab is used. + * After this method (and when storeKey == true), we use + * (encKeys == null) to check. + */ if (useKeyTab) { - encKeys = - EncryptionKey.acquireSecretKeys(principal, keyTabName); - - if (debug) { - if (encKeys != null) - System.out.println - ("principal's key obtained from the keytab"); - else - System.out.println - ("Key for the principal " + - principal + - " not available in " + - ((keyTabName == null) ? - "default key tab" : keyTabName)); + ktab = (keyTabName == null) + ? KeyTab.getInstance() + : KeyTab.getInstance(new File(keyTabName)); + if (isInitiator) { + if (Krb5Util.keysFromJavaxKeyTab(ktab, principal).length + == 0) { + ktab = null; + if (debug) { + System.out.println + ("Key for the principal " + + principal + + " not available in " + + ((keyTabName == null) ? + "default key tab" : keyTabName)); + } + } } - } KrbAsReqBuilder builder; - // We can't get the key from the keytab so prompt - if (encKeys == null) { + + if (ktab == null) { promptForPass(getPasswdFromSharedState); builder = new KrbAsReqBuilder(principal, password); if (isInitiator) { @@ -693,9 +720,13 @@ // updated with PA info cred = builder.action().getCreds(); } - encKeys = builder.getKeys(); + if (storeKey) { + encKeys = builder.getKeys(); + // When encKeys is empty, the login actually fails. + // For compatibility, exception is thrown in commit(). + } } else { - builder = new KrbAsReqBuilder(principal, encKeys); + builder = new KrbAsReqBuilder(principal, ktab); if (isInitiator) { cred = builder.action().getCreds(); } @@ -705,10 +736,15 @@ if (debug) { System.out.println("principal is " + principal); HexDumpEncoder hd = new HexDumpEncoder(); - for (int i = 0; i < encKeys.length; i++) { - System.out.println("EncryptionKey: keyType=" + - encKeys[i].getEType() + " keyBytes (hex dump)=" + - hd.encodeBuffer(encKeys[i].getBytes())); + if (ktab != null) { + System.out.println("Will use keytab"); + } else if (storeKey) { + for (int i = 0; i < encKeys.length; i++) { + System.out.println("EncryptionKey: keyType=" + + encKeys[i].getEType() + + " keyBytes (hex dump)=" + + hd.encodeBuffer(encKeys[i].getBytes())); + } } } @@ -989,8 +1025,8 @@ kerbTicket = Krb5Util.credsToTicket(cred); } - if (storeKey) { - if (encKeys == null || encKeys.length <= 0) { + if (storeKey && encKeys != null) { + if (encKeys.length == 0) { succeeded = false; throw new LoginException("Null Server Key "); } @@ -1006,10 +1042,11 @@ } } - // Let us add the kerbClientPrinc,kerbTicket and kerbKey (if + // Let us add the kerbClientPrinc,kerbTicket and KeyTab/KerbKey (if // storeKey is true) - if (!princSet.contains(kerbClientPrinc)) + if (!princSet.contains(kerbClientPrinc)) { princSet.add(kerbClientPrinc); + } // add the TGT if (kerbTicket != null) { @@ -1018,19 +1055,29 @@ } if (storeKey) { - for (int i = 0; i < kerbKeys.length; i++) { - if (!privCredSet.contains(kerbKeys[i])) { - privCredSet.add(kerbKeys[i]); + if (encKeys == null) { + if (!privCredSet.contains(ktab)) { + privCredSet.add(ktab); + // Compatibility; also add keys to privCredSet + for (KerberosKey key: ktab.getKeys(kerbClientPrinc)) { + privCredSet.add(new Krb5Util.KeysFromKeyTab(key)); + } } - encKeys[i].destroy(); - encKeys[i] = null; - if (debug) { - System.out.println("Added server's key" - + kerbKeys[i]); - System.out.println("\t\t[Krb5LoginModule] " + - "added Krb5Principal " + - kerbClientPrinc.toString() - + " to Subject"); + } else { + for (int i = 0; i < kerbKeys.length; i ++) { + if (!privCredSet.contains(kerbKeys[i])) { + privCredSet.add(kerbKeys[i]); + } + encKeys[i].destroy(); + encKeys[i] = null; + if (debug) { + System.out.println("Added server's key" + + kerbKeys[i]); + System.out.println("\t\t[Krb5LoginModule] " + + "added Krb5Principal " + + kerbClientPrinc.toString() + + " to Subject"); + } } } } @@ -1106,7 +1153,8 @@ while (it.hasNext()) { Object o = it.next(); if (o instanceof KerberosTicket || - o instanceof KerberosKey) { + o instanceof KerberosKey || + o instanceof KeyTab) { it.remove(); } } @@ -1161,6 +1209,7 @@ } else { // remove temp results for the next try encKeys = null; + ktab = null; principal = null; } username = null; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Sat May 14 11:52:15 2011 -0700 @@ -57,7 +57,7 @@ Specify a different file name. FileChooser.acceptAllFileFilterText=All Files FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 +#FileChooser.cancelButtonMnemonic=67 // not needed? FileChooser.saveButtonText=Save FileChooser.saveButtonMnemonic=83 // not needed? FileChooser.openButtonText=Open @@ -146,9 +146,9 @@ OptionPane.noButtonText=No OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=0 +#OptionPane.okButtonMnemonic=0 OptionPane.cancelButtonText=Cancel -OptionPane.cancelButtonMnemonic=0 +#OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=Select an Option # Title for the dialog for the showInputDialog methods. Only used if # the developer uses one of the variants that doesn't take a title. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Sat May 14 11:52:15 2011 -0700 @@ -144,7 +144,7 @@ OptionPane.yesButtonMnemonic=83 OptionPane.noButtonText=No OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=Aceptar OptionPane.okButtonMnemonic=O OptionPane.cancelButtonText=Cancelar OptionPane.cancelButtonMnemonic=C diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093 FileChooser.renameErrorFileExistsText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u4FDD\u5B58 FileChooser.saveButtonMnemonic=83 @@ -146,7 +146,7 @@ OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. FileChooser.renameErrorFileExistsText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624. FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C -FileChooser.cancelButtonText=\uCDE8\uC18C(C) +FileChooser.cancelButtonText=\uCDE8\uC18C FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\uC800\uC7A5 FileChooser.saveButtonMnemonic=83 @@ -144,9 +144,9 @@ OptionPane.yesButtonMnemonic=89 OptionPane.noButtonText=\uC544\uB2C8\uC624(N) OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=\uD655\uC778 OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\uCDE8\uC18C(0) +OptionPane.cancelButtonText=\uCDE8\uC18C OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\uC635\uC158 \uC120\uD0DD # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -96,7 +96,7 @@ ColorChooser.cancelText=Avbryt ColorChooser.resetText=\u00C5terst\u00E4ll # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 +ColorChooser.resetMnemonic=84 ColorChooser.sampleText=Exempeltext Exempeltext ColorChooser.swatchesNameText=Prov ColorChooser.swatchesMnemonic=80 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText=\u65E0\u6CD5\u91CD\u547D\u540D{0} FileChooser.renameErrorFileExistsText=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u4FDD\u5B58 FileChooser.saveButtonMnemonic=83 @@ -144,9 +144,9 @@ OptionPane.yesButtonMnemonic=89 OptionPane.noButtonText=\u5426(N) OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=\u786E\u5B9A OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879 # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0} FileChooser.renameErrorFileExistsText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u5132\u5B58 FileChooser.saveButtonMnemonic=83 @@ -144,9 +144,9 @@ OptionPane.yesButtonMnemonic=89 OptionPane.noButtonText=\u5426(N) OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=\u78BA\u5B9A OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805 # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; public class AccessWatchpointSpec extends WatchpointSpec { @@ -38,6 +37,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws InvalidTypeException, NoSuchFieldException { if (!(refType instanceof ClassType)) { @@ -51,6 +51,7 @@ .createAccessWatchpointRequest(field)); } + @Override public boolean equals(Object obj) { return (obj instanceof AccessWatchpointSpec) && super.equals(obj); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,9 @@ public class AmbiguousMethodException extends Exception { + + private static final long serialVersionUID = 7793370943251707514L; + public AmbiguousMethodException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,30 +25,33 @@ package com.sun.tools.example.debug.bdi; -import com.sun.jdi.request.*; - public abstract class BreakpointSpec extends EventRequestSpec { BreakpointSpec(EventRequestSpecList specs, ReferenceTypeSpec refSpec) { super(specs, refSpec); } + @Override void notifySet(SpecListener listener, SpecEvent evt) { listener.breakpointSet(evt); } + @Override void notifyDeferred(SpecListener listener, SpecEvent evt) { listener.breakpointDeferred(evt); } + @Override void notifyResolved(SpecListener listener, SpecEvent evt) { listener.breakpointResolved(evt); } + @Override void notifyDeleted(SpecListener listener, SpecEvent evt) { listener.breakpointDeleted(evt); } + @Override void notifyError(SpecListener listener, SpecErrorEvent evt) { listener.breakpointError(evt); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java Sat May 14 11:52:15 2011 -0700 @@ -43,10 +43,6 @@ private BufferedReader out; private BufferedReader err; - private InputWriter inputWriter; - private OutputReader outputReader; - private OutputReader errorReader; - private InputListener input; private OutputListener output; private OutputListener error; @@ -84,6 +80,7 @@ this.error = error; } + @Override public boolean attach() { if (!connectToVMProcess()) { @@ -131,6 +128,7 @@ return true; } + @Override public void detach() { //### debug @@ -242,10 +240,7 @@ this.diagnostics = diagnostics; } - public void quit() { - running = false; - } - + @Override public void run() { try { int count; @@ -254,6 +249,7 @@ // Run in Swing event dispatcher thread. final String chars = new String(buffer, 0, count); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { output.putString(chars); } @@ -264,6 +260,7 @@ } catch (IOException e) { // Run in Swing event dispatcher thread. SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { diagnostics.putString("IO error reading " + streamName + @@ -288,11 +285,7 @@ this.input = input; } - public void quit() { - //### Won't have much effect if blocked on input! - running = false; - } - + @Override public void run() { String line; while (running) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class EvaluationException extends Exception {} +public class EvaluationException extends Exception { + + private static final long serialVersionUID = 4947109680354951694L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,8 +25,6 @@ package com.sun.tools.example.debug.bdi; -import java.util.*; - import com.sun.jdi.*; import com.sun.jdi.request.EventRequest; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,11 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.ReferenceType; -import com.sun.jdi.request.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Iterator; public class ExceptionSpec extends EventRequestSpec { @@ -45,22 +40,27 @@ this.notifyUncaught = notifyUncaught; } + @Override void notifySet(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptSet(evt); } + @Override void notifyDeferred(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptDeferred(evt); } + @Override void notifyResolved(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptResolved(evt); } + @Override void notifyDeleted(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptDeleted(evt); } + @Override void notifyError(SpecListener listener, SpecErrorEvent evt) { listener.exceptionInterceptError(evt); } @@ -68,16 +68,19 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) { setRequest(refType.virtualMachine().eventRequestManager() .createExceptionRequest(refType, notifyCaught, notifyUncaught)); } + @Override public int hashCode() { return refSpec.hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof ExceptionSpec) { ExceptionSpec es = (ExceptionSpec)obj; @@ -88,6 +91,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer("exception catch "); buffer.append(refSpec.toString()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.event.*; import com.sun.jdi.request.*; import com.sun.jdi.connect.*; import com.sun.tools.example.debug.expr.ExpressionParser; @@ -56,7 +55,7 @@ // Session Listeners - Vector<SessionListener> sessionListeners = new Vector<SessionListener>(); + ArrayList<SessionListener> sessionListeners = new ArrayList<SessionListener>(); public void addSessionListener(SessionListener listener) { sessionListeners.add(listener); @@ -68,7 +67,7 @@ // Spec Listeners - Vector<SpecListener> specListeners = new Vector<SpecListener>(); + ArrayList<SpecListener> specListeners = new ArrayList<SpecListener>(); public void addSpecListener(SpecListener cl) { specListeners.add(cl); @@ -80,7 +79,7 @@ // JDI Listeners - Vector<JDIListener> jdiListeners = new Vector<JDIListener>(); + ArrayList<JDIListener> jdiListeners = new ArrayList<JDIListener>(); /** * Adds a JDIListener @@ -105,50 +104,50 @@ // App Echo Listeners - private Vector<OutputListener> appEchoListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> appEchoListeners = new ArrayList<OutputListener>(); public void addApplicationEchoListener(OutputListener l) { - appEchoListeners.addElement(l); + appEchoListeners.add(l); } public void removeApplicationEchoListener(OutputListener l) { - appEchoListeners.removeElement(l); + appEchoListeners.remove(l); } // App Output Listeners - private Vector<OutputListener> appOutputListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> appOutputListeners = new ArrayList<OutputListener>(); public void addApplicationOutputListener(OutputListener l) { - appOutputListeners.addElement(l); + appOutputListeners.add(l); } public void removeApplicationOutputListener(OutputListener l) { - appOutputListeners.removeElement(l); + appOutputListeners.remove(l); } // App Error Listeners - private Vector<OutputListener> appErrorListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> appErrorListeners = new ArrayList<OutputListener>(); public void addApplicationErrorListener(OutputListener l) { - appErrorListeners.addElement(l); + appErrorListeners.add(l); } public void removeApplicationErrorListener(OutputListener l) { - appErrorListeners.removeElement(l); + appErrorListeners.remove(l); } // Diagnostic Listeners - private Vector<OutputListener> diagnosticsListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> diagnosticsListeners = new ArrayList<OutputListener>(); public void addDiagnosticsListener(OutputListener l) { - diagnosticsListeners.addElement(l); + diagnosticsListeners.add(l); } public void removeDiagnosticsListener(OutputListener l) { - diagnosticsListeners.removeElement(l); + diagnosticsListeners.remove(l); } /////////// End Listener Registration ////////////// @@ -159,7 +158,9 @@ } void ensureActiveSession() throws NoSessionException { - if (session == null) throw new NoSessionException(); + if (session == null) { + throw new NoSessionException(); + } } public EventRequestManager eventRequestManager() { @@ -293,6 +294,7 @@ ensureActiveSession(); if (f != null) { frameGetter = new ExpressionParser.GetFrame() { + @Override public StackFrame get() /* throws IncompatibleThreadStateException */ { return f; } @@ -628,35 +630,35 @@ */ private void notifyInterrupted() { - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionInterrupt(evt); + l.get(i).sessionInterrupt(evt); } } private void notifyContinued() { - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionContinue(evt); + l.get(i).sessionContinue(evt); } } private void notifySessionStart() { - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionStart(evt); + l.get(i).sessionStart(evt); } } private void notifySessionDeath() { /*** noop for now - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionDeath(evt); + ((SessionListener)l.get(i)).sessionDeath(evt); } ****/ } @@ -684,6 +686,7 @@ } private InputListener appInput = new InputListener() { + @Override public String getLine() { // Don't allow reader to be interrupted -- catch and retry. String line = null; @@ -703,6 +706,7 @@ // Run in Swing event dispatcher thread. final String input = line; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { echoInputLine(input); } @@ -714,37 +718,40 @@ private static String newline = System.getProperty("line.separator"); private void echoInputLine(String line) { - Vector l = (Vector)appEchoListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners); for (int i = 0; i < l.size(); i++) { - OutputListener ol = (OutputListener)l.elementAt(i); + OutputListener ol = l.get(i); ol.putString(line); ol.putString(newline); } } private OutputListener appOutput = new OutputListener() { + @Override public void putString(String string) { - Vector l = (Vector)appOutputListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners); for (int i = 0; i < l.size(); i++) { - ((OutputListener)l.elementAt(i)).putString(string); + l.get(i).putString(string); } } }; private OutputListener appError = new OutputListener() { + @Override public void putString(String string) { - Vector l = (Vector)appErrorListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners); for (int i = 0; i < l.size(); i++) { - ((OutputListener)l.elementAt(i)).putString(string); + l.get(i).putString(string); } } }; private OutputListener diagnostics = new OutputListener() { + @Override public void putString(String string) { - Vector l = (Vector)diagnosticsListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(diagnosticsListeners); for (int i = 0; i < l.size(); i++) { - ((OutputListener)l.elementAt(i)).putString(string); + l.get(i).putString(string); } } }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException {} +public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException { + + private static final long serialVersionUID = -4870148107027371437L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Sat May 14 11:52:15 2011 -0700 @@ -28,8 +28,6 @@ import com.sun.jdi.*; import com.sun.jdi.event.*; -import java.util.*; - import com.sun.tools.example.debug.event.*; import javax.swing.SwingUtilities; @@ -55,6 +53,7 @@ this.queue = session.vm.eventQueue(); } + @Override public void run() { try { runLoop(); @@ -78,6 +77,7 @@ //### Gross foul hackery! private void dispatchEventSet(final AbstractEventSet es) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { boolean interrupted = es.suspendedAll(); es.notify(firstListener); @@ -117,54 +117,65 @@ //### This is a Hack, deal with it private class FirstListener implements JDIListener { + @Override public void accessWatchpoint(AccessWatchpointEventSet e) { session.runtime.validateThreadInfo(); wantInterrupt = true; } + @Override public void classPrepare(ClassPrepareEventSet e) { wantInterrupt = false; runtime.resolve(e.getReferenceType()); } + @Override public void classUnload(ClassUnloadEventSet e) { wantInterrupt = false; } + @Override public void exception(ExceptionEventSet e) { wantInterrupt = true; } + @Override public void locationTrigger(LocationTriggerEventSet e) { session.runtime.validateThreadInfo(); wantInterrupt = true; } + @Override public void modificationWatchpoint(ModificationWatchpointEventSet e) { session.runtime.validateThreadInfo(); wantInterrupt = true; } + @Override public void threadDeath(ThreadDeathEventSet e) { wantInterrupt = false; } + @Override public void threadStart(ThreadStartEventSet e) { wantInterrupt = false; } + @Override public void vmDeath(VMDeathEventSet e) { //### Should have some way to notify user //### that VM died before the session ended. wantInterrupt = false; } + @Override public void vmDisconnect(VMDisconnectEventSet e) { //### Notify user? wantInterrupt = false; session.runtime.endSession(); } + @Override public void vmStart(VMStartEventSet e) { //### Do we need to do anything with it? wantInterrupt = false; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,11 +26,7 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; - -import java.util.ArrayList; import java.util.List; -import java.util.Iterator; public class LineBreakpointSpec extends BreakpointSpec { int lineNumber; @@ -44,6 +40,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws InvalidTypeException, LineNotFoundException { if (!(refType instanceof ClassType)) { @@ -81,10 +78,12 @@ return lineNumber; } + @Override public int hashCode() { return refSpec.hashCode() + lineNumber; } + @Override public boolean equals(Object obj) { if (obj instanceof LineBreakpointSpec) { LineBreakpointSpec breakpoint = (LineBreakpointSpec)obj; @@ -96,6 +95,7 @@ } } + @Override public String errorMessageFor(Exception e) { if (e instanceof LineNotFoundException) { return ("No code at line " + lineNumber() + " in " + refSpec); @@ -107,6 +107,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer("breakpoint "); buffer.append(refSpec.toString()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,9 @@ public class LineNotFoundException extends Exception { + + private static final long serialVersionUID = -5630418117861587582L; + public LineNotFoundException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,9 @@ package com.sun.tools.example.debug.bdi; class MalformedMemberNameException extends Exception { + + private static final long serialVersionUID = -7726664097374844485L; + public MalformedMemberNameException() { super(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,11 +26,8 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; - import java.util.ArrayList; import java.util.List; -import java.util.Iterator; public class MethodBreakpointSpec extends BreakpointSpec { String methodId; @@ -47,6 +44,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws MalformedMemberNameException, AmbiguousMethodException, InvalidTypeException, @@ -80,12 +78,14 @@ return methodArgs; } + @Override public int hashCode() { return refSpec.hashCode() + ((methodId != null) ? methodId.hashCode() : 0) + ((methodArgs != null) ? methodArgs.hashCode() : 0); } + @Override public boolean equals(Object obj) { if (obj instanceof MethodBreakpointSpec) { MethodBreakpointSpec breakpoint = (MethodBreakpointSpec)obj; @@ -98,6 +98,7 @@ } } + @Override public String errorMessageFor(Exception e) { if (e instanceof AmbiguousMethodException) { return ("Method " + methodName() + " is overloaded; specify arguments"); @@ -114,6 +115,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer("breakpoint "); buffer.append(refSpec.toString()); @@ -257,7 +259,7 @@ */ if ((name.indexOf('.') == -1) || name.startsWith("*.")) { try { - List refs = specs.runtime.findClassesMatchingPattern(name); + List<?> refs = specs.runtime.findClassesMatchingPattern(name); if (refs.size() > 0) { //### ambiguity??? name = ((ReferenceType)(refs.get(0))).name(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class MethodNotFoundException extends Exception { + private static final long serialVersionUID = -2064968107599632609L; + public MethodNotFoundException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; public class ModificationWatchpointSpec extends WatchpointSpec { @@ -38,6 +37,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws InvalidTypeException, NoSuchFieldException { if (!(refType instanceof ClassType)) { @@ -51,6 +51,7 @@ .createModificationWatchpointRequest(field)); } + @Override public boolean equals(Object obj) { return (obj instanceof ModificationWatchpointSpec) && super.equals(obj); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class NoSessionException extends Exception {} +public class NoSessionException extends Exception { + + private static final long serialVersionUID = -7324357828115128603L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,8 @@ package com.sun.tools.example.debug.bdi; -public class NoThreadException extends Exception {} +public class NoThreadException extends Exception { + + private static final long serialVersionUID = 1846613539928921998L; + +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -47,6 +47,7 @@ /** * Does the specified ReferenceType match this spec. */ + @Override public boolean matches(ReferenceType refType) { if (isWild) { return refType.name().endsWith(classId); @@ -55,10 +56,12 @@ } } + @Override public int hashCode() { return classId.hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof PatternReferenceTypeSpec) { PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj; @@ -89,6 +92,7 @@ } } + @Override public String toString() { return isWild? "*" + classId : classId; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -33,7 +33,9 @@ */ boolean matches(ReferenceType refType); + @Override int hashCode(); + @Override boolean equals(Object obj); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java Sat May 14 11:52:15 2011 -0700 @@ -27,7 +27,6 @@ import com.sun.jdi.VirtualMachine; import com.sun.jdi.VMDisconnectedException; -import com.sun.jdi.event.EventSet; /** * Our repository of what we know about the state of one diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -39,6 +39,7 @@ /** * Does the specified ReferenceType match this spec. */ + @Override public boolean matches(ReferenceType refType) { try { if (refType.sourceName().equals(sourceName)) { @@ -48,9 +49,6 @@ return true; } catch(AbsentInformationException exc) { } catch(ObjectCollectedException exc) { - } catch(InvalidLineNumberException exc) { -// } catch(ClassNotPreparedException exc) { -// -- should not happen, so don't catch this --- } } } catch(AbsentInformationException exc) { @@ -59,10 +57,12 @@ return false; } + @Override public int hashCode() { return sourceName.hashCode() + linenumber; } + @Override public boolean equals(Object obj) { if (obj instanceof SourceNameReferenceTypeSpec) { SourceNameReferenceTypeSpec spec = (SourceNameReferenceTypeSpec)obj; @@ -74,6 +74,7 @@ } } + @Override public String toString() { return sourceName + "@" + linenumber; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java Sat May 14 11:52:15 2011 -0700 @@ -25,10 +25,9 @@ package com.sun.tools.example.debug.bdi; -import java.util.EventObject; - public class SpecErrorEvent extends SpecEvent { + private static final long serialVersionUID = 8162634387866409578L; private Exception reason; public SpecErrorEvent(EventRequestSpec eventRequestSpec, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java Sat May 14 11:52:15 2011 -0700 @@ -31,6 +31,7 @@ public class SpecEvent extends EventObject { + private static final long serialVersionUID = 4820735456787276230L; private EventRequestSpec eventRequestSpec; public SpecEvent(EventRequestSpec eventRequestSpec) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.ThreadGroupReference; -import com.sun.jdi.ThreadReference; import java.util.List; import java.util.Stack; import java.util.ArrayList; @@ -73,10 +72,12 @@ } } + @Override public boolean hasNext() { return !stack.isEmpty(); } + @Override public ThreadGroupReference next() { return nextThreadGroup(); } @@ -87,6 +88,7 @@ return tg; } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java Sat May 14 11:52:15 2011 -0700 @@ -26,9 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; //### Should handle target VM death or connection failure cleanly. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Sat May 14 11:52:15 2011 -0700 @@ -43,6 +43,7 @@ tgi = new ThreadGroupIterator(tgl); } + @Override public boolean hasNext() { while (it == null || !it.hasNext()) { if (!tgi.hasNext()) { @@ -53,6 +54,7 @@ return true; } + @Override public ThreadReference next() { return it.next(); } @@ -61,6 +63,7 @@ return next(); } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java Sat May 14 11:52:15 2011 -0700 @@ -26,9 +26,6 @@ package com.sun.tools.example.debug.bdi; //### does it belong here? import com.sun.jdi.*; -import com.sun.tools.jdi.*; -import java.util.*; -import java.io.*; public class Utils { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class VMLaunchFailureException extends Exception {} +public class VMLaunchFailureException extends Exception { + + private static final long serialVersionUID = -2439646729274310108L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class VMNotInterruptedException extends Exception {} +public class VMNotInterruptedException extends Exception { + + private static final long serialVersionUID = 8111074582188765600L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,9 +25,6 @@ package com.sun.tools.example.debug.bdi; -import com.sun.jdi.*; -import com.sun.jdi.request.*; - public abstract class WatchpointSpec extends EventRequestSpec { final String fieldId; @@ -40,31 +37,38 @@ // } } + @Override void notifySet(SpecListener listener, SpecEvent evt) { listener.watchpointSet(evt); } + @Override void notifyDeferred(SpecListener listener, SpecEvent evt) { listener.watchpointDeferred(evt); } + @Override void notifyResolved(SpecListener listener, SpecEvent evt) { listener.watchpointResolved(evt); } + @Override void notifyDeleted(SpecListener listener, SpecEvent evt) { listener.watchpointDeleted(evt); } + @Override void notifyError(SpecListener listener, SpecErrorEvent evt) { listener.watchpointError(evt); } + @Override public int hashCode() { return refSpec.hashCode() + fieldId.hashCode() + getClass().hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof WatchpointSpec) { WatchpointSpec watchpoint = (WatchpointSpec)obj; @@ -77,6 +81,7 @@ } } + @Override public String errorMessageFor(Exception e) { if (e instanceof NoSuchFieldException) { return ("No field " + fieldId + " in " + refSpec); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -33,6 +33,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet { + private static final long serialVersionUID = 2772717574222076977L; private final EventSet jdiEventSet; final Event oneEvent; @@ -81,6 +82,7 @@ // Implement Mirror + @Override public VirtualMachine virtualMachine() { return jdiEventSet.virtualMachine(); } @@ -105,10 +107,12 @@ return jdiEventSet.suspendPolicy(); } + @Override public void resume() { jdiEventSet.resume(); } + @Override public int suspendPolicy() { return jdiEventSet.suspendPolicy(); } @@ -128,6 +132,7 @@ /** * Return an iterator specific to {@link Event} objects. */ + @Override public EventIterator eventIterator() { return jdiEventSet.eventIterator(); } @@ -142,6 +147,7 @@ * * @return the number of elements in this set (its cardinality). */ + @Override public int size() { return jdiEventSet.size(); } @@ -151,6 +157,7 @@ * * @return <tt>true</tt> if this set contains no elements. */ + @Override public boolean isEmpty() { return jdiEventSet.isEmpty(); } @@ -163,6 +170,7 @@ * * @return <tt>true</tt> if this set contains the specified element. */ + @Override public boolean contains(Object o) { return jdiEventSet.contains(o); } @@ -174,6 +182,7 @@ * * @return an iterator over the elements in this set. */ + @Override public Iterator<Event> iterator() { return jdiEventSet.iterator(); } @@ -184,6 +193,7 @@ * * @return an array containing all of the elements in this set. */ + @Override public Object[] toArray() { return jdiEventSet.toArray(); } @@ -202,6 +212,7 @@ * @throws ArrayStoreException the runtime type of a is not a supertype * of the runtime type of every element in this set. */ + @Override public <T> T[] toArray(T a[]) { return jdiEventSet.toArray(a); } @@ -217,6 +228,7 @@ * @return <tt>true</tt> if this set contains all of the elements of the * specified collection. */ + @Override public boolean containsAll(Collection<?> c) { return jdiEventSet.containsAll(c); } @@ -224,21 +236,27 @@ // Make the rest of Set unmodifiable + @Override public boolean add(Event e){ throw new UnsupportedOperationException(); } + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection<? extends Event> coll) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,17 @@ package com.sun.tools.example.debug.event; -import com.sun.jdi.*; import com.sun.jdi.event.*; public class AccessWatchpointEventSet extends WatchpointEventSet { + private static final long serialVersionUID = -2620394219156607673L; + AccessWatchpointEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.accessWatchpoint(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ClassPrepareEventSet extends AbstractEventSet { + private static final long serialVersionUID = 5958493423581010491L; + ClassPrepareEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -55,6 +57,7 @@ return ((ClassPrepareEvent)oneEvent).referenceType(); } + @Override public void notify(JDIListener listener) { listener.classPrepare(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -25,11 +25,12 @@ package com.sun.tools.example.debug.event; -import com.sun.jdi.*; import com.sun.jdi.event.*; public class ClassUnloadEventSet extends AbstractEventSet { + private static final long serialVersionUID = 8370341450345835866L; + ClassUnloadEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -48,6 +49,7 @@ return ((ClassUnloadEvent)oneEvent).classSignature(); } + @Override public void notify(JDIListener listener) { listener.classUnload(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ExceptionEventSet extends LocatableEventSet { + private static final long serialVersionUID = 5328140167954640711L; + ExceptionEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -75,6 +77,7 @@ return ((ExceptionEvent)oneEvent).catchLocation(); } + @Override public void notify(JDIListener listener) { listener.exception(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java Sat May 14 11:52:15 2011 -0700 @@ -33,36 +33,47 @@ */ public class JDIAdapter implements JDIListener { + @Override public void accessWatchpoint(AccessWatchpointEventSet e) { } + @Override public void classPrepare(ClassPrepareEventSet e) { } + @Override public void classUnload(ClassUnloadEventSet e) { } + @Override public void exception(ExceptionEventSet e) { } + @Override public void locationTrigger(LocationTriggerEventSet e) { } + @Override public void modificationWatchpoint(ModificationWatchpointEventSet e) { } + @Override public void threadDeath(ThreadDeathEventSet e) { } + @Override public void threadStart(ThreadStartEventSet e) { } + @Override public void vmDeath(VMDeathEventSet e) { } + @Override public void vmDisconnect(VMDisconnectEventSet e) { } + @Override public void vmStart(VMStartEventSet e) { } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -33,6 +33,8 @@ */ public abstract class LocatableEventSet extends AbstractEventSet { + private static final long serialVersionUID = 1027131209997915620L; + LocatableEventSet(EventSet jdiEventSet) { super(jdiEventSet); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,17 @@ package com.sun.tools.example.debug.event; -import com.sun.jdi.*; import com.sun.jdi.event.*; public class LocationTriggerEventSet extends LocatableEventSet { + private static final long serialVersionUID = -3674631710485872487L; + LocationTriggerEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.locationTrigger(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ModificationWatchpointEventSet extends WatchpointEventSet { + private static final long serialVersionUID = -680889300856154719L; + ModificationWatchpointEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -42,6 +44,7 @@ return ((ModificationWatchpointEvent)oneEvent).valueToBe(); } + @Override public void notify(JDIListener listener) { listener.modificationWatchpoint(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ThreadDeathEventSet extends AbstractEventSet { + private static final long serialVersionUID = -8801604712308151331L; + ThreadDeathEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -44,6 +46,7 @@ return ((ThreadDeathEvent)oneEvent).thread(); } + @Override public void notify(JDIListener listener) { listener.threadDeath(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ThreadStartEventSet extends AbstractEventSet { + private static final long serialVersionUID = -3802096132294933502L; + ThreadStartEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -44,6 +46,7 @@ return ((ThreadStartEvent)oneEvent).thread(); } + @Override public void notify(JDIListener listener) { listener.threadStart(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -29,10 +29,13 @@ public class VMDeathEventSet extends AbstractEventSet { + private static final long serialVersionUID = 1163097303940092229L; + VMDeathEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.vmDeath(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -29,10 +29,13 @@ public class VMDisconnectEventSet extends AbstractEventSet { + private static final long serialVersionUID = 7968123152344675342L; + VMDisconnectEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.vmDisconnect(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class VMStartEventSet extends AbstractEventSet { + private static final long serialVersionUID = -3384957227835478191L; + VMStartEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -44,6 +46,7 @@ return ((VMStartEvent)oneEvent).thread(); } + @Override public void notify(JDIListener listener) { listener.vmStart(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public abstract class WatchpointEventSet extends LocatableEventSet { + private static final long serialVersionUID = 5606285209703845409L; + WatchpointEventSet(EventSet jdiEventSet) { super(jdiEventSet); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Sat May 14 11:52:15 2011 -0700 @@ -27,25 +27,25 @@ package com.sun.tools.example.debug.expr; import com.sun.jdi.*; + import java.util.Stack; import java.util.List; import java.util.ArrayList; -@SuppressWarnings("unchecked") public class ExpressionParser implements ExpressionParserConstants { - Stack stack = new Stack(); + Stack<LValue> stack = new Stack<LValue>(); VirtualMachine vm = null; GetFrame frameGetter = null; private static GetFrame lastFrameGetter; private static LValue lastLValue; LValue peek() { - return (LValue)stack.peek(); + return stack.peek(); } LValue pop() { - return (LValue)stack.pop(); + return stack.pop(); } void push(LValue lval) { @@ -61,17 +61,14 @@ } public static Value evaluate(String expr, VirtualMachine vm, - GetFrame frameGetter) throws ParseException, - InvocationException, - InvalidTypeException, - ClassNotLoadedException, + GetFrame frameGetter) throws ParseException, InvocationException, + InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException { // TODO StringBufferInputStream is deprecated. java.io.InputStream in = new java.io.StringBufferInputStream(expr); ExpressionParser parser = new ExpressionParser(in); parser.vm = vm; parser.frameGetter = frameGetter; - Value value = null; parser.Expression(); lastFrameGetter = frameGetter; lastLValue = parser.pop(); @@ -89,8 +86,8 @@ try { parser = new ExpressionParser(new java.io.FileInputStream(args[0])); } catch (java.io.FileNotFoundException e) { - System.out.println("Java Parser Version 1.0.2: File " + - args[0] + " not found."); + System.out.println("Java Parser Version 1.0.2: File " + args[0] + + " not found."); return; } } else { @@ -137,8 +134,7 @@ jj_consume_token(-1); throw new ParseException(); } - label_1: - while (true) { + label_1: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: ; @@ -189,8 +185,7 @@ StringBuffer sb = new StringBuffer(); jj_consume_token(IDENTIFIER); sb.append(token); - label_2: - while (true) { + label_2: while (true) { if (jj_2_1(2)) { ; } else { @@ -198,16 +193,18 @@ } jj_consume_token(DOT); jj_consume_token(IDENTIFIER); - sb.append('.'); sb.append(token); - } - {if (true) return sb.toString();} + sb.append('.'); + sb.append(token); + } + if (true) { + return sb.toString(); + } throw new Error("Missing return statement in function"); } final public void NameList() throws ParseException { Name(); - label_3: - while (true) { + label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; @@ -261,7 +258,9 @@ PrimaryExpression(); AssignmentOperator(); Expression(); - LValue exprVal = pop(); pop().setValue(exprVal); push(exprVal); + LValue exprVal = pop(); + pop().setValue(exprVal); + push(exprVal); } final public void AssignmentOperator() throws ParseException { @@ -317,13 +316,18 @@ Expression(); jj_consume_token(COLON); ConditionalExpression(); - LValue falseBranch = pop(); LValue trueBranch = pop(); + LValue falseBranch = pop(); + LValue trueBranch = pop(); Value cond = pop().interiorGetValue(); if (cond instanceof BooleanValue) { - push(((BooleanValue)cond).booleanValue()? - trueBranch : falseBranch); + push(((BooleanValue) cond).booleanValue() ? trueBranch + : falseBranch); } else { - {if (true) throw new ParseException("Condition must be boolean");} + { + if (true) { + throw new ParseException("Condition must be boolean"); + } + } } break; default: @@ -334,8 +338,7 @@ final public void ConditionalOrExpression() throws ParseException { ConditionalAndExpression(); - label_4: - while (true) { + label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SC_OR: ; @@ -346,14 +349,17 @@ } jj_consume_token(SC_OR); ConditionalAndExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void ConditionalAndExpression() throws ParseException { InclusiveOrExpression(); - label_5: - while (true) { + label_5: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SC_AND: ; @@ -364,14 +370,17 @@ } jj_consume_token(SC_AND); InclusiveOrExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void InclusiveOrExpression() throws ParseException { ExclusiveOrExpression(); - label_6: - while (true) { + label_6: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_OR: ; @@ -382,14 +391,17 @@ } jj_consume_token(BIT_OR); ExclusiveOrExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void ExclusiveOrExpression() throws ParseException { AndExpression(); - label_7: - while (true) { + label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case XOR: ; @@ -400,14 +412,17 @@ } jj_consume_token(XOR); AndExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void AndExpression() throws ParseException { EqualityExpression(); - label_8: - while (true) { + label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: ; @@ -418,15 +433,18 @@ } jj_consume_token(BIT_AND); EqualityExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void EqualityExpression() throws ParseException { Token tok; InstanceOfExpression(); - label_9: - while (true) { + label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EQ: case NE: @@ -460,7 +478,11 @@ case INSTANCEOF: jj_consume_token(INSTANCEOF); Type(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[14] = jj_gen; @@ -471,8 +493,7 @@ final public void RelationalExpression() throws ParseException { Token tok; ShiftExpression(); - label_10: - while (true) { + label_10: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case GT: case LT: @@ -510,8 +531,7 @@ final public void ShiftExpression() throws ParseException { AdditiveExpression(); - label_11: - while (true) { + label_11: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LSHIFT: case RSIGNEDSHIFT: @@ -538,15 +558,18 @@ throw new ParseException(); } AdditiveExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void AdditiveExpression() throws ParseException { Token tok; MultiplicativeExpression(); - label_12: - while (true) { + label_12: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case MINUS: @@ -577,8 +600,7 @@ final public void MultiplicativeExpression() throws ParseException { Token tok; UnaryExpression(); - label_13: - while (true) { + label_13: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STAR: case SLASH: @@ -627,7 +649,11 @@ throw new ParseException(); } UnaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; case INCR: PreIncrementExpression(); @@ -661,13 +687,21 @@ final public void PreIncrementExpression() throws ParseException { jj_consume_token(INCR); PrimaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } final public void PreDecrementExpression() throws ParseException { jj_consume_token(DECR); PrimaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } final public void UnaryExpressionNotPlusMinus() throws ParseException { @@ -687,7 +721,11 @@ throw new ParseException(); } UnaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[26] = jj_gen; @@ -718,8 +756,10 @@ } } -// This production is to determine lookahead only. The LOOKAHEAD specifications -// below are not used, but they are there just to indicate that we know about + // This production is to determine lookahead only. The LOOKAHEAD + // specifications + // below are not used, but they are there just to indicate that we know + // about // this. final public void CastLookahead() throws ParseException { if (jj_2_4(2)) { @@ -792,7 +832,11 @@ break; case DECR: jj_consume_token(DECR); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[30] = jj_gen; @@ -810,8 +854,7 @@ if (jj_2_6(2)) { jj_consume_token(LPAREN); PrimitiveType(); - label_14: - while (true) { + label_14: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: ; @@ -830,8 +873,7 @@ case LPAREN: jj_consume_token(LPAREN); Name(); - label_15: - while (true) { + label_15: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: ; @@ -856,8 +898,7 @@ final public void PrimaryExpression() throws ParseException { PrimaryPrefix(); - label_16: - while (true) { + label_16: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: case LBRACKET: @@ -896,7 +937,11 @@ jj_consume_token(SUPER); jj_consume_token(DOT); jj_consume_token(IDENTIFIER); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; case LPAREN: jj_consume_token(LPAREN); @@ -914,7 +959,7 @@ } final public void PrimarySuffix() throws ParseException { - List argList; + List<Value> argList; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: jj_consume_token(LBRACKET); @@ -992,8 +1037,8 @@ jj_consume_token(NULL); } - final public List Arguments() throws ParseException { - List argList = new ArrayList(); + final public List<Value> Arguments() throws ParseException { + List<Value> argList = new ArrayList<Value>(); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FALSE: @@ -1021,15 +1066,18 @@ ; } jj_consume_token(RPAREN); - {if (true) return argList;} + { + if (true) { + return argList; + } + } throw new Error("Missing return statement in function"); } - final public void ArgumentList(List argList) throws ParseException { + final public void ArgumentList(List<Value> argList) throws ParseException { Expression(); argList.add(pop().interiorGetValue()); - label_17: - while (true) { + label_17: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; @@ -1045,7 +1093,8 @@ } final public void AllocationExpression() throws ParseException { - List argList; String className; + List<Value> argList; + String className; if (jj_2_7(2)) { jj_consume_token(NEW); PrimitiveType(); @@ -1062,7 +1111,11 @@ break; case LBRACKET: ArrayDimensions(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[42] = jj_gen; @@ -1079,12 +1132,11 @@ } /* - * The second LOOKAHEAD specification below is to parse to PrimarySuffix - * if there is an expression between the "[...]". + * The second LOOKAHEAD specification below is to parse to PrimarySuffix if + * there is an expression between the "[...]". */ final public void ArrayDimensions() throws ParseException { - label_18: - while (true) { + label_18: while (true) { jj_consume_token(LBRACKET); Expression(); jj_consume_token(RBRACKET); @@ -1094,8 +1146,7 @@ break label_18; } } - label_19: - while (true) { + label_19: while (true) { if (jj_2_9(2)) { ; } else { @@ -1107,71 +1158,84 @@ } final private boolean jj_2_1(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_1(); jj_save(0, xla); return retval; } final private boolean jj_2_2(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_2(); jj_save(1, xla); return retval; } final private boolean jj_2_3(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_3(); jj_save(2, xla); return retval; } final private boolean jj_2_4(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_4(); jj_save(3, xla); return retval; } final private boolean jj_2_5(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_5(); jj_save(4, xla); return retval; } final private boolean jj_2_6(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_6(); jj_save(5, xla); return retval; } final private boolean jj_2_7(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_7(); jj_save(6, xla); return retval; } final private boolean jj_2_8(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_8(); jj_save(7, xla); return retval; } final private boolean jj_2_9(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_9(); jj_save(8, xla); return retval; } final private boolean jj_3R_154() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INCR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1180,9 +1244,15 @@ xsp = jj_scanpos; if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_155()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_155()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1191,27 +1261,54 @@ xsp = jj_scanpos; if (jj_3_6()) { jj_scanpos = xsp; - if (jj_3R_150()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_150()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_6() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_152()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_152()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1220,45 +1317,86 @@ xsp = jj_scanpos; if (jj_3R_50()) { jj_scanpos = xsp; - if (jj_3R_51()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_51()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_50() { - if (jj_3R_67()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_67()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_5() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_149() { - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_151()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_41() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; if (jj_3R_59()) { @@ -1275,51 +1413,109 @@ jj_scanpos = xsp; if (jj_3R_65()) { jj_scanpos = xsp; - if (jj_3R_66()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_66()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_40() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_123() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_1() { - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_4() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1330,76 +1526,129 @@ jj_scanpos = xsp; if (jj_3R_40()) { jj_scanpos = xsp; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_3() { - if (jj_3R_22()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_22()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_24() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_1()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_147() { - if (jj_scan_token(BANG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BANG)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_142() { - if (jj_3R_149()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_149()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_122() { - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_49() { - if (jj_scan_token(DOUBLE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOUBLE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_141() { - if (jj_3R_148()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_148()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_48() { - if (jj_scan_token(FLOAT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(FLOAT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_146() { - if (jj_scan_token(TILDE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(TILDE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_47() { - if (jj_scan_token(LONG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LONG)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1408,11 +1657,21 @@ xsp = jj_scanpos; if (jj_3R_146()) { jj_scanpos = xsp; - if (jj_3R_147()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_147()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1423,48 +1682,84 @@ jj_scanpos = xsp; if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_142()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_142()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_46() { - if (jj_scan_token(INT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_145() { - if (jj_scan_token(REM)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(REM)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_45() { - if (jj_scan_token(SHORT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SHORT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_44() { - if (jj_scan_token(BYTE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BYTE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_135() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DECR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_43() { - if (jj_scan_token(CHAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(CHAR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1485,49 +1780,95 @@ jj_scanpos = xsp; if (jj_3R_48()) { jj_scanpos = xsp; - if (jj_3R_49()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_49()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_42() { - if (jj_scan_token(BOOLEAN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BOOLEAN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_9() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_121() { - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_144() { - if (jj_scan_token(SLASH)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SLASH)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_134() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INCR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1536,62 +1877,105 @@ xsp = jj_scanpos; if (jj_3R_121()) { jj_scanpos = xsp; - if (jj_3R_122()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_122()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } while (true) { xsp = jj_scanpos; - if (jj_3R_123()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_123()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_120() { - if (jj_scan_token(GE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(GE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_133() { - if (jj_scan_token(MINUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(MINUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_127() { - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_136()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_126() { - if (jj_3R_135()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_135()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_139() { - if (jj_scan_token(MINUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(MINUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_125() { - if (jj_3R_134()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_134()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_132() { - if (jj_scan_token(PLUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(PLUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_143() { - if (jj_scan_token(STAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STAR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1600,11 +1984,21 @@ xsp = jj_scanpos; if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_133()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_133()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1617,11 +2011,21 @@ jj_scanpos = xsp; if (jj_3R_126()) { jj_scanpos = xsp; - if (jj_3R_127()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_127()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1632,54 +2036,95 @@ jj_scanpos = xsp; if (jj_3R_144()) { jj_scanpos = xsp; - if (jj_3R_145()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_145()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_131() { - if (jj_scan_token(RUNSIGNEDSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RUNSIGNEDSHIFT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_119() { - if (jj_scan_token(LE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_138() { - if (jj_scan_token(PLUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(PLUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_112() { - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_137()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_137()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_88() { - if (jj_3R_86()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_86()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_130() { - if (jj_scan_token(RSIGNEDSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RSIGNEDSHIFT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1688,29 +2133,51 @@ xsp = jj_scanpos; if (jj_3R_138()) { jj_scanpos = xsp; - if (jj_3R_139()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_112()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_139()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_112()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_87() { - if (jj_3R_82()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_82()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_118() { - if (jj_scan_token(GT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(GT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_129() { - if (jj_scan_token(LSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LSHIFT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1721,68 +2188,128 @@ jj_scanpos = xsp; if (jj_3R_130()) { jj_scanpos = xsp; - if (jj_3R_131()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_108()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_131()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_108()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_108() { - if (jj_3R_112()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_112()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_128()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_128()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3_8() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_86() { Token xsp; - if (jj_3_8()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_8()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } while (true) { xsp = jj_scanpos; - if (jj_3_8()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_8()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } while (true) { xsp = jj_scanpos; - if (jj_3_9()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_9()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_117() { - if (jj_scan_token(LT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_106() { - if (jj_3R_108()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_108()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_116()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_116()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } @@ -1796,64 +2323,125 @@ jj_scanpos = xsp; if (jj_3R_119()) { jj_scanpos = xsp; - if (jj_3R_120()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_106()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_120()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_106()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_111() { - if (jj_scan_token(NE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_109() { - if (jj_scan_token(INSTANCEOF)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_114()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INSTANCEOF)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_114()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_104() { - if (jj_3R_106()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_106()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_113()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_113()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_81() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; if (jj_3R_87()) { jj_scanpos = xsp; - if (jj_3R_88()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_88()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_7() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_86()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_86()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1862,39 +2450,68 @@ xsp = jj_scanpos; if (jj_3_7()) { jj_scanpos = xsp; - if (jj_3R_81()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_81()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_97() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COMMA)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_39() { - if (jj_scan_token(ORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(ORASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_110() { - if (jj_scan_token(EQ)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(EQ)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_102() { - if (jj_3R_104()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_104()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_109()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_109()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1903,117 +2520,209 @@ xsp = jj_scanpos; if (jj_3R_110()) { jj_scanpos = xsp; - if (jj_3R_111()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_102()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_111()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_102()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_94() { - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_97()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_97()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_89() { - if (jj_3R_94()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_94()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_38() { - if (jj_scan_token(XORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(XORASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_82() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_89()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_89()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_105() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_100()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BIT_AND)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_100()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_100() { - if (jj_3R_102()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_102()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_107()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_107()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_37() { - if (jj_scan_token(ANDASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(ANDASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_85() { - if (jj_scan_token(NULL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NULL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_103() { - if (jj_scan_token(XOR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_98()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(XOR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_98()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_98() { - if (jj_3R_100()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_100()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_105()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_105()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_92() { - if (jj_scan_token(FALSE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(FALSE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_36() { - if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_91() { - if (jj_scan_token(TRUE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(TRUE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2022,109 +2731,189 @@ xsp = jj_scanpos; if (jj_3R_91()) { jj_scanpos = xsp; - if (jj_3R_92()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_92()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_101() { - if (jj_scan_token(BIT_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_95()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BIT_OR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_95()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_95() { - if (jj_3R_98()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_98()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_103()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_103()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_35() { - if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RSIGNEDSHIFTASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_80() { - if (jj_3R_85()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_85()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_66() { - if (jj_3R_69()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_69()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_79() { - if (jj_3R_84()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_84()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_78() { - if (jj_scan_token(STRING_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STRING_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_99() { - if (jj_scan_token(SC_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_90()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SC_AND)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_90()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_90() { - if (jj_3R_95()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_95()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_101()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_101()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_34() { - if (jj_scan_token(LSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LSHIFTASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_65() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_77() { - if (jj_scan_token(CHARACTER_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(CHARACTER_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_76() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(FLOATING_POINT_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_33() { - if (jj_scan_token(MINUSASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(MINUSASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2141,89 +2930,161 @@ jj_scanpos = xsp; if (jj_3R_79()) { jj_scanpos = xsp; - if (jj_3R_80()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_80()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_75() { - if (jj_scan_token(INTEGER_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INTEGER_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_96() { - if (jj_scan_token(SC_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_83()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SC_OR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_83()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_83() { - if (jj_3R_90()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_90()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_99()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_99()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_64() { - if (jj_scan_token(SUPER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SUPER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_32() { - if (jj_scan_token(PLUSASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(PLUSASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_73() { - if (jj_3R_82()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_82()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_72() { - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_74() { - if (jj_3R_83()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_83()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_96()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_96()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_63() { - if (jj_scan_token(THIS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(THIS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_31() { - if (jj_scan_token(REMASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(REMASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2234,120 +3095,231 @@ jj_scanpos = xsp; if (jj_3R_72()) { jj_scanpos = xsp; - if (jj_3R_73()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_73()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_71() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_93() { - if (jj_scan_token(HOOK)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(HOOK)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(COLON)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_68()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_57() { - if (jj_3R_70()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_70()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_30() { - if (jj_scan_token(SLASHASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SLASHASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_27() { - if (jj_3R_58()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_58()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_56() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_152() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_55() { - if (jj_scan_token(SUPER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SUPER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(DOT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_29() { - if (jj_scan_token(STARASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STARASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_68() { - if (jj_3R_74()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_74()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_93()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_93()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_54() { - if (jj_scan_token(THIS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(THIS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_62() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_53() { - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_153() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2364,19 +3336,37 @@ jj_scanpos = xsp; if (jj_3R_56()) { jj_scanpos = xsp; - if (jj_3R_57()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_57()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_52() { - if (jj_3R_69()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_69()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2405,103 +3395,206 @@ jj_scanpos = xsp; if (jj_3R_38()) { jj_scanpos = xsp; - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_39()) { + return true; + } + if (jj_la == 0 + && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 + && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 + && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_28() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(ASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_61() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_2() { - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_21()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_21()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_20() { - if (jj_3R_26()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_26()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_27()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_27()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_60() { - if (jj_scan_token(BANG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BANG)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_155() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DECR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_67() { - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_21()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_21()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_150() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_153()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_153()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_136()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_59() { - if (jj_scan_token(TILDE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(TILDE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_51() { - if (jj_3R_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_68()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2512,13 +3605,28 @@ private Token jj_scanpos, jj_lastpos; private int jj_la; public boolean lookingAhead = false; - private boolean jj_semLA; private int jj_gen; final private int[] jj_la1 = new int[44]; - final private int[] jj_la1_0 = {0x8209400,0x0,0x8209400,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x0,}; - final private int[] jj_la1_1 = {0x2014,0x0,0x2014,0x0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x0,0x884480c0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x88400080,0x400000,0x884480c0,0x0,0x0,0x40,}; - final private int[] jj_la1_2 = {0x8,0x400,0x0,0x2000,0xf00c004e,0x8000,0x100000,0x4000000,0x8000000,0x0,0x0,0x0,0x2400000,0x2400000,0x0,0x1830000,0x1830000,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0xc0000000,0xf00c004e,0xc0000,0xc0000,0x4e,0xc004e,0x40,0x30000000,0x30000000,0x400,0x400,0x40,0x4440,0x4e,0x4440,0x6,0x0,0xf00c004e,0x2000,0x440,0x0,}; - final private int[] jj_la1_3 = {0x0,0x0,0x0,0x0,0x0,0xffe00,0x0,0x0,0x0,0x8,0x10,0x4,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x23,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + final private int[] jj_la1_0 = { 0x8209400, 0x0, 0x8209400, 0x0, 0x1000000, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x0, 0x1000000, 0x1000000, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x1000000, + 0x1000000, 0x1000000, 0x0, 0x0, 0x0, }; + final private int[] jj_la1_1 = { 0x2014, 0x0, 0x2014, 0x0, 0x884480c0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x0, 0x884480c0, 0x884480c0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x88400080, 0x400000, + 0x884480c0, 0x0, 0x0, 0x40, }; + final private int[] jj_la1_2 = { 0x8, 0x400, 0x0, 0x2000, 0xf00c004e, + 0x8000, 0x100000, 0x4000000, 0x8000000, 0x0, 0x0, 0x0, 0x2400000, + 0x2400000, 0x0, 0x1830000, 0x1830000, 0x0, 0x0, 0xc0000000, + 0xc0000000, 0x0, 0x0, 0xc0000000, 0xf00c004e, 0xc0000, 0xc0000, 0x4e, + 0xc004e, 0x40, 0x30000000, 0x30000000, 0x400, 0x400, 0x40, 0x4440, + 0x4e, 0x4440, 0x6, 0x0, 0xf00c004e, 0x2000, 0x440, 0x0, }; + final private int[] jj_la1_3 = { 0x0, 0x0, 0x0, 0x0, 0x0, 0xffe00, 0x0, 0x0, + 0x0, 0x8, 0x10, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c0, 0x1c0, 0x0, 0x0, + 0x23, 0x23, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, }; final private JJExpressionParserCalls[] jj_2_rtns = new JJExpressionParserCalls[9]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -2529,8 +3637,12 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } public void ReInit(java.io.InputStream stream) { @@ -2539,8 +3651,12 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } public ExpressionParser(ExpressionParserTokenManager tm) { @@ -2548,8 +3664,12 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } public void ReInit(ExpressionParserTokenManager tm) { @@ -2557,23 +3677,32 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } final private Token jj_consume_token(int kind) throws ParseException { Token oldToken; - if ((oldToken = token).next != null) token = token.next; - else token = token.next = token_source.getNextToken(); + if ((oldToken = token).next != null) { + token = token.next; + } else { + token = token.next = token_source.getNextToken(); + } jj_ntk = -1; if (token.kind == kind) { jj_gen++; if (++jj_gc > 100) { jj_gc = 0; - for (int i = 0; i < jj_2_rtns.length; i++) { - JJExpressionParserCalls c = jj_2_rtns[i]; + for (JJExpressionParserCalls jj_2_rtn : jj_2_rtns) { + JJExpressionParserCalls c = jj_2_rtn; while (c != null) { - if (c.gen < jj_gen) c.first = null; + if (c.gen < jj_gen) { + c.first = null; + } c = c.next; } } @@ -2589,7 +3718,8 @@ if (jj_scanpos == jj_lastpos) { jj_la--; if (jj_scanpos.next == null) { - jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken(); + jj_lastpos = jj_scanpos = jj_scanpos.next = token_source + .getNextToken(); } else { jj_lastpos = jj_scanpos = jj_scanpos.next; } @@ -2597,16 +3727,25 @@ jj_scanpos = jj_scanpos.next; } if (jj_rescan) { - int i = 0; Token tok = token; - while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; } - if (tok != null) jj_add_error_token(kind, i); + int i = 0; + Token tok = token; + while (tok != null && tok != jj_scanpos) { + i++; + tok = tok.next; + } + if (tok != null) { + jj_add_error_token(kind, i); + } } return (jj_scanpos.kind != kind); } final public Token getNextToken() { - if (token.next != null) token = token.next; - else token = token.next = token_source.getNextToken(); + if (token.next != null) { + token = token.next; + } else { + token = token.next = token_source.getNextToken(); + } jj_ntk = -1; jj_gen++; return token; @@ -2615,27 +3754,33 @@ final public Token getToken(int index) { Token t = lookingAhead ? jj_scanpos : token; for (int i = 0; i < index; i++) { - if (t.next != null) t = t.next; - else t = t.next = token_source.getNextToken(); + if (t.next != null) { + t = t.next; + } else { + t = t.next = token_source.getNextToken(); + } } return t; } final private int jj_ntk() { - if ((jj_nt=token.next) == null) + if ((jj_nt = token.next) == null) { return (jj_ntk = (token.next=token_source.getNextToken()).kind); - else + } else { return (jj_ntk = jj_nt.kind); } + } - private java.util.Vector jj_expentries = new java.util.Vector(); + private java.util.Vector<int[]> jj_expentries = new java.util.Vector<int[]>(); private int[] jj_expentry; private int jj_kind = -1; private int[] jj_lasttokens = new int[100]; private int jj_endpos; private void jj_add_error_token(int kind, int pos) { - if (pos >= 100) return; + if (pos >= 100) { + return; + } if (pos == jj_endpos + 1) { jj_lasttokens[jj_endpos++] = kind; } else if (jj_endpos != 0) { @@ -2644,8 +3789,9 @@ jj_expentry[i] = jj_lasttokens[i]; } boolean exists = false; - for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) { - int[] oldentry = (int[])(enum_.nextElement()); + for (java.util.Enumeration<int[]> enum_ = jj_expentries.elements(); enum_ + .hasMoreElements();) { + int[] oldentry = (enum_.nextElement()); if (oldentry.length == jj_expentry.length) { exists = true; for (int i = 0; i < jj_expentry.length; i++) { @@ -2654,11 +3800,17 @@ break; } } - if (exists) break; - } - } - if (!exists) jj_expentries.addElement(jj_expentry); - if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind; + if (exists) { + break; + } + } + } + if (!exists) { + jj_expentries.addElement(jj_expentry); + } + if (pos != 0) { + jj_lasttokens[(jj_endpos = pos) - 1] = kind; + } } } @@ -2702,7 +3854,7 @@ jj_add_error_token(0, 0); int[][] exptokseq = new int[jj_expentries.size()][]; for (int i = 0; i < jj_expentries.size(); i++) { - exptokseq[i] = (int[])jj_expentries.elementAt(i); + exptokseq[i] = jj_expentries.elementAt(i); } return new ParseException(token, exptokseq, tokenImage); } @@ -2719,17 +3871,36 @@ JJExpressionParserCalls p = jj_2_rtns[i]; do { if (p.gen > jj_gen) { - jj_la = p.arg; jj_lastpos = jj_scanpos = p.first; + jj_la = p.arg; + jj_lastpos = jj_scanpos = p.first; switch (i) { - case 0: jj_3_1(); break; - case 1: jj_3_2(); break; - case 2: jj_3_3(); break; - case 3: jj_3_4(); break; - case 4: jj_3_5(); break; - case 5: jj_3_6(); break; - case 6: jj_3_7(); break; - case 7: jj_3_8(); break; - case 8: jj_3_9(); break; + case 0: + jj_3_1(); + break; + case 1: + jj_3_2(); + break; + case 2: + jj_3_3(); + break; + case 3: + jj_3_4(); + break; + case 4: + jj_3_5(); + break; + case 5: + jj_3_6(); + break; + case 6: + jj_3_7(); + break; + case 7: + jj_3_8(); + break; + case 8: + jj_3_9(); + break; } } p = p.next; @@ -2741,10 +3912,15 @@ final private void jj_save(int index, int xla) { JJExpressionParserCalls p = jj_2_rtns[index]; while (p.gen > jj_gen) { - if (p.next == null) { p = p.next = new JJExpressionParserCalls(); break; } + if (p.next == null) { + p = p.next = new JJExpressionParserCalls(); + break; + } p = p.next; } - p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla; + p.gen = jj_gen + xla - jj_la; + p.first = token; + p.arg = xla; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java Sat May 14 11:52:15 2011 -0700 @@ -25,10 +25,6 @@ /* Generated By:JavaCC: Do not edit this line. ExpressionParserTokenManager.java */ package com.sun.tools.example.debug.expr; -import com.sun.jdi.*; -import java.util.Stack; -import java.util.List; -import java.util.ArrayList; public class ExpressionParserTokenManager implements ExpressionParserConstants { @@ -37,15 +33,17 @@ switch (pos) { case 0: - if ((active1 & 0x4000L) != 0L) + if ((active1 & 0x4000L) != 0L) { return 4; + } if ((active0 & 0x7fffffffffffe00L) != 0L) { jjmatchedKind = 67; return 28; } - if ((active1 & 0x100200000000L) != 0L) + if ((active1 & 0x100200000000L) != 0L) { return 49; + } return -1; case 1: if ((active0 & 0x7ffffffbfcffe00L) != 0L) @@ -57,8 +55,9 @@ } return 28; } - if ((active0 & 0x40300000L) != 0L) + if ((active0 & 0x40300000L) != 0L) { return 28; + } return -1; case 2: if ((active0 & 0x77fffb3afeffe00L) != 0L) @@ -70,8 +69,9 @@ } return 28; } - if ((active0 & 0x80004c10000000L) != 0L) + if ((active0 & 0x80004c10000000L) != 0L) { return 28; + } return -1; case 3: if ((active0 & 0x63bff2b8faf4e00L) != 0L) @@ -80,8 +80,9 @@ jjmatchedPos = 3; return 28; } - if ((active0 & 0x14400902040b000L) != 0L) + if ((active0 & 0x14400902040b000L) != 0L) { return 28; + } return -1; case 4: if ((active0 & 0x2235f2b80ac0600L) != 0L) @@ -93,8 +94,9 @@ } return 28; } - if ((active0 & 0x418a0000f034800L) != 0L) + if ((active0 & 0x418a0000f034800L) != 0L) { return 28; + } return -1; case 5: if ((active0 & 0x222070a848c0600L) != 0L) @@ -103,8 +105,9 @@ jjmatchedPos = 5; return 28; } - if ((active0 & 0x11582100200000L) != 0L) + if ((active0 & 0x11582100200000L) != 0L) { return 28; + } return -1; case 6: if ((active0 & 0x222040a80040200L) != 0L) @@ -113,8 +116,9 @@ jjmatchedPos = 6; return 28; } - if ((active0 & 0x30004880400L) != 0L) + if ((active0 & 0x30004880400L) != 0L) { return 28; + } return -1; case 7: if ((active0 & 0x22040a80000000L) != 0L) @@ -123,8 +127,9 @@ jjmatchedPos = 7; return 28; } - if ((active0 & 0x200000000040200L) != 0L) + if ((active0 & 0x200000000040200L) != 0L) { return 28; + } return -1; case 8: if ((active0 & 0x2000280000000L) != 0L) @@ -133,8 +138,9 @@ jjmatchedPos = 8; return 28; } - if ((active0 & 0x20040800000000L) != 0L) + if ((active0 & 0x20040800000000L) != 0L) { return 28; + } return -1; case 9: if ((active0 & 0x2000000000000L) != 0L) @@ -143,8 +149,9 @@ jjmatchedPos = 9; return 28; } - if ((active0 & 0x280000000L) != 0L) + if ((active0 & 0x280000000L) != 0L) { return 28; + } return -1; case 10: if ((active0 & 0x2000000000000L) != 0L) @@ -286,16 +293,19 @@ switch(curChar) { case 38: - if ((active1 & 0x8000000L) != 0L) + if ((active1 & 0x8000000L) != 0L) { return jjStopAtPos(1, 91); + } break; case 43: - if ((active1 & 0x10000000L) != 0L) + if ((active1 & 0x10000000L) != 0L) { return jjStopAtPos(1, 92); + } break; case 45: - if ((active1 & 0x20000000L) != 0L) + if ((active1 & 0x20000000L) != 0L) { return jjStopAtPos(1, 93); + } break; case 60: if ((active1 & 0x4000000000L) != 0L) @@ -305,30 +315,31 @@ } return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000L); case 61: - if ((active1 & 0x400000L) != 0L) + if ((active1 & 0x400000L) != 0L) { return jjStopAtPos(1, 86); - else if ((active1 & 0x800000L) != 0L) + } else if ((active1 & 0x800000L) != 0L) { return jjStopAtPos(1, 87); - else if ((active1 & 0x1000000L) != 0L) + } else if ((active1 & 0x1000000L) != 0L) { return jjStopAtPos(1, 88); - else if ((active1 & 0x2000000L) != 0L) + } else if ((active1 & 0x2000000L) != 0L) { return jjStopAtPos(1, 89); - else if ((active1 & 0x20000000000L) != 0L) + } else if ((active1 & 0x20000000000L) != 0L) { return jjStopAtPos(1, 105); - else if ((active1 & 0x40000000000L) != 0L) + } else if ((active1 & 0x40000000000L) != 0L) { return jjStopAtPos(1, 106); - else if ((active1 & 0x80000000000L) != 0L) + } else if ((active1 & 0x80000000000L) != 0L) { return jjStopAtPos(1, 107); - else if ((active1 & 0x100000000000L) != 0L) + } else if ((active1 & 0x100000000000L) != 0L) { return jjStopAtPos(1, 108); - else if ((active1 & 0x200000000000L) != 0L) + } else if ((active1 & 0x200000000000L) != 0L) { return jjStopAtPos(1, 109); - else if ((active1 & 0x400000000000L) != 0L) + } else if ((active1 & 0x400000000000L) != 0L) { return jjStopAtPos(1, 110); - else if ((active1 & 0x800000000000L) != 0L) + } else if ((active1 & 0x800000000000L) != 0L) { return jjStopAtPos(1, 111); - else if ((active1 & 0x1000000000000L) != 0L) + } else if ((active1 & 0x1000000000000L) != 0L) { return jjStopAtPos(1, 112); + } break; case 62: if ((active1 & 0x8000000000L) != 0L) @@ -344,8 +355,9 @@ case 101: return jjMoveStringLiteralDfa2_0(active0, 0x104000080000L, active1, 0L); case 102: - if ((active0 & 0x40000000L) != 0L) + if ((active0 & 0x40000000L) != 0L) { return jjStartNfaWithStates_0(1, 30, 28); + } break; case 104: return jjMoveStringLiteralDfa2_0(active0, 0x41c200000008000L, active1, 0L); @@ -377,8 +389,9 @@ case 121: return jjMoveStringLiteralDfa2_0(active0, 0x2000000001000L, active1, 0L); case 124: - if ((active1 & 0x4000000L) != 0L) + if ((active1 & 0x4000000L) != 0L) { return jjStopAtPos(1, 90); + } break; default : break; @@ -387,8 +400,9 @@ } private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) + if (((active0 &= old0) | (active1 &= old1)) == 0L) { return jjStartNfa_0(0, old0, old1); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(1, active0, active1); @@ -397,10 +411,11 @@ switch(curChar) { case 61: - if ((active1 & 0x2000000000000L) != 0L) + if ((active1 & 0x2000000000000L) != 0L) { return jjStopAtPos(2, 113); - else if ((active1 & 0x4000000000000L) != 0L) + } else if ((active1 & 0x4000000000000L) != 0L) { return jjStopAtPos(2, 114); + } break; case 62: if ((active1 & 0x10000000000L) != 0L) @@ -430,8 +445,9 @@ case 112: return jjMoveStringLiteralDfa3_0(active0, 0x800180000000L, active1, 0L); case 114: - if ((active0 & 0x10000000L) != 0L) + if ((active0 & 0x10000000L) != 0L) { return jjStartNfaWithStates_0(2, 28, 28); + } return jjMoveStringLiteralDfa3_0(active0, 0x18000000000000L, active1, 0L); case 115: return jjMoveStringLiteralDfa3_0(active0, 0x200402200L, active1, 0L); @@ -445,12 +461,14 @@ case 117: return jjMoveStringLiteralDfa3_0(active0, 0x40000000200000L, active1, 0L); case 119: - if ((active0 & 0x4000000000L) != 0L) + if ((active0 & 0x4000000000L) != 0L) { return jjStartNfaWithStates_0(2, 38, 28); + } break; case 121: - if ((active0 & 0x80000000000000L) != 0L) + if ((active0 & 0x80000000000000L) != 0L) { return jjStartNfaWithStates_0(2, 55, 28); + } break; default : break; @@ -459,8 +477,9 @@ } private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) + if (((active0 &= old0) | (active1 &= old1)) == 0L) { return jjStartNfa_0(1, old0, old1); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(2, active0, active1); @@ -469,8 +488,9 @@ switch(curChar) { case 61: - if ((active1 & 0x8000000000000L) != 0L) + if ((active1 & 0x8000000000000L) != 0L) { return jjStopAtPos(3, 115); + } break; case 97: return jjMoveStringLiteralDfa4_0(active0, 0x20000000e080800L, active1, 0L); @@ -479,44 +499,51 @@ case 99: return jjMoveStringLiteralDfa4_0(active0, 0x2000000004000L, active1, 0L); case 100: - if ((active0 & 0x100000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) { return jjStartNfaWithStates_0(3, 56, 28); + } break; case 101: - if ((active0 & 0x1000L) != 0L) + if ((active0 & 0x1000L) != 0L) { return jjStartNfaWithStates_0(3, 12, 28); - else if ((active0 & 0x2000L) != 0L) + } else if ((active0 & 0x2000L) != 0L) { return jjStartNfaWithStates_0(3, 13, 28); - else if ((active0 & 0x400000L) != 0L) + } else if ((active0 & 0x400000L) != 0L) { return jjStartNfaWithStates_0(3, 22, 28); - else if ((active0 & 0x40000000000000L) != 0L) + } else if ((active0 & 0x40000000000000L) != 0L) { return jjStartNfaWithStates_0(3, 54, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x800800800000L, active1, 0L); case 103: - if ((active0 & 0x1000000000L) != 0L) + if ((active0 & 0x1000000000L) != 0L) { return jjStartNfaWithStates_0(3, 36, 28); + } break; case 105: return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0L); case 107: return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0L); case 108: - if ((active0 & 0x8000000000L) != 0L) + if ((active0 & 0x8000000000L) != 0L) { return jjStartNfaWithStates_0(3, 39, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x400080080000400L, active1, 0L); case 110: return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L); case 111: - if ((active0 & 0x20000000L) != 0L) + if ((active0 & 0x20000000L) != 0L) { return jjStartNfaWithStates_0(3, 29, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x18000100000000L, active1, 0L); case 114: - if ((active0 & 0x8000L) != 0L) + if ((active0 & 0x8000L) != 0L) { return jjStartNfaWithStates_0(3, 15, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L); case 115: - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x4000000000000L) != 0L) { return jjStartNfaWithStates_0(3, 50, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x1030000L, active1, 0L); case 116: return jjMoveStringLiteralDfa4_0(active0, 0x1440200040200L, active1, 0L); @@ -531,8 +558,9 @@ } private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) + if (((active0 &= old0) | (active1 &= old1)) == 0L) { return jjStartNfa_0(2, old0, old1); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(3, active0, 0L); @@ -545,20 +573,23 @@ case 99: return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L); case 101: - if ((active0 & 0x1000000L) != 0L) + if ((active0 & 0x1000000L) != 0L) { return jjStartNfaWithStates_0(4, 24, 28); - else if ((active0 & 0x400000000000000L) != 0L) + } else if ((active0 & 0x400000000000000L) != 0L) { return jjStartNfaWithStates_0(4, 58, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x40080000400L); case 104: - if ((active0 & 0x4000L) != 0L) + if ((active0 & 0x4000L) != 0L) { return jjStartNfaWithStates_0(4, 14, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L); case 105: return jjMoveStringLiteralDfa5_0(active0, 0x480000040000L); case 107: - if ((active0 & 0x800L) != 0L) + if ((active0 & 0x800L) != 0L) { return jjStartNfaWithStates_0(4, 11, 28); + } break; case 108: if ((active0 & 0x2000000L) != 0L) @@ -570,20 +601,23 @@ case 110: return jjMoveStringLiteralDfa5_0(active0, 0x800000L); case 114: - if ((active0 & 0x800000000000L) != 0L) + if ((active0 & 0x800000000000L) != 0L) { return jjStartNfaWithStates_0(4, 47, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x100900000200L); case 115: - if ((active0 & 0x10000L) != 0L) + if ((active0 & 0x10000L) != 0L) { return jjStartNfaWithStates_0(4, 16, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L); case 116: - if ((active0 & 0x20000L) != 0L) + if ((active0 & 0x20000L) != 0L) { return jjStartNfaWithStates_0(4, 17, 28); - else if ((active0 & 0x8000000L) != 0L) + } else if ((active0 & 0x8000000L) != 0L) { return jjStartNfaWithStates_0(4, 27, 28); - else if ((active0 & 0x200000000000L) != 0L) + } else if ((active0 & 0x200000000000L) != 0L) { return jjStartNfaWithStates_0(4, 45, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L); case 117: return jjMoveStringLiteralDfa5_0(active0, 0x80000L); @@ -603,8 +637,9 @@ } private final int jjMoveStringLiteralDfa5_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(3, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(4, active0, 0L); @@ -615,26 +650,29 @@ case 97: return jjMoveStringLiteralDfa6_0(active0, 0x600L); case 99: - if ((active0 & 0x80000000000L) != 0L) + if ((active0 & 0x80000000000L) != 0L) { return jjStartNfaWithStates_0(5, 43, 28); - else if ((active0 & 0x400000000000L) != 0L) + } else if ((active0 & 0x400000000000L) != 0L) { return jjStartNfaWithStates_0(5, 46, 28); + } return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L); case 100: return jjMoveStringLiteralDfa6_0(active0, 0x800000L); case 101: - if ((active0 & 0x200000L) != 0L) + if ((active0 & 0x200000L) != 0L) { return jjStartNfaWithStates_0(5, 21, 28); - else if ((active0 & 0x2000000000L) != 0L) + } else if ((active0 & 0x2000000000L) != 0L) { return jjStartNfaWithStates_0(5, 37, 28); + } break; case 102: return jjMoveStringLiteralDfa6_0(active0, 0x800000000L); case 103: return jjMoveStringLiteralDfa6_0(active0, 0x10000000000L); case 104: - if ((active0 & 0x1000000000000L) != 0L) + if ((active0 & 0x1000000000000L) != 0L) { return jjStartNfaWithStates_0(5, 48, 28); + } break; case 105: return jjMoveStringLiteralDfa6_0(active0, 0x220000000000000L); @@ -643,18 +681,21 @@ case 109: return jjMoveStringLiteralDfa6_0(active0, 0x80000000L); case 110: - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x100000000000L) != 0L) { return jjStartNfaWithStates_0(5, 44, 28); + } return jjMoveStringLiteralDfa6_0(active0, 0x200040000L); case 114: return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000L); case 115: - if ((active0 & 0x10000000000000L) != 0L) + if ((active0 & 0x10000000000000L) != 0L) { return jjStartNfaWithStates_0(5, 52, 28); + } break; case 116: - if ((active0 & 0x100000000L) != 0L) + if ((active0 & 0x100000000L) != 0L) { return jjStartNfaWithStates_0(5, 32, 28); + } return jjMoveStringLiteralDfa6_0(active0, 0x20000000000L); default : break; @@ -663,8 +704,9 @@ } private final int jjMoveStringLiteralDfa6_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(4, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(5, active0, 0L); @@ -677,32 +719,37 @@ case 99: return jjMoveStringLiteralDfa7_0(active0, 0x200000200L); case 101: - if ((active0 & 0x10000000000L) != 0L) + if ((active0 & 0x10000000000L) != 0L) { return jjStartNfaWithStates_0(6, 40, 28); - else if ((active0 & 0x20000000000L) != 0L) + } else if ((active0 & 0x20000000000L) != 0L) { return jjStartNfaWithStates_0(6, 41, 28); + } return jjMoveStringLiteralDfa7_0(active0, 0x20000080000000L); case 108: return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L); case 110: - if ((active0 & 0x400L) != 0L) + if ((active0 & 0x400L) != 0L) { return jjStartNfaWithStates_0(6, 10, 28); + } break; case 111: return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L); case 115: - if ((active0 & 0x800000L) != 0L) + if ((active0 & 0x800000L) != 0L) { return jjStartNfaWithStates_0(6, 23, 28); + } break; case 116: - if ((active0 & 0x80000L) != 0L) + if ((active0 & 0x80000L) != 0L) { return jjStartNfaWithStates_0(6, 19, 28); + } return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L); case 117: return jjMoveStringLiteralDfa7_0(active0, 0x40000L); case 121: - if ((active0 & 0x4000000L) != 0L) + if ((active0 & 0x4000000L) != 0L) { return jjStartNfaWithStates_0(6, 26, 28); + } break; default : break; @@ -711,8 +758,9 @@ } private final int jjMoveStringLiteralDfa7_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(5, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(6, active0, 0L); @@ -723,16 +771,18 @@ case 99: return jjMoveStringLiteralDfa8_0(active0, 0x800000000L); case 101: - if ((active0 & 0x40000L) != 0L) + if ((active0 & 0x40000L) != 0L) { return jjStartNfaWithStates_0(7, 18, 28); - else if ((active0 & 0x200000000000000L) != 0L) + } else if ((active0 & 0x200000000000000L) != 0L) { return jjStartNfaWithStates_0(7, 57, 28); + } return jjMoveStringLiteralDfa8_0(active0, 0x40200000000L); case 110: return jjMoveStringLiteralDfa8_0(active0, 0x22000080000000L); case 116: - if ((active0 & 0x200L) != 0L) + if ((active0 & 0x200L) != 0L) { return jjStartNfaWithStates_0(7, 9, 28); + } break; default : break; @@ -741,8 +791,9 @@ } private final int jjMoveStringLiteralDfa8_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(6, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(7, active0, 0L); @@ -751,20 +802,23 @@ switch(curChar) { case 100: - if ((active0 & 0x40000000000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { return jjStartNfaWithStates_0(8, 42, 28); + } break; case 101: - if ((active0 & 0x800000000L) != 0L) + if ((active0 & 0x800000000L) != 0L) { return jjStartNfaWithStates_0(8, 35, 28); + } break; case 105: return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000L); case 111: return jjMoveStringLiteralDfa9_0(active0, 0x200000000L); case 116: - if ((active0 & 0x20000000000000L) != 0L) + if ((active0 & 0x20000000000000L) != 0L) { return jjStartNfaWithStates_0(8, 53, 28); + } return jjMoveStringLiteralDfa9_0(active0, 0x80000000L); default : break; @@ -773,8 +827,9 @@ } private final int jjMoveStringLiteralDfa9_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(7, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(8, active0, 0L); @@ -783,12 +838,14 @@ switch(curChar) { case 102: - if ((active0 & 0x200000000L) != 0L) + if ((active0 & 0x200000000L) != 0L) { return jjStartNfaWithStates_0(9, 33, 28); + } break; case 115: - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x80000000L) != 0L) { return jjStartNfaWithStates_0(9, 31, 28); + } break; case 122: return jjMoveStringLiteralDfa10_0(active0, 0x2000000000000L); @@ -799,8 +856,9 @@ } private final int jjMoveStringLiteralDfa10_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(8, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(9, active0, 0L); @@ -817,8 +875,9 @@ } private final int jjMoveStringLiteralDfa11_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(9, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(10, active0, 0L); @@ -827,8 +886,9 @@ switch(curChar) { case 100: - if ((active0 & 0x2000000000000L) != 0L) + if ((active0 & 0x2000000000000L) != 0L) { return jjStartNfaWithStates_0(11, 49, 28); + } break; default : break; @@ -891,320 +951,395 @@ }; private final int jjMoveNfa_0(int startState, int curPos) { - int[] nextStates; int startsAt = 0; jjnewStateCnt = 67; int i = 1; jjstateSet[0] = startState; - int j, kind = 0x7fffffff; + int kind = 0x7fffffff; for (;;) { - if (++jjround == 0x7fffffff) + if (++jjround == 0x7fffffff) { ReInitRounds(); + } if (curChar < 64) { long l = 1L << curChar; - MatchLoop: do + //MatchLoop + do { switch(jjstateSet[--i]) { case 0: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddStates(0, 6); - else if (curChar == 47) + } else if (curChar == 47) { jjAddStates(7, 9); - else if (curChar == 36) + } else if (curChar == 36) { - if (kind > 67) + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); } - else if (curChar == 34) + else if (curChar == 34) { jjCheckNAddStates(10, 12); - else if (curChar == 39) + } else if (curChar == 39) { jjAddStates(13, 14); - else if (curChar == 46) + } else if (curChar == 46) { jjCheckNAdd(4); + } if ((0x3fe000000000000L & l) != 0L) { - if (kind > 59) + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(1, 2); } else if (curChar == 48) { - if (kind > 59) + if (kind > 59) { kind = 59; + } jjCheckNAddStates(15, 17); } break; case 49: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddTwoStates(62, 63); - else if (curChar == 47) + } else if (curChar == 47) { jjCheckNAddStates(18, 20); - if (curChar == 42) + } + if (curChar == 42) { jjstateSet[jjnewStateCnt++] = 54; + } break; case 1: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(1, 2); break; case 3: - if (curChar == 46) + if (curChar == 46) { jjCheckNAdd(4); + } break; case 4: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddStates(21, 23); break; case 6: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(7); + } break; case 7: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddTwoStates(7, 8); break; case 9: - if (curChar == 39) + if (curChar == 39) { jjAddStates(13, 14); + } break; case 10: - if ((0xffffff7fffffdbffL & l) != 0L) + if ((0xffffff7fffffdbffL & l) != 0L) { jjCheckNAdd(11); + } break; case 11: - if (curChar == 39 && kind > 65) + if (curChar == 39 && kind > 65) { kind = 65; + } break; case 13: - if ((0x8400000000L & l) != 0L) + if ((0x8400000000L & l) != 0L) { jjCheckNAdd(11); + } break; case 14: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAddTwoStates(15, 11); + } break; case 15: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAdd(11); + } break; case 16: - if ((0xf000000000000L & l) != 0L) + if ((0xf000000000000L & l) != 0L) { jjstateSet[jjnewStateCnt++] = 17; + } break; case 17: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAdd(15); + } break; case 18: - if (curChar == 34) + if (curChar == 34) { jjCheckNAddStates(10, 12); + } break; case 19: - if ((0xfffffffbffffdbffL & l) != 0L) + if ((0xfffffffbffffdbffL & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 21: - if ((0x8400000000L & l) != 0L) + if ((0x8400000000L & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 22: - if (curChar == 34 && kind > 66) + if (curChar == 34 && kind > 66) { kind = 66; + } break; case 23: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAddStates(24, 27); + } break; case 24: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 25: - if ((0xf000000000000L & l) != 0L) + if ((0xf000000000000L & l) != 0L) { jjstateSet[jjnewStateCnt++] = 26; + } break; case 26: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAdd(24); + } break; case 27: - if (curChar != 36) + if (curChar != 36) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 28: - if ((0x3ff001000000000L & l) == 0L) + if ((0x3ff001000000000L & l) == 0L) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 29: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddStates(0, 6); + } break; case 30: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(30, 31); + } break; case 31: - if (curChar != 46) + if (curChar != 46) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddStates(28, 30); break; case 32: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddStates(28, 30); break; case 34: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(35); + } break; case 35: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddTwoStates(35, 8); break; case 36: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(36, 37); + } break; case 38: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(39); + } break; case 39: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddTwoStates(39, 8); break; case 40: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddStates(31, 33); + } break; case 42: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(43); + } break; case 43: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(43, 8); + } break; case 44: - if (curChar != 48) + if (curChar != 48) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddStates(15, 17); break; case 46: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(46, 2); break; case 47: - if ((0xff000000000000L & l) == 0L) + if ((0xff000000000000L & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(47, 2); break; case 48: - if (curChar == 47) + if (curChar == 47) { jjAddStates(7, 9); + } break; case 50: - if ((0xffffffffffffdbffL & l) != 0L) + if ((0xffffffffffffdbffL & l) != 0L) { jjCheckNAddStates(18, 20); + } break; case 51: - if ((0x2400L & l) != 0L && kind > 6) + if ((0x2400L & l) != 0L && kind > 6) { kind = 6; + } break; case 52: - if (curChar == 10 && kind > 6) + if (curChar == 10 && kind > 6) { kind = 6; + } break; case 53: - if (curChar == 13) + if (curChar == 13) { jjstateSet[jjnewStateCnt++] = 52; + } break; case 54: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddTwoStates(55, 56); + } break; case 55: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(55, 56); + } break; case 56: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddStates(34, 36); + } break; case 57: - if ((0xffff7bffffffffffL & l) != 0L) + if ((0xffff7bffffffffffL & l) != 0L) { jjCheckNAddTwoStates(58, 56); + } break; case 58: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(58, 56); + } break; case 59: - if (curChar == 47 && kind > 7) + if (curChar == 47 && kind > 7) { kind = 7; + } break; case 60: - if (curChar == 42) + if (curChar == 42) { jjstateSet[jjnewStateCnt++] = 54; + } break; case 61: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddTwoStates(62, 63); + } break; case 62: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(62, 63); + } break; case 63: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddStates(37, 39); + } break; case 64: - if ((0xffff7bffffffffffL & l) != 0L) + if ((0xffff7bffffffffffL & l) != 0L) { jjCheckNAddTwoStates(65, 63); + } break; case 65: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(65, 63); + } break; case 66: - if (curChar == 47 && kind > 8) + if (curChar == 47 && kind > 8) { kind = 8; + } break; default : break; } @@ -1213,75 +1348,93 @@ else if (curChar < 128) { long l = 1L << (curChar & 077); - MatchLoop: do + //MatchLoop + do { switch(jjstateSet[--i]) { case 0: case 28: - if ((0x7fffffe87fffffeL & l) == 0L) + if ((0x7fffffe87fffffeL & l) == 0L) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 2: - if ((0x100000001000L & l) != 0L && kind > 59) + if ((0x100000001000L & l) != 0L && kind > 59) { kind = 59; + } break; case 5: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(40, 41); + } break; case 8: - if ((0x5000000050L & l) != 0L && kind > 63) + if ((0x5000000050L & l) != 0L && kind > 63) { kind = 63; + } break; case 10: - if ((0xffffffffefffffffL & l) != 0L) + if ((0xffffffffefffffffL & l) != 0L) { jjCheckNAdd(11); + } break; case 12: - if (curChar == 92) + if (curChar == 92) { jjAddStates(42, 44); + } break; case 13: - if ((0x14404410000000L & l) != 0L) + if ((0x14404410000000L & l) != 0L) { jjCheckNAdd(11); + } break; case 19: - if ((0xffffffffefffffffL & l) != 0L) + if ((0xffffffffefffffffL & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 20: - if (curChar == 92) + if (curChar == 92) { jjAddStates(45, 47); + } break; case 21: - if ((0x14404410000000L & l) != 0L) + if ((0x14404410000000L & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 33: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(48, 49); + } break; case 37: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(50, 51); + } break; case 41: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(52, 53); + } break; case 45: - if ((0x100000001000000L & l) != 0L) + if ((0x100000001000000L & l) != 0L) { jjCheckNAdd(46); + } break; case 46: - if ((0x7e0000007eL & l) == 0L) + if ((0x7e0000007eL & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(46, 2); break; case 50: @@ -1312,47 +1465,57 @@ long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); - MatchLoop: do + //MatchLoop + do { switch(jjstateSet[--i]) { case 0: case 28: - if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) + if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 10: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjstateSet[jjnewStateCnt++] = 11; + } break; case 19: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjAddStates(10, 12); + } break; case 50: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjAddStates(18, 20); + } break; case 55: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(55, 56); + } break; case 57: case 58: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(58, 56); + } break; case 62: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(62, 63); + } break; case 64: case 65: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(65, 63); + } break; default : break; } @@ -1365,8 +1528,9 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt))) { return curPos; + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } @@ -1384,8 +1548,9 @@ case 0: return ((jjbitVec2[i2] & l2) != 0L); default : - if ((jjbitVec0[i1] & l1) != 0L) + if ((jjbitVec0[i1] & l1) != 0L) { return true; + } return false; } } @@ -1404,8 +1569,9 @@ case 61: return ((jjbitVec8[i2] & l2) != 0L); default : - if ((jjbitVec3[i1] & l1) != 0L) + if ((jjbitVec3[i1] & l1) != 0L) { return true; + } return false; } } @@ -1449,8 +1615,9 @@ protected char curChar; public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream) { - if (ASCII_UCodeESC_CharStream.staticFlag) + if (ASCII_UCodeESC_CharStream.staticFlag) { throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer."); + } input_stream = stream; } public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream, int lexState) @@ -1469,9 +1636,10 @@ { int i; jjround = 0x80000001; - for (i = 67; i-- > 0;) + for (i = 67; i-- > 0;) { jjrounds[i] = 0x80000000; } +} public void ReInit(ASCII_UCodeESC_CharStream stream, int lexState) { ReInit(stream); @@ -1479,11 +1647,12 @@ } public void SwitchTo(int lexState) { - if (lexState >= 1 || lexState < 0) + if (lexState >= 1 || lexState < 0) { throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); - else + } else { curLexState = lexState; } +} private final Token jjFillToken() { @@ -1507,7 +1676,6 @@ public final Token getNextToken() { - int kind; Token specialToken = null; Token matchedToken; int curPos = 0; @@ -1528,17 +1696,19 @@ } try { - while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L) + while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L) { curChar = input_stream.BeginToken(); } + } catch (java.io.IOException e1) { continue EOFLoop; } jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); if (jjmatchedKind != 0x7fffffff) { - if (jjmatchedPos + 1 < curPos) + if (jjmatchedPos + 1 < curPos) { input_stream.backup(curPos - jjmatchedPos - 1); + } if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { matchedToken = jjFillToken(); @@ -1550,9 +1720,9 @@ if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { matchedToken = jjFillToken(); - if (specialToken == null) + if (specialToken == null) { specialToken = matchedToken; - else + } else { matchedToken.specialToken = specialToken; specialToken = (specialToken.next = matchedToken); @@ -1572,9 +1742,9 @@ if (curChar == '\n' || curChar == '\r') { error_line++; error_column = 0; + } else { + error_column++; } - else - error_column++; } if (!EOFSeen) { input_stream.backup(1); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Sat May 14 11:52:15 2011 -0700 @@ -156,6 +156,7 @@ return new LValueArrayElement(interiorGetValue(), index); } + @Override public String toString() { try { return interiorGetValue().toString(); @@ -419,6 +420,7 @@ this.var = var; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = frame.getValue(var); @@ -426,12 +428,14 @@ return jdiValue; } + @Override void setValue0(Value val) throws InvalidTypeException, ClassNotLoadedException { frame.setValue(var, val); jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException(var.name() + " is not a method"); } @@ -469,6 +473,7 @@ } } + @Override Value getValue() throws InvocationException, InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException, ParseException { @@ -485,6 +490,7 @@ } } + @Override void setValue0(Value val) throws ParseException, InvalidTypeException, ClassNotLoadedException { @@ -495,6 +501,7 @@ jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { if (matchingMethod != null) { throw new ParseException("Invalid consecutive invocations"); @@ -531,6 +538,7 @@ } } + @Override Value getValue() throws InvocationException, InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException, ParseException { @@ -548,6 +556,7 @@ } } + @Override void setValue0(Value val) throws ParseException, InvalidTypeException, ClassNotLoadedException { @@ -562,6 +571,7 @@ jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { if (matchingMethod != null) { throw new ParseException("Invalid consecutive invocations"); @@ -589,6 +599,7 @@ this.arrayRef = value; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = arrayRef.virtualMachine().mirrorOf(arrayRef.length()); @@ -596,10 +607,12 @@ return jdiValue; } + @Override void setValue0(Value value) throws ParseException { throw new ParseException("Cannot set constant: " + value); } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException("Array element is not a method"); } @@ -618,6 +631,7 @@ this.index = index; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = array.getValue(index); @@ -625,12 +639,14 @@ return jdiValue; } + @Override void setValue0(Value val) throws InvalidTypeException, ClassNotLoadedException { array.setValue(index, val); jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException("Array element is not a method"); } @@ -643,6 +659,7 @@ this.value = value; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = value; @@ -650,10 +667,12 @@ return jdiValue; } + @Override void setValue0(Value val) throws ParseException { throw new ParseException("Cannot set constant: " + value); } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException("Constant is not a method"); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Sat May 14 11:52:15 2011 -0700 @@ -37,6 +37,8 @@ */ public class ParseException extends Exception { + private static final long serialVersionUID = 7978489144303647901L; + /** * This constructor is used by the method "generateParseException" * in the generated parser. Calling this constructor generates @@ -119,20 +121,21 @@ * of the final stack trace, and hence the correct error message * gets displayed. */ + @Override public String getMessage() { if (!specialConstructor) { return super.getMessage(); } String expected = ""; int maxSize = 0; - for (int i = 0; i < expectedTokenSequences.length; i++) { - if (maxSize < expectedTokenSequences[i].length) { - maxSize = expectedTokenSequences[i].length; + for (int[] expectedTokenSequence : expectedTokenSequences) { + if (maxSize < expectedTokenSequence.length) { + maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequences[i].length; j++) { - expected += tokenImage[expectedTokenSequences[i][j]] + " "; + for (int j = 0; j < expectedTokenSequence.length; j++) { + expected += tokenImage[expectedTokenSequence[j]] + " "; } - if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { + if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) { expected += "..."; } expected += eol + " "; @@ -140,7 +143,9 @@ String retval = "Encountered \""; Token tok = currentToken.next; for (int i = 0; i < maxSize; i++) { - if (i != 0) retval += " "; + if (i != 0) { + retval += " "; + } if (tok.kind == 0) { retval += tokenImage[0]; break; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java Sat May 14 11:52:15 2011 -0700 @@ -78,6 +78,7 @@ /** * Returns the image. */ + @Override public final String toString() { return image; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Sat May 14 11:52:15 2011 -0700 @@ -32,6 +32,8 @@ * Ordinals for various reasons why an Error of this type can be thrown. */ + private static final long serialVersionUID = -6236440836177601522L; + /** * Lexical error occured. */ @@ -136,6 +138,7 @@ * * from this method for such cases in the release version of your parser. */ + @Override public String getMessage() { return super.getMessage(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java Sat May 14 11:52:15 2011 -0700 @@ -29,12 +29,12 @@ import java.awt.*; import java.awt.event.*; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; public class ApplicationTool extends JPanel { - private Environment env; + private static final long serialVersionUID = 310966063293205714L; + private ExecutionManager runtime; private TypeScript script; @@ -45,13 +45,13 @@ super(new BorderLayout()); - this.env = env; this.runtime = env.getExecutionManager(); this.script = new TypeScript(PROMPT, false); // No implicit echo. this.add(script); script.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { runtime.sendLineToApplication(script.readln()); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,12 +25,10 @@ package com.sun.tools.example.debug.gui; -import java.io.*; import java.util.*; import javax.swing.*; import javax.swing.tree.*; -import javax.swing.event.*; import java.awt.*; import java.awt.event.*; @@ -40,6 +38,8 @@ public class ClassTreeTool extends JPanel { + private static final long serialVersionUID = 526178912591739259L; + private Environment env; private ExecutionManager runtime; @@ -49,7 +49,7 @@ private JTree tree; private DefaultTreeModel treeModel; private ClassTreeNode root; - private SearchPath sourcePath; +// private SearchPath sourcePath; private CommandInterpreter interpreter; @@ -87,6 +87,7 @@ ******/ MouseListener ml = new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); @@ -121,6 +122,7 @@ // SessionListener + @Override public void sessionStart(EventObject e) { // Get system classes and any others loaded before attaching. try { @@ -134,19 +136,24 @@ } } + @Override public void sessionInterrupt(EventObject e) {} + @Override public void sessionContinue(EventObject e) {} // JDIListener + @Override public void classPrepare(ClassPrepareEventSet e) { root.addClass(e.getReferenceType()); } + @Override public void classUnload(ClassUnloadEventSet e) { root.removeClass(e.getClassName()); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { // Clear contents of this view. root = createClassTree(HEADING); @@ -169,6 +176,7 @@ this.refTy = refTy; } + @Override public String toString() { return name; } @@ -185,6 +193,7 @@ return (refTy == null); } + @Override public boolean isLeaf() { return !isPackage(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Sat May 14 11:52:15 2011 -0700 @@ -29,8 +29,6 @@ import java.util.*; import com.sun.jdi.*; -import com.sun.jdi.request.*; - import com.sun.tools.example.debug.bdi.*; public class CommandInterpreter { @@ -93,9 +91,9 @@ try { ThreadReference[] threads = threads(); long threadID = Long.parseLong(id, 16); - for (int i = 0; i < threads.length; i++) { - if (threads[i].uniqueID() == threadID) { - thread = threads[i]; + for (ThreadReference thread2 : threads) { + if (thread2.uniqueID() == threadID) { + thread = thread2; break; } } @@ -239,16 +237,18 @@ for (int i = 0 ; i < tlist.size() ; i++) { ThreadReference thr = tlist.get(i); int len = Utils.description(thr).length(); - if (len > maxId) + if (len > maxId) { maxId = len; + } String name = thr.name(); int iDot = name.lastIndexOf('.'); if (iDot >= 0 && name.length() > iDot) { name = name.substring(iDot + 1); } - if (name.length() > maxName) + if (name.length() > maxName) { maxName = name.length(); } + } String maxNumString = String.valueOf(iThread + tlist.size()); int maxNumDigits = maxNumString.length(); for (int i = 0 ; i < tlist.size() ; i++) { @@ -616,7 +616,6 @@ int cnt = 1; if (t.hasMoreTokens()) { String idToken = t.nextToken(); - int n; try { cnt = Integer.valueOf(idToken).intValue(); } catch (NumberFormatException e) { @@ -885,7 +884,6 @@ } private void commandStop(StringTokenizer t) throws NoSessionException { - Location bploc; String token; if (!t.hasMoreTokens()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java Sat May 14 11:52:15 2011 -0700 @@ -40,6 +40,8 @@ public class CommandTool extends JPanel { + private static final long serialVersionUID = 8613516856378346415L; + private Environment env; private ContextManager context; @@ -68,6 +70,7 @@ // Establish handler for incoming commands. script.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(script.readln()); } @@ -107,15 +110,17 @@ // JDIListener + @Override public void accessWatchpoint(AccessWatchpointEventSet e) { setThread(e); for (EventIterator it = e.eventIterator(); it.hasNext(); ) { - Event evt = it.nextEvent(); + it.nextEvent(); diagnostics.putString("Watchpoint hit: " + locationString(e)); } } + @Override public void classPrepare(ClassPrepareEventSet e) { if (context.getVerboseFlag()) { String name = e.getReferenceType().name(); @@ -123,6 +128,7 @@ } } + @Override public void classUnload(ClassUnloadEventSet e) { if (context.getVerboseFlag()) { diagnostics.putString("Class " + e.getClassName() + @@ -130,12 +136,14 @@ } } + @Override public void exception(ExceptionEventSet e) { setThread(e); String name = e.getException().referenceType().name(); diagnostics.putString("Exception: " + name); } + @Override public void locationTrigger(LocationTriggerEventSet e) { String locString = locationString(e); setThread(e); @@ -155,15 +163,17 @@ } } + @Override public void modificationWatchpoint(ModificationWatchpointEventSet e) { setThread(e); for (EventIterator it = e.eventIterator(); it.hasNext(); ) { - Event evt = it.nextEvent(); + it.nextEvent(); diagnostics.putString("Watchpoint hit: " + locationString(e)); } } + @Override public void threadDeath(ThreadDeathEventSet e) { if (context.getVerboseFlag()) { diagnostics.putString("Thread " + e.getThread() + @@ -171,6 +181,7 @@ } } + @Override public void threadStart(ThreadStartEventSet e) { if (context.getVerboseFlag()) { diagnostics.putString("Thread " + e.getThread() + @@ -178,16 +189,19 @@ } } + @Override public void vmDeath(VMDeathEventSet e) { script.setPrompt(DEFAULT_CMD_PROMPT); diagnostics.putString("VM exited"); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { script.setPrompt(DEFAULT_CMD_PROMPT); diagnostics.putString("Disconnected from VM"); } + @Override public void vmStart(VMStartEventSet e) { script.setPrompt(DEFAULT_CMD_PROMPT); diagnostics.putString("VM started"); @@ -195,14 +209,17 @@ // SessionListener + @Override public void sessionStart(EventObject e) {} + @Override public void sessionInterrupt(EventObject e) { Thread.yield(); // fetch output diagnostics.putString("VM interrupted by user."); script.setPrompt(DEFAULT_CMD_PROMPT); } + @Override public void sessionContinue(EventObject e) { diagnostics.putString("Execution resumed."); script.setPrompt(DEFAULT_CMD_PROMPT); @@ -210,23 +227,28 @@ // SpecListener + @Override public void breakpointSet(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint set at " + spec + "."); } + @Override public void breakpointDeferred(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint will be set at " + spec + " when its class is loaded."); } + @Override public void breakpointDeleted(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint at " + spec.toString() + " deleted."); } + @Override public void breakpointResolved(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint resolved to " + spec.toString() + "."); } + @Override public void breakpointError(SpecErrorEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Deferred breakpoint at " + @@ -236,25 +258,35 @@ //### Add info for watchpoints and exceptions + @Override public void watchpointSet(SpecEvent e) { } + @Override public void watchpointDeferred(SpecEvent e) { } + @Override public void watchpointDeleted(SpecEvent e) { } + @Override public void watchpointResolved(SpecEvent e) { } + @Override public void watchpointError(SpecErrorEvent e) { } + @Override public void exceptionInterceptSet(SpecEvent e) { } + @Override public void exceptionInterceptDeferred(SpecEvent e) { } + @Override public void exceptionInterceptDeleted(SpecEvent e) { } + @Override public void exceptionInterceptResolved(SpecEvent e) { } + @Override public void exceptionInterceptError(SpecErrorEvent e) { } @@ -263,6 +295,7 @@ // If the user selects a new current thread or frame, update prompt. + @Override public void currentFrameChanged(CurrentFrameChangedEvent e) { // Update prompt only if affect thread is current. ThreadReference thread = e.getThread(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Sat May 14 11:52:15 2011 -0700 @@ -46,7 +46,7 @@ private boolean verbose; - private Vector<ContextListener> contextListeners = new Vector<ContextListener>(); + private ArrayList<ContextListener> contextListeners = new ArrayList<ContextListener>(); public ContextManager(Environment env) { classManager = env.getClassManager(); @@ -264,11 +264,11 @@ private void notifyCurrentFrameChanged(ThreadInfo tinfo, int index, boolean invalidate) { - Vector l = (Vector)contextListeners.clone(); + ArrayList<ContextListener> l = new ArrayList<ContextListener>(contextListeners); CurrentFrameChangedEvent evt = new CurrentFrameChangedEvent(this, tinfo, index, invalidate); for (int i = 0; i < l.size(); i++) { - ((ContextListener)l.elementAt(i)).currentFrameChanged(evt); + l.get(i).currentFrameChanged(evt); } } @@ -277,28 +277,34 @@ // SessionListener + @Override public void sessionStart(EventObject e) { invalidateCurrentThread(); } + @Override public void sessionInterrupt(EventObject e) { setCurrentThreadInvalidate(currentThread); } + @Override public void sessionContinue(EventObject e) { invalidateCurrentThread(); } // JDIListener + @Override public void locationTrigger(LocationTriggerEventSet e) { setCurrentThreadInvalidate(e.getThread()); } + @Override public void exception(ExceptionEventSet e) { setCurrentThreadInvalidate(e.getThread()); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { invalidateCurrentThread(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java Sat May 14 11:52:15 2011 -0700 @@ -31,6 +31,7 @@ public class CurrentFrameChangedEvent extends EventObject { + private static final long serialVersionUID = 4214479486546762179L; private ThreadInfo tinfo; private int index; private boolean invalidate; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java Sat May 14 11:52:15 2011 -0700 @@ -26,8 +26,6 @@ package com.sun.tools.example.debug.gui; import java.io.*; -import java.util.*; - import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java Sat May 14 11:52:15 2011 -0700 @@ -26,8 +26,6 @@ package com.sun.tools.example.debug.gui; import java.io.*; -import java.util.*; - import javax.swing.*; import javax.swing.border.*; import java.awt.*; @@ -38,6 +36,7 @@ public class GUI extends JPanel { + private static final long serialVersionUID = 3292463234530679091L; private CommandTool cmdTool; private ApplicationTool appTool; //###HACK## @@ -87,7 +86,7 @@ threadTreeTool = new ThreadTreeTool(env); threadTreeTool.setPreferredSize(new java.awt.Dimension(200, 450)); - JTabbedPane treePane = new JTabbedPane(JTabbedPane.BOTTOM); + JTabbedPane treePane = new JTabbedPane(SwingConstants.BOTTOM); treePane.addTab("Source", null, sourceTreeTool); treePane.addTab("Classes", null, classTreeTool); treePane.addTab("Threads", null, threadTreeTool); @@ -139,12 +138,9 @@ } public static void main(String argv[]) { - String remote = null; String clsName = ""; String progArgs = ""; String javaArgs = ""; - boolean verbose = false; //### Not implemented. - final Environment env = new Environment(); JPanel mainPanel = new GUI(env); @@ -246,13 +242,14 @@ frame.setContentPane(mainPanel); frame.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { env.terminate(); } }); frame.pack(); - frame.show(); + frame.setVisible(true); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Sat May 14 11:52:15 2011 -0700 @@ -28,7 +28,6 @@ import java.io.File; import java.util.Hashtable; import java.util.Enumeration; -import javax.swing.*; import javax.swing.filechooser.*; //### Renamed from 'ExampleFileFilter.java' provided with Swing demos. @@ -93,8 +92,12 @@ */ public JDBFileFilter(String extension, String description) { this(); - if(extension!=null) addExtension(extension); - if(description!=null) setDescription(description); + if(extension!=null) { + addExtension(extension); + } + if(description!=null) { + setDescription(description); + } } /** @@ -120,11 +123,13 @@ */ public JDBFileFilter(String[] filters, String description) { this(); - for (int i = 0; i < filters.length; i++) { + for (String filter : filters) { // add filters one by one - addExtension(filters[i]); + addExtension(filter); } - if(description!=null) setDescription(description); + if(description!=null) { + setDescription(description); + } } /** @@ -136,6 +141,7 @@ * @see #getExtension * @see FileFilter#accepts */ + @Override public boolean accept(File f) { if(f != null) { if(f.isDirectory()) { @@ -196,6 +202,7 @@ * @see isExtensionListInDescription * @see FileFilter#getDescription */ + @Override public String getDescription() { if(fullDescription == null) { if(description == null || isExtensionListInDescription()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java Sat May 14 11:52:15 2011 -0700 @@ -31,7 +31,6 @@ import java.util.Vector; import java.util.List; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; //### This is currently just a placeholder! @@ -57,6 +56,7 @@ JMenuItem openItem = new JMenuItem("Open...", 'O'); openItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { openCommand(); } @@ -93,6 +93,7 @@ JMenuItem monitorItem = new JMenuItem("Monitor Expression...", 'M'); monitorItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { monitorCommand(); } @@ -101,6 +102,7 @@ JMenuItem unmonitorItem = new JMenuItem("Unmonitor Expression..."); unmonitorItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { unmonitorCommand(); } @@ -110,6 +112,7 @@ JMenu breakpointMenu = new JMenu("Breakpoint"); JMenuItem stopItem = new JMenuItem("Stop in...", 'S'); stopItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { buildBreakpoint(); } @@ -176,6 +179,7 @@ mi.setToolTipText(toolTip); final String cmd = command; mi.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(cmd); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java Sat May 14 11:52:15 2011 -0700 @@ -26,10 +26,8 @@ package com.sun.tools.example.debug.gui; import javax.swing.*; -import java.awt.*; import java.awt.event.*; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; class JDBToolBar extends JToolBar { @@ -92,6 +90,7 @@ button.setToolTipText(toolTip); final String cmd = command; button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(cmd); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Sat May 14 11:52:15 2011 -0700 @@ -29,18 +29,10 @@ import java.util.ArrayList; import java.util.Map; import java.util.HashMap; -import java.util.Iterator; - -import java.io.IOException; - import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Container; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.TitledBorder; @@ -98,6 +90,7 @@ comp.add(panel); } + @Override String getText() { return textField.getText(); } @@ -114,6 +107,7 @@ comp.add(panel); } + @Override String getText() { return ((Connector.BooleanArgument)arg) .stringValueOf(check.getModel().isSelected()); @@ -147,6 +141,7 @@ final boolean[] oked = {false}; JPanel buttonPanel = okCancel( dialog, new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { if (radioGroup.getSelection() == null) { JOptionPane.showMessageDialog(dialog, @@ -162,7 +157,7 @@ } ); content.add(BorderLayout.SOUTH, buttonPanel); dialog.pack(); - dialog.show(); + dialog.setVisible(true); return oked[0] ? modelToConnector.get(radioGroup.getSelection()) : @@ -178,7 +173,7 @@ Container content = dialog.getContentPane(); JPanel guts = new JPanel(); Border etched = BorderFactory.createEtchedBorder(); - Border titled = BorderFactory.createTitledBorder(etched, + BorderFactory.createTitledBorder(etched, connector.description(), TitledBorder.LEFT, TitledBorder.TOP); guts.setBorder(etched); @@ -199,6 +194,7 @@ content.add(guts); JPanel buttonPanel = okCancel( dialog, new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { for (ArgRep ar : argReps) { if (!ar.isSpecified()) { @@ -236,7 +232,7 @@ } ); content.add(BorderLayout.SOUTH, buttonPanel); dialog.pack(); - dialog.show(); + dialog.setVisible(true); } private JPanel okCancel(final JDialog dialog, ActionListener okListener) { @@ -247,6 +243,7 @@ buttonPanel.add(cancel); ok.addActionListener(okListener); cancel.addActionListener( new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { dialog.setVisible(false); dialog.dispose(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java Sat May 14 11:52:15 2011 -0700 @@ -42,10 +42,12 @@ //### remove listeners on exit! } + @Override public Object getElementAt(int index) { return monitors.get(index); } + @Override public int getSize() { return monitors.size(); } @@ -70,7 +72,7 @@ return Collections.unmodifiableList(monitors); } - public Iterator iterator() { + public Iterator<?> iterator() { return monitors().iterator(); } @@ -80,7 +82,8 @@ private class MonitorListListener implements ContextListener { - public void currentFrameChanged(CurrentFrameChangedEvent e) { + @Override + public void currentFrameChanged(final CurrentFrameChangedEvent e) { invalidate(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,9 @@ package com.sun.tools.example.debug.gui; -import java.io.*; -import java.util.*; - import javax.swing.*; -import javax.swing.tree.*; import javax.swing.event.*; import java.awt.*; -import java.awt.event.*; - import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; import com.sun.tools.example.debug.expr.ExpressionParser; @@ -41,6 +35,7 @@ public class MonitorTool extends JPanel { + private static final long serialVersionUID = -645235951031726647L; private ExecutionManager runtime; private ContextManager context; @@ -64,6 +59,7 @@ } private class MonitorToolListener implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { int index = list.getSelectedIndex(); if (index != -1) { @@ -78,6 +74,7 @@ IncompatibleThreadStateException { ExpressionParser.GetFrame frameGetter = new ExpressionParser.GetFrame() { + @Override public StackFrame get() throws IncompatibleThreadStateException { @@ -93,6 +90,7 @@ private class MonitorRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Sat May 14 11:52:15 2011 -0700 @@ -58,8 +58,8 @@ } public File resolve(String relativeFileName) { - for (int i = 0; i < pathArray.length; i++) { - File path = new File(pathArray[i], relativeFileName); + for (String element : pathArray) { + File path = new File(element, relativeFileName); if (path.exists()) { return path; } @@ -76,8 +76,8 @@ // classpath is retained. This is the one that will be // found if we later do a 'resolve'. SortedSet<String> s = new TreeSet<String>(); // sorted, no duplicates - for (int i = 0; i < pathArray.length; i++) { - File path = new File(pathArray[i], relativeDirName); + for (String element : pathArray) { + File path = new File(element, relativeDirName); if (path.exists()) { String[] childArray = path.list(filter); if (childArray != null) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java Sat May 14 11:52:15 2011 -0700 @@ -25,22 +25,25 @@ package com.sun.tools.example.debug.gui; -import javax.swing.*; import javax.swing.tree.*; public class SingleLeafTreeSelectionModel extends DefaultTreeSelectionModel { + private static final long serialVersionUID = -7849105107888117679L; + SingleLeafTreeSelectionModel() { super(); selectionMode = SINGLE_TREE_SELECTION; } + @Override public void setSelectionPath(TreePath path) { if(((TreeNode)(path.getLastPathComponent())).isLeaf()) { super.setSelectionPath(path); } } + @Override public void setSelectionPaths(TreePath[] paths) { // Only look at first path, as all others will be // ignored anyway in single tree selection mode. @@ -49,12 +52,14 @@ } } + @Override public void addSelectionPath(TreePath path) { if(((TreeNode)(path.getLastPathComponent())).isLeaf()) { super.setSelectionPath(path); } } + @Override public void addSelectionPaths(TreePath[] paths) { // Only look at first path, as all others will be // ignored anyway in single tree selection mode. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Sat May 14 11:52:15 2011 -0700 @@ -31,7 +31,6 @@ import com.sun.jdi.*; import com.sun.tools.example.debug.event.*; -import com.sun.tools.example.debug.bdi.*; /** * Manage the list of source files. @@ -45,7 +44,7 @@ private List<SourceModel> sourceList; private SearchPath sourcePath; - private Vector<SourceListener> sourceListeners = new Vector<SourceListener>(); + private ArrayList<SourceListener> sourceListeners = new ArrayList<SourceListener>(); private Map<ReferenceType, SourceModel> classToSource = new HashMap<ReferenceType, SourceModel>(); @@ -79,18 +78,18 @@ } public void addSourceListener(SourceListener l) { - sourceListeners.addElement(l); + sourceListeners.add(l); } public void removeSourceListener(SourceListener l) { - sourceListeners.removeElement(l); + sourceListeners.remove(l); } private void notifySourcepathChanged() { - Vector l = (Vector)sourceListeners.clone(); + ArrayList<SourceListener> l = new ArrayList<SourceListener>(sourceListeners); SourcepathChangedEvent evt = new SourcepathChangedEvent(this); for (int i = 0; i < l.size(); i++) { - ((SourceListener)l.elementAt(i)).sourcepathChanged(evt); + l.get(i).sourcepathChanged(evt); } } @@ -163,6 +162,7 @@ private class SMClassListener extends JDIAdapter implements JDIListener { + @Override public void classPrepare(ClassPrepareEventSet e) { ReferenceType refType = e.getReferenceType(); SourceModel sm = sourceForClass(refType); @@ -171,6 +171,7 @@ } } + @Override public void classUnload(ClassUnloadEventSet e) { //### iterate through looking for (e.getTypeName()). //### then remove it. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Sat May 14 11:52:15 2011 -0700 @@ -31,8 +31,6 @@ import com.sun.jdi.*; import com.sun.jdi.request.*; -import com.sun.tools.example.debug.bdi.*; - import javax.swing.*; /** @@ -101,6 +99,7 @@ // **** Implement ListModel ***** + @Override public Object getElementAt(int index) { if (sourceLines == null) { initialize(); @@ -108,6 +107,7 @@ return sourceLines.get(index); } + @Override public int getSize() { if (sourceLines == null) { initialize(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java Sat May 14 11:52:15 2011 -0700 @@ -26,8 +26,6 @@ package com.sun.tools.example.debug.gui; import java.io.*; -import java.util.*; - import java.awt.*; import java.awt.event.*; import javax.swing.*; @@ -35,12 +33,11 @@ import com.sun.jdi.*; import com.sun.jdi.request.*; -import com.sun.tools.example.debug.event.*; import com.sun.tools.example.debug.bdi.*; -import java.util.List; +public class SourceTool extends JPanel { -public class SourceTool extends JPanel { + private static final long serialVersionUID = -5461299294186395257L; private Environment env; @@ -99,6 +96,7 @@ // ContextListener + @Override public void currentFrameChanged(CurrentFrameChangedEvent e) { showSourceContext(e.getThread(), e.getIndex()); } @@ -108,6 +106,7 @@ // SourceListener + @Override public void sourcepathChanged(SourcepathChangedEvent e) { // Reload source view if its contents depend // on the source path. @@ -120,12 +119,15 @@ // SpecListener + @Override public void breakpointSet(SpecEvent e) { breakpointResolved(e); } + @Override public void breakpointDeferred(SpecEvent e) { } + @Override public void breakpointDeleted(SpecEvent e) { BreakpointRequest req = (BreakpointRequest)e.getEventRequest(); Location loc = req.location(); @@ -139,6 +141,7 @@ } } + @Override public void breakpointResolved(SpecEvent e) { BreakpointRequest req = (BreakpointRequest)e.getEventRequest(); Location loc = req.location(); @@ -150,29 +153,40 @@ } } + @Override public void breakpointError(SpecErrorEvent e) { breakpointDeleted(e); } + @Override public void watchpointSet(SpecEvent e) { } + @Override public void watchpointDeferred(SpecEvent e) { } + @Override public void watchpointDeleted(SpecEvent e) { } + @Override public void watchpointResolved(SpecEvent e) { } + @Override public void watchpointError(SpecErrorEvent e) { } + @Override public void exceptionInterceptSet(SpecEvent e) { } + @Override public void exceptionInterceptDeferred(SpecEvent e) { } + @Override public void exceptionInterceptDeleted(SpecEvent e) { } + @Override public void exceptionInterceptResolved(SpecEvent e) { } + @Override public void exceptionInterceptError(SpecErrorEvent e) { } } @@ -269,6 +283,7 @@ private class SourceLineRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, @@ -301,6 +316,7 @@ return this; } + @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); return new Dimension(dim.width, dim.height-5); @@ -309,6 +325,7 @@ } private class STMouseListener extends MouseAdapter implements MouseListener { + @Override public void mousePressed(MouseEvent e) { if (e.isPopupTrigger()) { showPopupMenu((Component)e.getSource(), @@ -316,6 +333,7 @@ } } + @Override public void mouseReleased(MouseEvent e) { if (e.isPopupTrigger()) { showPopupMenu((Component)e.getSource(), @@ -354,6 +372,7 @@ private JMenuItem commandItem(String label, final String cmd) { JMenuItem item = new JMenuItem(label); item.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(cmd); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java Sat May 14 11:52:15 2011 -0700 @@ -30,15 +30,15 @@ import javax.swing.*; import javax.swing.tree.*; -import javax.swing.event.*; import java.awt.*; import java.awt.event.*; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; public class SourceTreeTool extends JPanel { + private static final long serialVersionUID = 3336680912107956419L; + private Environment env; private ExecutionManager runtime; @@ -81,6 +81,7 @@ ******/ MouseListener ml = new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); @@ -112,6 +113,7 @@ private class SourceTreeToolListener implements SourceListener { + @Override public void sourcepathChanged(SourcepathChangedEvent e) { sourcePath = sourceManager.getSourcePath(); root = createDirectoryTree(HEADING); @@ -121,6 +123,7 @@ } private static class SourceOrDirectoryFilter implements FilenameFilter { + @Override public boolean accept(File dir, String name) { return (name.endsWith(".java") || new File(dir, name).isDirectory()); @@ -158,6 +161,7 @@ this.isDirectory = isDirectory; } + @Override public String toString() { return name; } @@ -195,6 +199,7 @@ * Returns the child <code>TreeNode</code> at index * <code>childIndex</code>. */ + @Override public TreeNode getChildAt(int childIndex) { expandIfNeeded(); return children[childIndex]; @@ -204,6 +209,7 @@ * Returns the number of children <code>TreeNode</code>s the receiver * contains. */ + @Override public int getChildCount() { expandIfNeeded(); return children.length; @@ -212,6 +218,7 @@ /** * Returns the parent <code>TreeNode</code> of the receiver. */ + @Override public TreeNode getParent() { return parent; } @@ -221,18 +228,21 @@ * If the receiver does not contain <code>node</code>, -1 will be * returned. */ + @Override public int getIndex(TreeNode node) { expandIfNeeded(); for (int i = 0; i < children.length; i++) { - if (children[i] == node) + if (children[i] == node) { return i; } + } return -1; } /** * Returns true if the receiver allows children. */ + @Override public boolean getAllowsChildren() { return isDirectory; } @@ -240,6 +250,7 @@ /** * Returns true if the receiver is a leaf. */ + @Override public boolean isLeaf() { expandIfNeeded(); return !isDirectory; @@ -248,13 +259,16 @@ /** * Returns the children of the receiver as an Enumeration. */ + @Override public Enumeration children() { expandIfNeeded(); return new Enumeration() { int i = 0; + @Override public boolean hasMoreElements() { return (i < children.length); } + @Override public Object nextElement() throws NoSuchElementException { if (i >= children.length) { throw new NoSuchElementException(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java Sat May 14 11:52:15 2011 -0700 @@ -29,6 +29,8 @@ public class SourcepathChangedEvent extends EventObject { + private static final long serialVersionUID = 8762169481005804121L; + public SourcepathChangedEvent(Object source) { super(source); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,21 +25,16 @@ package com.sun.tools.example.debug.gui; -import java.io.*; -import java.util.*; -import java.util.List; // Must import explicitly due to conflict with javax.awt.List - import javax.swing.*; -import javax.swing.tree.*; import javax.swing.event.*; import java.awt.*; -import java.awt.event.*; - import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; public class StackTraceTool extends JPanel { + private static final long serialVersionUID = 9140041989427965718L; + private Environment env; private ExecutionManager runtime; @@ -85,6 +80,7 @@ //### I suspect we handle the case badly that the VM is not interrupted. + @Override public void currentFrameChanged(CurrentFrameChangedEvent e) { // If the current frame of the thread appearing in this // view is changed, move the selection to track it. @@ -103,6 +99,7 @@ // ListSelectionListener + @Override public void valueChanged(ListSelectionEvent e) { int index = list.getSelectedIndex(); if (index != -1) { @@ -117,6 +114,7 @@ private class StackFrameRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, @@ -174,6 +172,7 @@ this.tinfo = tinfo; } + @Override public Object getElementAt(int index) { try { return tinfo == null? null : tinfo.getFrame(index); @@ -186,6 +185,7 @@ } } + @Override public int getSize() { try { return tinfo == null? 1 : tinfo.getFrameCount(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,13 +25,11 @@ package com.sun.tools.example.debug.gui; -import java.io.*; import java.util.*; import java.util.List; // Must import explicitly due to conflict with javax.awt.List import javax.swing.*; import javax.swing.tree.*; -import javax.swing.event.*; import java.awt.*; import java.awt.event.*; @@ -45,6 +43,8 @@ public class ThreadTreeTool extends JPanel { + private static final long serialVersionUID = 4168599992853038878L; + private Environment env; private ExecutionManager runtime; @@ -79,6 +79,7 @@ tree.setSelectionModel(new SingleLeafTreeSelectionModel()); MouseListener ml = new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); @@ -131,6 +132,7 @@ // SessionListener + @Override public void sessionStart(EventObject e) { try { for (ThreadReference thread : runtime.allThreads()) { @@ -143,20 +145,25 @@ } } + @Override public void sessionInterrupt(EventObject e) {} + @Override public void sessionContinue(EventObject e) {} // JDIListener + @Override public void threadStart(ThreadStartEventSet e) { root.addThread(e.getThread()); } + @Override public void threadDeath(ThreadDeathEventSet e) { root.removeThread(e.getThread()); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { // Clear the contents of this view. root = createThreadTree(HEADING); @@ -193,6 +200,7 @@ } } + @Override public String toString() { return description; } @@ -213,6 +221,7 @@ return (thread == null); } + @Override public boolean isLeaf() { return !isThreadGroup(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java Sat May 14 11:52:15 2011 -0700 @@ -28,10 +28,10 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -import javax.swing.border.*; public class TypeScript extends JPanel { + private static final long serialVersionUID = -983704841363534885L; private JTextArea history; private JTextField entry; @@ -41,7 +41,6 @@ private JScrollBar historyHScrollBar; private boolean echoInput = false; - private boolean nlPending = false; private static String newline = System.getProperty("line.separator"); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java Sat May 14 11:52:15 2011 -0700 @@ -25,7 +25,6 @@ package com.sun.tools.example.debug.gui; -import javax.swing.*; import com.sun.tools.example.debug.bdi.OutputListener; public class TypeScriptOutputListener implements OutputListener { @@ -42,10 +41,12 @@ this.appendNewline = appendNewline; } + @Override public void putString(String s) { script.append(s); - if (appendNewline) + if (appendNewline) { script.newline(); } + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java Sat May 14 11:52:15 2011 -0700 @@ -35,14 +35,17 @@ this.script = script; } + @Override public void write(char[] cbuf, int off, int len) throws IOException { script.append(String.valueOf(cbuf, off, len)); } + @Override public void flush() { script.flush(); } + @Override public void close() { script.flush(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -38,6 +38,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) throws NoSuchFieldException { Field field = refType.fieldByName(fieldId); @@ -48,6 +49,7 @@ return wp; } + @Override public String toString() { return MessageOutput.format("watch accesses of", new Object [] {refSpec.toString(), diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class AmbiguousMethodException extends Exception { + private static final long serialVersionUID = -5372629264936918654L; + public AmbiguousMethodException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Iterator; class BreakpointSpec extends EventRequestSpec { String methodId; @@ -58,6 +57,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) throws AmbiguousMethodException, AbsentInformationException, @@ -91,12 +91,14 @@ return (methodId != null); } + @Override public int hashCode() { return refSpec.hashCode() + lineNumber + ((methodId != null) ? methodId.hashCode() : 0) + ((methodArgs != null) ? methodArgs.hashCode() : 0); } + @Override public boolean equals(Object obj) { if (obj instanceof BreakpointSpec) { BreakpointSpec breakpoint = (BreakpointSpec)obj; @@ -114,6 +116,7 @@ } } + @Override String errorMessageFor(Exception e) { if (e instanceof AmbiguousMethodException) { return (MessageOutput.format("Method is overloaded; specify arguments", @@ -140,6 +143,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer(refSpec.toString()); if (isMethodBreakpoint()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Sat May 14 11:52:15 2011 -0700 @@ -51,6 +51,7 @@ final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo(); final int stackFrame = threadInfo == null? 0 : threadInfo.getCurrentFrameIndex(); Thread thread = new Thread("asynchronous jdb command") { + @Override public void run() { try { action(); @@ -95,6 +96,7 @@ final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo(); if ((threadInfo != null) && (threadInfo.getCurrentFrame() != null)) { frameGetter = new ExpressionParser.GetFrame() { + @Override public StackFrame get() throws IncompatibleThreadStateException { return threadInfo.getCurrentFrame(); } @@ -224,7 +226,6 @@ } void commandClass(StringTokenizer t) { - List<ReferenceType> list = Env.vm().allClasses(); if (!t.hasMoreTokens()) { MessageOutput.println("No class specified."); @@ -709,6 +710,7 @@ void doKillThread(final ThreadReference threadToKill, final StringTokenizer tokenizer) { new AsyncExecution() { + @Override void action() { doKill(threadToKill, tokenizer); } @@ -1118,7 +1120,6 @@ } void commandStop(StringTokenizer t) { - Location bploc; String atIn; byte suspendPolicy = EventRequest.SUSPEND_ALL; @@ -1665,6 +1666,7 @@ void commandPrint(final StringTokenizer t, final boolean dumpObject) { new AsyncExecution() { + @Override void action() { doPrint(t, dumpObject); } @@ -1734,6 +1736,7 @@ void commandLock(final StringTokenizer t) { new AsyncExecution() { + @Override void action() { doLock(t); } @@ -1809,6 +1812,7 @@ void commandDisableGC(final StringTokenizer t) { new AsyncExecution() { + @Override void action() { doDisableGC(t); } @@ -1837,6 +1841,7 @@ void commandEnableGC(final StringTokenizer t) { new AsyncExecution() { + @Override void action() { doEnableGC(t); } @@ -1892,6 +1897,7 @@ } } else { new AsyncExecution() { + @Override void action() { doSave(t); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Sat May 14 11:52:15 2011 -0700 @@ -29,7 +29,6 @@ import com.sun.jdi.request.StepRequest; import com.sun.jdi.request.MethodEntryRequest; import com.sun.jdi.request.MethodExitRequest; -import com.sun.tools.jdi.*; import java.util.*; import java.io.*; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Sat May 14 11:52:15 2011 -0700 @@ -27,14 +27,8 @@ import com.sun.jdi.*; import com.sun.jdi.event.*; -import com.sun.jdi.request.EventRequestManager; import com.sun.jdi.request.EventRequest; -import java.io.PrintStream; -import java.util.StringTokenizer; -import java.util.Collection; -import java.util.Iterator; - public class EventHandler implements Runnable { EventNotifier notifier; @@ -59,6 +53,7 @@ } } + @Override public void run() { EventQueue queue = Env.vm().eventQueue(); while (connected) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Sat May 14 11:52:15 2011 -0700 @@ -30,9 +30,7 @@ import com.sun.jdi.request.ExceptionRequest; import com.sun.jdi.request.ClassPrepareRequest; import com.sun.jdi.event.ClassPrepareEvent; -import java.util.List; import java.util.ArrayList; -import java.util.Iterator; abstract class EventRequestSpec { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,12 @@ package com.sun.tools.example.debug.tty; -import com.sun.jdi.*; import com.sun.jdi.request.EventRequest; import com.sun.jdi.event.ClassPrepareEvent; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; -import java.util.StringTokenizer; class EventRequestSpecList { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java Sat May 14 11:52:15 2011 -0700 @@ -28,10 +28,6 @@ import com.sun.jdi.ReferenceType; import com.sun.jdi.request.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Iterator; - class ExceptionSpec extends EventRequestSpec { private boolean notifyCaught; private boolean notifyUncaught; @@ -51,6 +47,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) { EventRequestManager em = refType.virtualMachine().eventRequestManager(); ExceptionRequest excReq = em.createExceptionRequest(refType, @@ -68,6 +65,7 @@ return notifyUncaught; } + @Override public int hashCode() { //Reference: Effective Java[tm] (Bloch, 2001), Item 8 int result = 17; @@ -77,6 +75,7 @@ return result; } + @Override public boolean equals(Object obj) { if (obj instanceof ExceptionSpec) { ExceptionSpec es = (ExceptionSpec)obj; @@ -90,6 +89,7 @@ return false; } + @Override public String toString() { String s; if (notifyCaught && !notifyUncaught) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class LineNotFoundException extends Exception { + private static final long serialVersionUID = 3748297722519448995L; + public LineNotFoundException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,8 @@ package com.sun.tools.example.debug.tty; class MalformedMemberNameException extends Exception { + private static final long serialVersionUID = 7759071468833196630L; + public MalformedMemberNameException() { super(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -38,6 +38,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) throws NoSuchFieldException { Field field = refType.fieldByName(fieldId); @@ -48,6 +49,7 @@ return wp; } + @Override public String toString() { return MessageOutput.format("watch modification of", new Object [] {refSpec.toString(), diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -55,6 +55,7 @@ /** * Does the specified ReferenceType match this spec. */ + @Override public boolean matches(ReferenceType refType) { if (classId.startsWith("*")) { return refType.name().endsWith(stem); @@ -65,6 +66,7 @@ } } + @Override public ClassPrepareRequest createPrepareRequest() { ClassPrepareRequest request = Env.vm().eventRequestManager().createClassPrepareRequest(); @@ -73,10 +75,12 @@ return request; } + @Override public int hashCode() { return classId.hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof PatternReferenceTypeSpec) { PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj; @@ -125,6 +129,7 @@ return true; } + @Override public String toString() { return classId; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -35,7 +35,9 @@ boolean matches(ReferenceType refType); ClassPrepareRequest createPrepareRequest(); + @Override int hashCode(); + @Override boolean equals(Object obj); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Sat May 14 11:52:15 2011 -0700 @@ -27,11 +27,8 @@ import com.sun.jdi.Location; import com.sun.jdi.AbsentInformationException; -import java.util.Map; -import java.util.HashMap; import java.util.List; import java.util.ArrayList; -import java.util.Iterator; import java.util.StringTokenizer; import java.io.*; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Sat May 14 11:52:15 2011 -0700 @@ -47,34 +47,43 @@ */ private static final String progname = "jdb"; + @Override public void vmStartEvent(VMStartEvent se) { Thread.yield(); // fetch output MessageOutput.lnprint("VM Started:"); } + @Override public void vmDeathEvent(VMDeathEvent e) { } + @Override public void vmDisconnectEvent(VMDisconnectEvent e) { } + @Override public void threadStartEvent(ThreadStartEvent e) { } + @Override public void threadDeathEvent(ThreadDeathEvent e) { } + @Override public void classPrepareEvent(ClassPrepareEvent e) { } + @Override public void classUnloadEvent(ClassUnloadEvent e) { } + @Override public void breakpointEvent(BreakpointEvent be) { Thread.yield(); // fetch output MessageOutput.lnprint("Breakpoint hit:"); } + @Override public void fieldWatchEvent(WatchpointEvent fwe) { Field field = fwe.field(); ObjectReference obj = fwe.object(); @@ -90,11 +99,13 @@ } } + @Override public void stepEvent(StepEvent se) { Thread.yield(); // fetch output MessageOutput.lnprint("Step completed:"); } + @Override public void exceptionEvent(ExceptionEvent ee) { Thread.yield(); // fetch output Location catchLocation = ee.catchLocation(); @@ -108,6 +119,7 @@ } } + @Override public void methodEntryEvent(MethodEntryEvent me) { Thread.yield(); // fetch output /* @@ -125,6 +137,7 @@ } } + @Override public boolean methodExitEvent(MethodExitEvent me) { Thread.yield(); // fetch output /* @@ -173,6 +186,7 @@ return false; } + @Override public void vmInterrupted() { Thread.yield(); // fetch output printCurrentLocation(); @@ -184,6 +198,7 @@ MessageOutput.printPrompt(); } + @Override public void receivedEvent(Event event) { } @@ -317,18 +332,19 @@ // Adapted for use with String[][0]. int low = 0; int high = commandList.length - 1; - long i = 0; while (low <= high) { int mid = (low + high) >>> 1; String midVal = commandList[mid][0]; int compare = midVal.compareTo(key); - if (compare < 0) + if (compare < 0) { low = mid + 1; - else if (compare > 0) + } else if (compare > 0) { high = mid - 1; - else + } + else { return mid; // key found } + } return -(low + 1); // key not found. }; @@ -336,7 +352,9 @@ * Return true if the command is OK when disconnected. */ private boolean isDisconnectCmd(int ii) { - if (ii < 0 || ii >= commandList.length) return false; + if (ii < 0 || ii >= commandList.length) { + return false; + } return (commandList[ii][1].equals("y")); } @@ -344,7 +362,9 @@ * Return true if the command is OK when readonly. */ private boolean isReadOnlyCmd(int ii) { - if (ii < 0 || ii >= commandList.length) return false; + if (ii < 0 || ii >= commandList.length) { + return false; + } return (commandList[ii][2].equals("y")); }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ * * @return the contents of this <code>ResourceBundle</code>. */ + @Override public Object[][] getContents() { Object[][] temp = new Object[][] { // NOTE: The value strings in this file containing "{0}" are diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ * * @return the contents of this <code>ResourceBundle</code>. */ + @Override public Object[][] getContents() { Object[][] temp = new Object[][] { // NOTE: The value strings in this file containing "{0}" are diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ * * @return the contents of this <code>ResourceBundle</code>. */ + @Override public Object[][] getContents() { Object[][] temp = new Object[][] { // NOTE: The value strings in this file containing "{0}" are diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.tty; import com.sun.jdi.ThreadGroupReference; -import com.sun.jdi.ThreadReference; import java.util.List; import java.util.Stack; import java.util.ArrayList; @@ -70,10 +69,12 @@ } } + @Override public boolean hasNext() { return !stack.isEmpty(); } + @Override public ThreadGroupReference next() { return nextThreadGroup(); } @@ -84,6 +85,7 @@ return tg; } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Sat May 14 11:52:15 2011 -0700 @@ -32,8 +32,6 @@ import java.util.List; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; -import java.io.*; class ThreadInfo { // This is a list of all known ThreadInfo objects. It survives diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Sat May 14 11:52:15 2011 -0700 @@ -46,6 +46,7 @@ tgi = new ThreadGroupIterator(); } + @Override public boolean hasNext() { while (it == null || !it.hasNext()) { if (!tgi.hasNext()) { @@ -56,6 +57,7 @@ return true; } + @Override public ThreadReference next() { return it.next(); } @@ -64,6 +66,7 @@ return next(); } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Sat May 14 11:52:15 2011 -0700 @@ -28,7 +28,6 @@ import com.sun.jdi.*; import com.sun.jdi.connect.*; import com.sun.jdi.request.EventRequestManager; -import com.sun.jdi.request.ExceptionRequest; import com.sun.jdi.request.ThreadStartRequest; import com.sun.jdi.request.ThreadDeathRequest; @@ -292,6 +291,7 @@ */ private void displayRemoteOutput(final InputStream stream) { Thread thr = new Thread("output reader") { + @Override public void run() { try { dumpStream(stream); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class VMNotConnectedException extends RuntimeException { + private static final long serialVersionUID = -7433430494903950165L; + public VMNotConnectedException() { super(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,8 +25,6 @@ package com.sun.tools.example.debug.tty; -import com.sun.jdi.*; - abstract class WatchpointSpec extends EventRequestSpec { final String fieldId; @@ -39,11 +37,13 @@ } } + @Override public int hashCode() { return refSpec.hashCode() + fieldId.hashCode() + getClass().hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof WatchpointSpec) { WatchpointSpec watchpoint = (WatchpointSpec)obj; @@ -56,6 +56,7 @@ } } + @Override String errorMessageFor(Exception e) { if (e instanceof NoSuchFieldException) { return (MessageOutput.format("No field in", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java --- a/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java Sat May 14 11:52:15 2011 -0700 @@ -49,7 +49,8 @@ private boolean vmDied = true; // VMDeath occurred // Maps ThreadReference to ThreadTrace instances - private Map traceMap = new HashMap(); + private Map<ThreadReference, ThreadTrace> traceMap = + new HashMap<>(); EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); @@ -63,6 +64,7 @@ * As long as we are connected, get event sets off * the queue and dispatch the events within them. */ + @Override public void run() { EventQueue queue = vm.eventQueue(); while (connected) { @@ -208,7 +210,7 @@ * creating one if needed. */ ThreadTrace threadTrace(ThreadReference thread) { - ThreadTrace trace = (ThreadTrace)traceMap.get(thread); + ThreadTrace trace = traceMap.get(thread); if (trace == null) { trace = new ThreadTrace(thread); traceMap.put(thread, trace); @@ -297,7 +299,7 @@ } void threadDeathEvent(ThreadDeathEvent event) { - ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread()); + ThreadTrace trace = traceMap.get(event.thread()); if (trace != null) { // only want threads we care about trace.threadDeathEvent(event); // Forward event } @@ -309,9 +311,8 @@ */ private void classPrepareEvent(ClassPrepareEvent event) { EventRequestManager mgr = vm.eventRequestManager(); - List fields = event.referenceType().visibleFields(); - for (Iterator it = fields.iterator(); it.hasNext(); ) { - Field field = (Field)it.next(); + List<Field> fields = event.referenceType().visibleFields(); + for (Field field : fields) { ModificationWatchpointRequest req = mgr.createModificationWatchpointRequest(field); for (int i=0; i<excludes.length; ++i) { @@ -323,7 +324,7 @@ } private void exceptionEvent(ExceptionEvent event) { - ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread()); + ThreadTrace trace = traceMap.get(event.thread()); if (trace != null) { // only want threads we care about trace.exceptionEvent(event); // Forward event } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java --- a/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java Sat May 14 11:52:15 2011 -0700 @@ -56,6 +56,7 @@ /** * Copy. */ + @Override public void run() { try { char[] cbuf = new char[BUFFER_SIZE]; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/trace/Trace.java --- a/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Sat May 14 11:52:15 2011 -0700 @@ -31,7 +31,6 @@ import java.util.Map; import java.util.List; -import java.util.Iterator; import java.io.PrintWriter; import java.io.FileWriter; @@ -155,7 +154,8 @@ */ VirtualMachine launchTarget(String mainArgs) { LaunchingConnector connector = findLaunchingConnector(); - Map arguments = connectorArguments(connector, mainArgs); + Map<String, Connector.Argument> arguments = + connectorArguments(connector, mainArgs); try { return connector.launch(arguments); } catch (IOException exc) { @@ -186,10 +186,8 @@ * Find a com.sun.jdi.CommandLineLaunch connector */ LaunchingConnector findLaunchingConnector() { - List connectors = Bootstrap.virtualMachineManager().allConnectors(); - Iterator iter = connectors.iterator(); - while (iter.hasNext()) { - Connector connector = (Connector)iter.next(); + List<Connector> connectors = Bootstrap.virtualMachineManager().allConnectors(); + for (Connector connector : connectors) { if (connector.name().equals("com.sun.jdi.CommandLineLaunch")) { return (LaunchingConnector)connector; } @@ -200,8 +198,8 @@ /** * Return the launching connector's arguments. */ - Map connectorArguments(LaunchingConnector connector, String mainArgs) { - Map arguments = connector.defaultArguments(); + Map<String, Connector.Argument> connectorArguments(LaunchingConnector connector, String mainArgs) { + Map<String, Connector.Argument> arguments = connector.defaultArguments(); Connector.Argument mainArg = (Connector.Argument)arguments.get("main"); if (mainArg == null) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/awt/Component.java --- a/jdk/src/share/classes/java/awt/Component.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/awt/Component.java Sat May 14 11:52:15 2011 -0700 @@ -2945,6 +2945,46 @@ } /** + * Revalidates the component hierarchy up to the nearest validate root. + * + * This method first invalidates the component hierarchy starting from this + * component up to the nearest validate root. Afterwards, the component + * hierarchy is validated starting from the nearest validate root. + * + * This is a convenience method supposed to help application developers + * avoid looking for validate roots manually. Basically, it's equivalent to + * first calling the {@link #invalidate()} method on this component, and + * then calling the {@link #validate()} method on the nearest validate + * root. + * + * @see Container#isValidateRoot + * @since 1.7 + */ + public void revalidate() { + synchronized (getTreeLock()) { + invalidate(); + + Container root = getContainer(); + if (root == null) { + // There's no parents. Just validate itself. + validate(); + } else { + while (!root.isValidateRoot()) { + if (root.getContainer() == null) { + // If there's no validate roots, we'll validate the + // topmost container + break; + } + + root = root.getContainer(); + } + + root.validate(); + } + } + } + + /** * Creates a graphics context for this component. This method will * return <code>null</code> if this component is currently not * displayable. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/awt/GraphicsDevice.java --- a/jdk/src/share/classes/java/awt/GraphicsDevice.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java Sat May 14 11:52:15 2011 -0700 @@ -257,6 +257,11 @@ * 1.0f, and the background color alpha is set to 255 (completely opaque). * These values are not restored when returning to windowed mode. * + * It is unspecified and platform-dependent how decorated windows operate + * in full-screen mode. For this reason, it is recommended to turn off + * the decorations in a {@code Frame} or {@code Dialog} object by using the + * {@code setUndecorated} method. + * * When returning to windowed mode from an exclusive full-screen window, * any display changes made by calling {@code setDisplayMode} are * automatically restored to their original state. @@ -272,6 +277,8 @@ * @see #setDisplayMode * @see Component#enableInputMethods * @see Component#setVisible + * @see Frame#setUndecorated + * @see Dialog#setUndecorated * * @since 1.4 */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/awt/Toolkit.java --- a/jdk/src/share/classes/java/awt/Toolkit.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/awt/Toolkit.java Sat May 14 11:52:15 2011 -0700 @@ -1870,11 +1870,15 @@ /** * Adds the specified property change listener for the named desktop - * property. - * If pcl is null, no exception is thrown and no action is performed. + * property. When a {@link PropertyChangeListenerProxy} object is added, + * its property name is ignored, and the wrapped listener is added. + * If {@code name} is {@code null} or {@code pcl} is {@code null}, + * no exception is thrown and no action is performed. * * @param name The name of the property to listen for * @param pcl The property change listener + * @see PropertyChangeSupport#addPropertyChangeListener(String, + PropertyChangeListener) * @since 1.2 */ public void addPropertyChangeListener(String name, PropertyChangeListener pcl) { @@ -1883,11 +1887,16 @@ /** * Removes the specified property change listener for the named - * desktop property. - * If pcl is null, no exception is thrown and no action is performed. + * desktop property. When a {@link PropertyChangeListenerProxy} object + * is removed, its property name is ignored, and + * the wrapped listener is removed. + * If {@code name} is {@code null} or {@code pcl} is {@code null}, + * no exception is thrown and no action is performed. * * @param name The name of the property to remove * @param pcl The property change listener + * @see PropertyChangeSupport#removePropertyChangeListener(String, + PropertyChangeListener) * @since 1.2 */ public void removePropertyChangeListener(String name, PropertyChangeListener pcl) { @@ -1896,12 +1905,15 @@ /** * Returns an array of all the property change listeners - * registered on this toolkit. + * registered on this toolkit. The returned array + * contains {@code PropertyChangeListenerProxy} objects + * that associate listeners with the names of desktop properties. * - * @return all of this toolkit's <code>PropertyChangeListener</code>s - * or an empty array if no property change - * listeners are currently registered + * @return all of this toolkit's {@ code PropertyChangeListener} + * objects wrapped in {@code PropertyChangeListenerProxy} objects + * or an empty array if no listeners are added * + * @see PropertyChangeSupport#getPropertyChangeListeners() * @since 1.4 */ public PropertyChangeListener[] getPropertyChangeListeners() { @@ -1909,13 +1921,15 @@ } /** - * Returns an array of all the <code>PropertyChangeListener</code>s - * associated with the named property. + * Returns an array of all property change listeners + * associated with the specified name of a desktop property. * * @param propertyName the named property - * @return all of the <code>PropertyChangeListener</code>s associated with - * the named property or an empty array if no such listeners have - * been added + * @return all of the {@code PropertyChangeListener} objects + * associated with the specified name of a desktop property + * or an empty array if no such listeners are added + * + * @see PropertyChangeSupport#getPropertyChangeListeners(String) * @since 1.4 */ public PropertyChangeListener[] getPropertyChangeListeners(String propertyName) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java --- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,7 @@ import java.util.*; import java.lang.reflect.*; +import java.util.Objects; import sun.reflect.misc.*; @@ -181,10 +182,6 @@ return method; } - private static boolean equals(Object o1, Object o2) { - return (o1 == null) ? (o2 == null) : o1.equals(o2); - } - private void doProperty(Class type, PropertyDescriptor pd, Object oldInstance, Object newInstance, Encoder out) throws Exception { Method getter = pd.getReadMethod(); Method setter = pd.getWriteMethod(); @@ -195,7 +192,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { // Search for a static constant with this value; Object e = (Object[])pd.getValue("enumerationValues"); if (e instanceof Object[] && Array.getLength(e) % 3 == 0) { @@ -233,7 +230,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { out.writeStatement(new Statement(field, "set", new Object[] { oldInstance, oldValue })); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/beans/MetaData.java --- a/jdk/src/share/classes/java/beans/MetaData.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/beans/MetaData.java Sat May 14 11:52:15 2011 -0700 @@ -56,6 +56,8 @@ import sun.swing.PrintColorUIResource; +import java.util.Objects; + /* * Like the <code>Intropector</code>, the <code>MetaData</code> class * contains meta objects that describe the way @@ -134,7 +136,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!MetaData.equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { // System.out.println("Not equal: " + newGetExp + " != " + actualGetExp); // invokeStatement(Array.class, "set", new Object[]{oldInstance, index, oldValue}, out); DefaultPersistenceDelegate.invokeStatement(oldInstance, "set", new Object[]{index, oldValue}, out); @@ -635,7 +637,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!MetaData.equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { invokeStatement(oldInstance, "set", new Object[]{index, oldValue}, out); } } @@ -675,7 +677,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!MetaData.equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { invokeStatement(oldInstance, "put", new Object[]{oldKey, oldValue}, out); } else if ((newValue == null) && !newMap.containsKey(oldKey)) { // put oldValue(=null?) if oldKey is absent in newMap @@ -899,17 +901,17 @@ if (!(oldInstance instanceof java.awt.Window)) { Object oldBackground = c.isBackgroundSet() ? c.getBackground() : null; Object newBackground = c2.isBackgroundSet() ? c2.getBackground() : null; - if (!MetaData.equals(oldBackground, newBackground)) { + if (!Objects.equals(oldBackground, newBackground)) { invokeStatement(oldInstance, "setBackground", new Object[] { oldBackground }, out); } Object oldForeground = c.isForegroundSet() ? c.getForeground() : null; Object newForeground = c2.isForegroundSet() ? c2.getForeground() : null; - if (!MetaData.equals(oldForeground, newForeground)) { + if (!Objects.equals(oldForeground, newForeground)) { invokeStatement(oldInstance, "setForeground", new Object[] { oldForeground }, out); } Object oldFont = c.isFontSet() ? c.getFont() : null; Object newFont = c2.isFontSet() ? c2.getFont() : null; - if (!MetaData.equals(oldFont, newFont)) { + if (!Objects.equals(oldFont, newFont)) { invokeStatement(oldInstance, "setFont", new Object[] { oldFont }, out); } } @@ -1306,10 +1308,6 @@ internalPersistenceDelegates.put("java.util.RegularEnumSet", new java_util_EnumSet_PersistenceDelegate()); } - /*pp*/ static boolean equals(Object o1, Object o2) { - return (o1 == null) ? (o2 == null) : o1.equals(o2); - } - public synchronized static PersistenceDelegate getPersistenceDelegate(Class type) { if (type == null) { return nullPersistenceDelegate; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/io/File.java --- a/jdk/src/share/classes/java/io/File.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/io/File.java Sat May 14 11:52:15 2011 -0700 @@ -25,7 +25,6 @@ package java.io; -import java.beans.ConstructorProperties; import java.net.URI; import java.net.URL; import java.net.MalformedURLException; @@ -247,7 +246,6 @@ * @throws NullPointerException * If the <code>pathname</code> argument is <code>null</code> */ - @ConstructorProperties("path") public File(String pathname) { if (pathname == null) { throw new NullPointerException(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/ArithmeticException.java --- a/jdk/src/share/classes/java/lang/ArithmeticException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/ArithmeticException.java Sat May 14 11:52:15 2011 -0700 @@ -32,7 +32,8 @@ * * {@code ArithmeticException} objects may be constructed by the * virtual machine as if {@linkplain Throwable#Throwable(String, - * Throwable, boolean) suppression were disabled}. + * Throwable, boolean, boolean) suppression were disabled and/or the + * stack trace was not writable}. * * @author unascribed * @since JDK1.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Character.java --- a/jdk/src/share/classes/java/lang/Character.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Character.java Sat May 14 11:52:15 2011 -0700 @@ -59,14 +59,14 @@ * The {@code char} data type (and therefore the value that a * {@code Character} object encapsulates) are based on the * original Unicode specification, which defined characters as - * fixed-width 16-bit entities. The Unicode standard has since been + * fixed-width 16-bit entities. The Unicode Standard has since been * changed to allow for characters whose representation requires more * than 16 bits. The range of legal code points is now * U+0000 to U+10FFFF, known as Unicode scalar value. * (Refer to the <a * href="http://www.unicode.org/reports/tr27/#notation"> * definition</a> of the U+n notation in the Unicode - * standard.) + * Standard.) * * <a name="BMP">The set of characters from U+0000 to U+FFFF is * sometimes referred to as the Basic Multilingual Plane (BMP). @@ -5200,7 +5200,8 @@ * * A character is lowercase if its general category type, provided * by {@code Character.getType(ch)}, is - * {@code LOWERCASE_LETTER}. + * {@code LOWERCASE_LETTER}, or it has contributory property + * Other_Lowercase as defined by the Unicode Standard. * * The following are examples of lowercase characters: * <blockquote><pre> @@ -5235,7 +5236,8 @@ * * A character is lowercase if its general category type, provided * by {@link Character#getType getType(codePoint)}, is - * {@code LOWERCASE_LETTER}. + * {@code LOWERCASE_LETTER}, or it has contributory property + * Other_Lowercase as defined by the Unicode Standard. * * The following are examples of lowercase characters: * <blockquote><pre> @@ -5257,7 +5259,8 @@ * @since 1.5 */ public static boolean isLowerCase(int codePoint) { - return getType(codePoint) == Character.LOWERCASE_LETTER; + return getType(codePoint) == Character.LOWERCASE_LETTER || + CharacterData.of(codePoint).isOtherLowercase(codePoint); } /** @@ -5265,6 +5268,7 @@ * * A character is uppercase if its general category type, provided by * {@code Character.getType(ch)}, is {@code UPPERCASE_LETTER}. + * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * * The following are examples of uppercase characters: * <blockquote><pre> @@ -5298,7 +5302,8 @@ * Determines if the specified character (Unicode code point) is an uppercase character. * * A character is uppercase if its general category type, provided by - * {@link Character#getType(int) getType(codePoint)}, is {@code UPPERCASE_LETTER}. + * {@link Character#getType(int) getType(codePoint)}, is {@code UPPERCASE_LETTER}, + * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * * The following are examples of uppercase characters: * <blockquote><pre> @@ -5320,7 +5325,8 @@ * @since 1.5 */ public static boolean isUpperCase(int codePoint) { - return getType(codePoint) == Character.UPPERCASE_LETTER; + return getType(codePoint) == Character.UPPERCASE_LETTER || + CharacterData.of(codePoint).isOtherUppercase(codePoint); } /** @@ -5725,6 +5731,52 @@ } /** + * Determines if the specified character (Unicode code point) is an alphabet. + * + * A character is considered to be alphabetic if its general category type, + * provided by {@link Character#getType(int) getType(codePoint)}, is any of + * the following: + * <ul> + * <li> <code>UPPERCASE_LETTER</code> + * <li> <code>LOWERCASE_LETTER</code> + * <li> <code>TITLECASE_LETTER</code> + * <li> <code>MODIFIER_LETTER</code> + * <li> <code>OTHER_LETTER</code> + * <li> <code>LETTER_NUMBER</code> + * </ul> + * or it has contributory property Other_Alphabetic as defined by the + * Unicode Standard. + * + * @param codePoint the character (Unicode code point) to be tested. + * @return <code>true</code> if the character is a Unicode alphabet + * character, <code>false</code> otherwise. + * @since 1.7 + */ + public static boolean isAlphabetic(int codePoint) { + return (((((1 << Character.UPPERCASE_LETTER) | + (1 << Character.LOWERCASE_LETTER) | + (1 << Character.TITLECASE_LETTER) | + (1 << Character.MODIFIER_LETTER) | + (1 << Character.OTHER_LETTER) | + (1 << Character.LETTER_NUMBER)) >> getType(codePoint)) & 1) != 0) || + CharacterData.of(codePoint).isOtherAlphabetic(codePoint); + } + + /** + * Determines if the specified character (Unicode code point) is a CJKV + * (Chinese, Japanese, Korean and Vietnamese) ideograph, as defined by + * the Unicode Standard. + * + * @param codePoint the character (Unicode code point) to be tested. + * @return <code>true</code> if the character is a Unicode ideograph + * character, <code>false</code> otherwise. + * @since 1.7 + */ + public static boolean isIdeographic(int codePoint) { + return CharacterData.of(codePoint).isIdeographic(codePoint); + } + + /** * Determines if the specified character is * permissible as the first character in a Java identifier. * @@ -6430,7 +6482,7 @@ /** * Determines if the specified character is a Unicode space character. * A character is considered to be a space character if and only if - * it is specified to be a space character by the Unicode standard. This + * it is specified to be a space character by the Unicode Standard. This * method returns true if the character's general category type is any of * the following: * <ul> @@ -6458,7 +6510,7 @@ * Determines if the specified character (Unicode code point) is a * Unicode space character. A character is considered to be a * space character if and only if it is specified to be a space - * character by the Unicode standard. This method returns true if + * character by the Unicode Standard. This method returns true if * the character's general category type is any of the following: * * <ul> @@ -6908,7 +6960,7 @@ * @since 1.4 */ static char[] toUpperCaseCharArray(int codePoint) { - // As of Unicode 4.0, 1:M uppercasings only happen in the BMP. + // As of Unicode 6.0, 1:M uppercasings only happen in the BMP. assert isBmpCodePoint(codePoint); return CharacterData.of(codePoint).toUpperCaseCharArray(codePoint); } @@ -6941,7 +6993,7 @@ * Note: if the specified character is not assigned a name by * the UnicodeData file (part of the Unicode Character * Database maintained by the Unicode Consortium), the returned - * name is the same as the result of expression + * name is the same as the result of expression. * * <blockquote>{@code * Character.UnicodeBlock.of(codePoint).toString().replace('_', ' ') diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/CharacterData.java --- a/jdk/src/share/classes/java/lang/CharacterData.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/CharacterData.java Sat May 14 11:52:15 2011 -0700 @@ -46,10 +46,27 @@ int toUpperCaseEx(int ch) { return toUpperCase(ch); } + char[] toUpperCaseCharArray(int ch) { return null; } + boolean isOtherLowercase(int ch) { + return false; + } + + boolean isOtherUppercase(int ch) { + return false; + } + + boolean isOtherAlphabetic(int ch) { + return false; + } + + boolean isIdeographic(int ch) { + return false; + } + // Character <= 0xff (basic latin) is handled by internal fast-path // to avoid initializing large tables. // Note: performance of this "fast-path" code may be sub-optimal diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Error.java --- a/jdk/src/share/classes/java/lang/Error.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Error.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2011, 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 @@ -79,7 +79,7 @@ * @param message the detail message (which is saved for later retrieval * by the {@link #getMessage()} method). * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A <tt>null</tt> value is + * {@link #getCause()} method). (A {@code null} value is * permitted, and indicates that the cause is nonexistent or * unknown.) * @since 1.4 @@ -90,13 +90,13 @@ /** * Constructs a new error with the specified cause and a detail - * message of <tt>(cause==null ? null : cause.toString())</tt> (which - * typically contains the class and detail message of <tt>cause</tt>). + * message of {@code (cause==null ? null : cause.toString())} (which + * typically contains the class and detail message of {@code cause}). * This constructor is useful for errors that are little more than * wrappers for other throwables. * * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A <tt>null</tt> value is + * {@link #getCause()} method). (A {@code null} value is * permitted, and indicates that the cause is nonexistent or * unknown.) * @since 1.4 @@ -104,4 +104,25 @@ public Error(Throwable cause) { super(cause); } + + /** + * Constructs a new error with the specified detail message, + * cause, suppression enabled or disabled, and writable stack + * trace enabled or disabled. + * + * @param message the detail message. + * @param cause the cause. (A {@code null} value is permitted, + * and indicates that the cause is nonexistent or unknown.) + * @param enableSuppression whether or not suppression is enabled + * or disabled + * @param writableStackTrace whether or not the stack trace should + * be writable + * + * @since 1.7 + */ + protected Error(String message, Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Exception.java --- a/jdk/src/share/classes/java/lang/Exception.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Exception.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2011, 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 @@ -101,4 +101,24 @@ public Exception(Throwable cause) { super(cause); } + + /** + * Constructs a new exception with the specified detail message, + * cause, suppression enabled or disabled, and writable stack + * trace enabled or disabled. + * + * @param message the detail message. + * @param cause the cause. (A {@code null} value is permitted, + * and indicates that the cause is nonexistent or unknown.) + * @param enableSuppression whether or not suppression is enabled + * or disabled + * @param writableStackTrace whether or not the stack trace should + * be writable + * @since 1.7 + */ + protected Exception(String message, Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/NullPointerException.java --- a/jdk/src/share/classes/java/lang/NullPointerException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/NullPointerException.java Sat May 14 11:52:15 2011 -0700 @@ -43,7 +43,8 @@ * * {@code NullPointerException} objects may be constructed by the * virtual machine as if {@linkplain Throwable#Throwable(String, - * Throwable, boolean) suppression were disabled}. + * Throwable, boolean, boolean) suppression were disabled and/or the + * stack trace was not writable}. * * @author unascribed * @since JDK1.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/OutOfMemoryError.java --- a/jdk/src/share/classes/java/lang/OutOfMemoryError.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/OutOfMemoryError.java Sat May 14 11:52:15 2011 -0700 @@ -32,7 +32,8 @@ * * {@code OutOfMemoryError} objects may be constructed by the virtual * machine as if {@linkplain Throwable#Throwable(String, Throwable, - * boolean) suppression were disabled}. + * boolean, boolean) suppression were disabled and/or the stack trace was not + * writable}. * * @author unascribed * @since JDK1.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/ProcessBuilder.java --- a/jdk/src/share/classes/java/lang/ProcessBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/ProcessBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -938,6 +938,11 @@ * but at the very least the command must be a non-empty list of * non-null strings. * + * A minimal set of system dependent environment variables may + * be required to start a process on some operating systems. + * As a result, the subprocess may inherit additional environment variable + * settings beyond those in the process builder's {@link #environment()}. + * * If there is a security manager, its * {@link SecurityManager#checkExec checkExec} * method is called with the first component of this object's diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Runtime.java --- a/jdk/src/share/classes/java/lang/Runtime.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Runtime.java Sat May 14 11:52:15 2011 -0700 @@ -544,6 +544,11 @@ * If <tt>envp</tt> is <tt>null</tt>, the subprocess inherits the * environment settings of the current process. * + * A minimal set of system dependent environment variables may + * be required to start a process on some operating systems. + * As a result, the subprocess may inherit additional environment variable + * settings beyond those in the specified environment. + * * {@link ProcessBuilder#start()} is now the preferred way to * start a process with a modified environment. * diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/RuntimeException.java --- a/jdk/src/share/classes/java/lang/RuntimeException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/RuntimeException.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,4 +95,25 @@ public RuntimeException(Throwable cause) { super(cause); } + + /** + * Constructs a new runtime exception with the specified detail + * message, cause, suppression enabled or disabled, and writable + * stack trace enabled or disabled. + * + * @param message the detail message. + * @param cause the cause. (A {@code null} value is permitted, + * and indicates that the cause is nonexistent or unknown.) + * @param enableSuppression whether or not suppression is enabled + * or disabled + * @param writableStackTrace whether or not the stack trace should + * be writable + * + * @since 1.7 + */ + protected RuntimeException(String message, Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/StringCoding.java --- a/jdk/src/share/classes/java/lang/StringCoding.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/StringCoding.java Sat May 14 11:52:15 2011 -0700 @@ -222,13 +222,13 @@ off = 0; } } + cd.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); if (cd instanceof ArrayDecoder) { int clen = ((ArrayDecoder)cd).decode(ba, off, len, ca); return safeTrim(ca, clen, cs, isTrusted); } else { - cd.onMalformedInput(CodingErrorAction.REPLACE) - .onUnmappableCharacter(CodingErrorAction.REPLACE) - .reset(); ByteBuffer bb = ByteBuffer.wrap(ba, off, len); CharBuffer cb = CharBuffer.wrap(ca); try { @@ -356,13 +356,13 @@ off = 0; } } + ce.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); if (ce instanceof ArrayEncoder) { int blen = ((ArrayEncoder)ce).encode(ca, off, len, ba); return safeTrim(ba, blen, cs, isTrusted); } else { - ce.onMalformedInput(CodingErrorAction.REPLACE) - .onUnmappableCharacter(CodingErrorAction.REPLACE) - .reset(); ByteBuffer bb = ByteBuffer.wrap(ba); CharBuffer cb = CharBuffer.wrap(ca, off, len); try { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Throwable.java --- a/jdk/src/share/classes/java/lang/Throwable.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Throwable.java Sat May 14 11:52:15 2011 -0700 @@ -129,16 +129,41 @@ */ private String detailMessage; + + /** + * Holder class to defer initializing sentinel objects only used + * for serialization. + */ + private static class SentinelHolder { + /** + * {@linkplain #setStackTrace(StackTraceElement[]) Setting the + * stack trace} to a one-element array containing this sentinel + * value indicates future attempts to set the stack trace will be + * ignored. The sentinal is equal to the result of calling: + * {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)} + */ + public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL = + new StackTraceElement("", "", null, Integer.MIN_VALUE); + + /** + * Sentinel value used in the serial form to indicate an immutable + * stack trace. + */ + public static final StackTraceElement[] STACK_TRACE_SENTINEL = + new StackTraceElement[] {STACK_TRACE_ELEMENT_SENTINEL}; + } + /** * A shared value for an empty stack. */ - private static final StackTraceElement[] EMPTY_STACK = new StackTraceElement[0]; + private static final StackTraceElement[] UNASSIGNED_STACK = new StackTraceElement[0]; /* * To allow Throwable objects to be made immutable and safely * reused by the JVM, such as OutOfMemoryErrors, fields of - * Throwable that are writable in response to user actions, cause - * and suppressedExceptions obey the following protocol: + * Throwable that are writable in response to user actions, cause, + * stackTrace, and suppressedExceptions obey the following + * protocol: * * 1) The fields are initialized to a non-null sentinel value * which indicates the value has logically not been set. @@ -174,10 +199,15 @@ /** * The stack trace, as returned by {@link #getStackTrace()}. * + * The field is initialized to a zero-length array. A {@code + * null} value of this field indicates subsequent calls to {@link + * #setStackTrace(StackTraceElement[])} and {@link + * #fillInStackTrace()} will be be no-ops. + * * @serial * @since 1.4 */ - private StackTraceElement[] stackTrace; + private StackTraceElement[] stackTrace = UNASSIGNED_STACK; // Setting this static field introduces an acceptable // initialization dependency on a few java.util classes. @@ -284,24 +314,36 @@ /** * Constructs a new throwable with the specified detail message, - * cause, and {@linkplain #addSuppressed suppression} enabled or - * disabled. If suppression is disabled, {@link #getSuppressed} - * for this object will return a zero-length array and calls to - * {@link #addSuppressed} that would otherwise append an exception - * to the suppressed list will have no effect. + * cause, {@linkplain #addSuppressed suppression} enabled or + * disabled, and writable stack trace enabled or disabled. If + * suppression is disabled, {@link #getSuppressed} for this object + * will return a zero-length array and calls to {@link + * #addSuppressed} that would otherwise append an exception to the + * suppressed list will have no effect. If the writable stack + * trace is false, this constructor will not call {@link + * #fillInStackTrace()}, a {@code null} will be written to the + * {@code stackTrace} field, and subsequent calls to {@code + * fillInStackTrace} and {@link + * #setStackTrace(StackTraceElement[])} will not set the stack + * trace. If the writable stack trace is false, {@link + * #getStackTrace} will return a zero length array. * * Note that the other constructors of {@code Throwable} treat - * suppression as being enabled. Subclasses of {@code Throwable} - * should document any conditions under which suppression is - * disabled. Disabling of suppression should only occur in - * exceptional circumstances where special requirements exist, - * such as a virtual machine reusing exception objects under - * low-memory situations. + * suppression as being enabled and the stack trace as being + * writable. Subclasses of {@code Throwable} should document any + * conditions under which suppression is disabled and document + * conditions under which the stack trace is not writable. + * Disabling of suppression should only occur in exceptional + * circumstances where special requirements exist, such as a + * virtual machine reusing exception objects under low-memory + * situations. * * @param message the detail message. * @param cause the cause. (A {@code null} value is permitted, * and indicates that the cause is nonexistent or unknown.) * @param enableSuppression whether or not suppression is enabled or disabled + * @param writableStackTrace whether or not the stack trace should be + * writable * * @see OutOfMemoryError * @see NullPointerException @@ -309,8 +351,13 @@ * @since 1.7 */ protected Throwable(String message, Throwable cause, - boolean enableSuppression) { - fillInStackTrace(); + boolean enableSuppression, + boolean writableStackTrace) { + if (writableStackTrace) { + fillInStackTrace(); + } else { + stackTrace = null; + } detailMessage = message; this.cause = cause; if (!enableSuppression) @@ -707,10 +754,22 @@ * {@code Throwable} object information about the current state of * the stack frames for the current thread. * + * If the stack trace of this {@code Throwable} {@linkplain + * Throwable#Throwable(String, Throwable, boolean, boolean) is not + * writable}, calling this method has no effect. + * * @return a reference to this {@code Throwable} instance. * @see java.lang.Throwable#printStackTrace() */ - public synchronized native Throwable fillInStackTrace(); + public synchronized Throwable fillInStackTrace() { + if (stackTrace != null) { + fillInStackTrace(0); + stackTrace = UNASSIGNED_STACK; + } + return this; + } + + private native Throwable fillInStackTrace(int dummy); /** * Provides programmatic access to the stack trace information printed by @@ -740,12 +799,15 @@ } private synchronized StackTraceElement[] getOurStackTrace() { - // Initialize stack trace if this is the first call to this method - if (stackTrace == null) { + // Initialize stack trace field with information from + // backtrace if this is the first call to this method + if (stackTrace == UNASSIGNED_STACK) { int depth = getStackTraceDepth(); stackTrace = new StackTraceElement[depth]; for (int i=0; i < depth; i++) stackTrace[i] = getStackTraceElement(i); + } else if (stackTrace == null) { + return UNASSIGNED_STACK; } return stackTrace; } @@ -761,6 +823,11 @@ * when a throwable is constructed or deserialized when a throwable is * read from a serialization stream. * + * If the stack trace of this {@code Throwable} {@linkplain + * Throwable#Throwable(String, Throwable, boolean, boolean) is not + * writable}, calling this method has no effect other than + * validating its argument. + * * @param stackTrace the stack trace elements to be associated with * this {@code Throwable}. The specified array is copied by this * call; changes in the specified array after the method invocation @@ -768,18 +835,22 @@ * trace. * * @throws NullPointerException if {@code stackTrace} is - * {@code null}, or if any of the elements of + * {@code null} or if any of the elements of * {@code stackTrace} are {@code null} * * @since 1.4 */ public void setStackTrace(StackTraceElement[] stackTrace) { + // Validate argument StackTraceElement[] defensiveCopy = stackTrace.clone(); - for (int i = 0; i < defensiveCopy.length; i++) + for (int i = 0; i < defensiveCopy.length; i++) { if (defensiveCopy[i] == null) throw new NullPointerException("stackTrace[" + i + "]"); + } synchronized (this) { + if (this.stackTrace == null) // Immutable stack + return; this.stackTrace = defensiveCopy; } } @@ -808,7 +879,11 @@ * well-formedness constraints on fields. Null entries and * self-pointers are not allowed in the list of {@code * suppressedExceptions}. Null entries are not allowed for stack - * trace elements. + * trace elements. A null stack trace in the serial form results + * in a zero-length stack element array. A single-element stack + * trace whose entry is equal to {@code new StackTraceElement("", + * "", null, Integer.MIN_VALUE)} results in a {@code null} {@code + * stackTrace} field. * * Note that there are no constraints on the value the {@code * cause} field can hold; both {@code null} and {@code this} are @@ -837,26 +912,60 @@ suppressedExceptions = suppressed; } // else a null suppressedExceptions field remains null + /* + * For zero-length stack traces, use a clone of + * UNASSIGNED_STACK rather than UNASSIGNED_STACK itself to + * allow identity comparison against UNASSIGNED_STACK in + * getOurStackTrace. The identity of UNASSIGNED_STACK in + * stackTrace indicates to the getOurStackTrace method that + * the stackTrace needs to be constructed from the information + * in backtrace. + */ if (stackTrace != null) { - for (StackTraceElement ste : stackTrace) { - if (ste == null) - throw new NullPointerException("null StackTraceElement in serial stream. "); + if (stackTrace.length == 0) { + stackTrace = UNASSIGNED_STACK.clone(); + } else if (stackTrace.length == 1 && + // Check for the marker of an immutable stack trace + SentinelHolder.STACK_TRACE_ELEMENT_SENTINEL.equals(stackTrace[0])) { + stackTrace = null; + } else { // Verify stack trace elements are non-null. + for(StackTraceElement ste : stackTrace) { + if (ste == null) + throw new NullPointerException("null StackTraceElement in serial stream. "); + } } } else { - // A null stackTrace field in the serial form can result from - // an exception serialized without that field in older JDK releases. - stackTrace = EMPTY_STACK; + // A null stackTrace field in the serial form can result + // from an exception serialized without that field in + // older JDK releases; treat such exceptions as having + // empty stack traces. + stackTrace = UNASSIGNED_STACK.clone(); } - } /** * Write a {@code Throwable} object to a stream. + * + * A {@code null} stack trace field is represented in the serial + * form as a one-element array whose element is equal to {@code + * new StackTraceElement("", "", null, Integer.MIN_VALUE)}. */ private synchronized void writeObject(ObjectOutputStream s) throws IOException { - getOurStackTrace(); // Ensure that stackTrace field is initialized. - s.defaultWriteObject(); + // Ensure that the stackTrace field is initialized to a + // non-null value, if appropriate. As of JDK 7, a null stack + // trace field is a valid value indicating the stack trace + // should not be set. + getOurStackTrace(); + + StackTraceElement[] oldStackTrace = stackTrace; + try { + if (stackTrace == null) + stackTrace = SentinelHolder.STACK_TRACE_SENTINEL; + s.defaultWriteObject(); + } finally { + stackTrace = oldStackTrace; + } } /** @@ -866,8 +975,8 @@ * try}-with-resources statement. * * The suppression behavior is enabled unless disabled - * {@linkplain #Throwable(String, Throwable, boolean) via a - * constructor}. When suppression is disabled, this method does + * {@linkplain #Throwable(String, Throwable, boolean, boolean) via + * a constructor}. When suppression is disabled, this method does * nothing other than to validate its argument. * * Note that when one exception {@linkplain @@ -933,8 +1042,8 @@ * statement, in order to deliver this exception. * * If no exceptions were suppressed or {@linkplain - * Throwable(String, Throwable, boolean) suppression is disabled}, - * an empty array is returned. + * #Throwable(String, Throwable, boolean, boolean) suppression is + * disabled}, an empty array is returned. * * @return an array containing all of the exceptions that were * suppressed to deliver this exception. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/HttpCookie.java --- a/jdk/src/share/classes/java/net/HttpCookie.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/net/HttpCookie.java Sat May 14 11:52:15 2011 -0700 @@ -34,6 +34,7 @@ import java.lang.NullPointerException; // for javadoc import java.util.Locale; +import java.util.Objects; /** * An HttpCookie object represents an http cookie, which carries state @@ -817,7 +818,7 @@ // 3. and have same path (case-sensitive). return equalsIgnoreCase(getName(), other.getName()) && equalsIgnoreCase(getDomain(), other.getDomain()) && - equals(getPath(), other.getPath()); + Objects.equals(getPath(), other.getPath()); } @@ -1162,14 +1163,6 @@ return false; } - private static boolean equals(String s, String t) { - if (s == t) return true; - if ((s != null) && (t != null)) { - return s.equals(t); - } - return false; - } - private static boolean startsWithIgnoreCase(String s, String start) { if (s == null || start == null) return false; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/InetAddress.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/Socket.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/SocketPermission.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/charset/Charset.java --- a/jdk/src/share/classes/java/nio/charset/Charset.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/nio/charset/Charset.java Sat May 14 11:52:15 2011 -0700 @@ -143,6 +143,8 @@ * * <h4>Standard charsets</h4> * + * <a name="standard"> + * * Every implementation of the Java platform is required to support the * following standard charsets. Consult the release documentation for your * implementation to see if any other charsets are supported. The behavior @@ -213,6 +215,8 @@ * determined during virtual-machine startup and typically depends upon the * locale and charset being used by the underlying operating system. * + * The {@link StandardCharset} class defines constants for each of the + * standard charsets. * * <h4>Terminology</h4> * diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/charset/StandardCharset.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/java/nio/charset/StandardCharset.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.nio.charset; + +/** + * Constant definitions for the standard {@link Charset Charsets}. These + * charsets are guaranteed to be available on every implementation of the Java + * platform. + * + * @see <a href="Charset#standard">Standard Charsets</a> + * @since 1.7 + */ +public final class StandardCharset { + + private StandardCharset() { + throw new AssertionError("No java.nio.charset.StandardCharset instances for you!"); + } + /** + * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the + * Unicode character set + */ + public static final Charset US_ASCII = Charset.forName("US-ASCII"); + /** + * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1 + */ + public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1"); + /** + * Eight-bit UCS Transformation Format + */ + public static final Charset UTF_8 = Charset.forName("UTF-8"); + /** + * Sixteen-bit UCS Transformation Format, big-endian byte order + */ + public static final Charset UTF_16BE = Charset.forName("UTF-16BE"); + /** + * Sixteen-bit UCS Transformation Format, little-endian byte order + */ + public static final Charset UTF_16LE = Charset.forName("UTF-16LE"); + /** + * Sixteen-bit UCS Transformation Format, byte order identified by an + * optional byte-order mark + */ + public static final Charset UTF_16 = Charset.forName("UTF-16"); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/file/FileSystem.java --- a/jdk/src/share/classes/java/nio/file/FileSystem.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/nio/file/FileSystem.java Sat May 14 11:52:15 2011 -0700 @@ -391,6 +391,13 @@ * character is used to separate the subpatterns. Groups cannot be nested. * </li> * + * <li> Leading period<tt>/</tt>dot characters in file name are + * treated as regular characters in match operations. For example, + * the {@code "*"} glob pattern matches file name {@code ".login"}. + * The {@link Files#isHidden} method may be used to test whether a file + * is considered hidden. + * </li> + * * <li> All other characters match themselves in an implementation * dependent manner. This includes characters representing any {@link * FileSystem#getSeparator name-separators}. </li> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/file/Path.java --- a/jdk/src/share/classes/java/nio/file/Path.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/nio/file/Path.java Sat May 14 11:52:15 2011 -0700 @@ -72,7 +72,7 @@ * directory and is UTF-8 encoded. * <pre> * Path path = FileSystems.getDefault().getPath("logs", "access.log"); - * BufferReader reader = Files.newBufferedReader(path, Charset.forName("UTF-8")); + * BufferReader reader = Files.newBufferedReader(path, StandardCharset.UTF_8); * </pre> * * <a name="interop"><h4>Interoperability</h4></a> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/security/spec/EllipticCurve.java --- a/jdk/src/share/classes/java/security/spec/EllipticCurve.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/security/spec/EllipticCurve.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -165,8 +165,7 @@ * specified object. * @param obj the object to be compared. * @return true if <code>obj</code> is an instance of - * EllipticCurve and the field, A, B, and seeding bytes - * match, false otherwise. + * EllipticCurve and the field, A, and B match, false otherwise. */ public boolean equals(Object obj) { if (this == obj) return true; @@ -174,9 +173,8 @@ EllipticCurve curve = (EllipticCurve) obj; if ((field.equals(curve.field)) && (a.equals(curve.a)) && - (b.equals(curve.b)) && - (Arrays.equals(seed, curve.seed))) { - return true; + (b.equals(curve.b))) { + return true; } } return false; @@ -184,12 +182,15 @@ /** * Returns a hash code value for this elliptic curve. - * @return a hash code value. + * @return a hash code value computed from the hash codes of the field, A, + * and B, as follows: + * <code> + * (field.hashCode() << 6) + (a.hashCode() << 4) + (b.hashCode() << 2) + * </code> */ public int hashCode() { return (field.hashCode() << 6 + (a.hashCode() << 4) + - (b.hashCode() << 2) + - (seed==null? 0:seed.length)); + (b.hashCode() << 2)); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/sql/BatchUpdateException.java --- a/jdk/src/share/classes/java/sql/BatchUpdateException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/sql/BatchUpdateException.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -25,6 +25,8 @@ package java.sql; +import java.util.Arrays; + /** * The subclass of {@link SQLException} thrown when an error * occurs during a batch update operation. In addition to the @@ -77,8 +79,7 @@ */ public BatchUpdateException( String reason, String SQLState, int vendorCode, int[] updateCounts ) { - super(reason, SQLState, vendorCode); - this.updateCounts = updateCounts; + this(reason, SQLState, vendorCode, updateCounts, null); } /** @@ -105,8 +106,7 @@ */ public BatchUpdateException(String reason, String SQLState, int[] updateCounts) { - super(reason, SQLState); - this.updateCounts = updateCounts; + this(reason, SQLState, 0, updateCounts, null); } /** @@ -132,8 +132,7 @@ * @since 1.2 */ public BatchUpdateException(String reason, int[] updateCounts) { - super(reason); - this.updateCounts = updateCounts; + this(reason, null, 0, updateCounts, null); } /** @@ -156,8 +155,7 @@ * @since 1.2 */ public BatchUpdateException(int[] updateCounts) { - super(); - this.updateCounts = updateCounts; + this(null, null, 0, updateCounts, null); } /** @@ -172,8 +170,7 @@ * @since 1.2 */ public BatchUpdateException() { - super(); - this.updateCounts = null; + this(null, null, 0, null, null); } /** @@ -191,8 +188,7 @@ * @since 1.6 */ public BatchUpdateException(Throwable cause) { - super(cause); - this.updateCounts = null; + this(null, null, 0, null, cause); } /** @@ -218,8 +214,7 @@ * @since 1.6 */ public BatchUpdateException(int []updateCounts , Throwable cause) { - super(cause); - this.updateCounts = updateCounts; + this(null, null, 0, updateCounts, cause); } /** @@ -243,8 +238,7 @@ * @since 1.6 */ public BatchUpdateException(String reason, int []updateCounts, Throwable cause) { - super(reason,cause); - this.updateCounts = updateCounts; + this(reason, null, 0, updateCounts, cause); } /** @@ -269,8 +263,7 @@ */ public BatchUpdateException(String reason, String SQLState, int []updateCounts, Throwable cause) { - super(reason,SQLState,cause); - this.updateCounts = updateCounts; + this(reason, SQLState, 0, updateCounts, cause); } /** @@ -297,8 +290,8 @@ */ public BatchUpdateException(String reason, String SQLState, int vendorCode, int []updateCounts,Throwable cause) { - super(reason,SQLState,vendorCode,cause); - this.updateCounts = updateCounts; + super(reason, SQLState, vendorCode, cause); + this.updateCounts = (updateCounts == null) ? null : Arrays.copyOf(updateCounts, updateCounts.length); } /** @@ -332,7 +325,7 @@ * @since 1.3 */ public int[] getUpdateCounts() { - return updateCounts; + return (updateCounts == null) ? null : Arrays.copyOf(updateCounts, updateCounts.length); } /** @@ -340,7 +333,7 @@ * @serial * @since 1.2 */ - private int[] updateCounts; + private final int[] updateCounts; private static final long serialVersionUID = 5977529877145521757L; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/AbstractSet.java --- a/jdk/src/share/classes/java/util/AbstractSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/AbstractSet.java Sat May 14 11:52:15 2011 -0700 @@ -156,9 +156,11 @@ * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation * is not supported by this set * @throws ClassCastException if the class of an element of this set - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this set contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/ArrayList.java --- a/jdk/src/share/classes/java/util/ArrayList.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/ArrayList.java Sat May 14 11:52:15 2011 -0700 @@ -628,9 +628,11 @@ * @param c collection containing elements to be removed from this list * @return {@code true} if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see Collection#contains(Object) */ @@ -646,9 +648,11 @@ * @param c collection containing elements to be retained in this list * @return {@code true} if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see Collection#contains(Object) */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Collection.java --- a/jdk/src/share/classes/java/util/Collection.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Collection.java Sat May 14 11:52:15 2011 -0700 @@ -60,7 +60,8 @@ * but is not required to, throw the exception if the collection to be added * is empty. * - * Some collection implementations have restrictions on the elements that + * <a name="optional-restrictions"/> + * Some collection implementations have restrictions on the elements that * they may contain. For example, some implementations prohibit null elements, * and some have restrictions on the types of their elements. Attempting to * add an ineligible element throws an unchecked exception, typically @@ -152,9 +153,11 @@ * @return <tt>true</tt> if this collection contains the specified * element * @throws ClassCastException if the type of the specified element - * is incompatible with this collection (optional) + * is incompatible with this collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * collection does not permit null elements (optional) + * collection does not permit null elements + * (<a href="#optional-restrictions">optional</a>) */ boolean contains(Object o); @@ -279,9 +282,11 @@ * @param o element to be removed from this collection, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the type of the specified element - * is incompatible with this collection (optional) + * is incompatible with this collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * collection does not permit null elements (optional) + * collection does not permit null elements + * (<a href="#optional-restrictions">optional</a>) * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this collection */ @@ -299,10 +304,13 @@ * in the specified collection * @throws ClassCastException if the types of one or more elements * in the specified collection are incompatible with this - * collection (optional) + * collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if the specified collection contains one * or more null elements and this collection does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="#optional-restrictions">optional</a>), + * or if the specified collection is null. * @see #contains(Object) */ boolean containsAll(Collection<?> c); @@ -346,10 +354,13 @@ * is not supported by this collection * @throws ClassCastException if the types of one or more elements * in this collection are incompatible with the specified - * collection (optional) + * collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if this collection contains one or more * null elements and the specified collection does not support - * null elements (optional), or if the specified collection is null + * null elements + * (<a href="#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) */ @@ -367,10 +378,13 @@ * is not supported by this collection * @throws ClassCastException if the types of one or more elements * in this collection are incompatible with the specified - * collection (optional) + * collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if this collection contains one or more * null elements and the specified collection does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Collections.java --- a/jdk/src/share/classes/java/util/Collections.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Collections.java Sat May 14 11:52:15 2011 -0700 @@ -3746,9 +3746,10 @@ * @throws NullPointerException if either collection is {@code null}. * @throws NullPointerException if one collection contains a {@code null} * element and {@code null} is not an eligible element for the other collection. - * (optional) + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws ClassCastException if one collection contains an element that is - * of a type which is ineligible for the other collection. (optional) + * of a type which is ineligible for the other collection. + * (<a href="Collection.html#optional-restrictions">optional</a>) * @since 1.5 */ public static boolean disjoint(Collection<?> c1, Collection<?> c2) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Deque.java --- a/jdk/src/share/classes/java/util/Deque.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Deque.java Sat May 14 11:52:15 2011 -0700 @@ -351,9 +351,11 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean removeFirstOccurrence(Object o); @@ -369,9 +371,11 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean removeLastOccurrence(Object o); @@ -527,9 +531,11 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object o); @@ -542,9 +548,11 @@ * @param o element whose presence in this deque is to be tested * @return <tt>true</tt> if this deque contains the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean contains(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/List.java --- a/jdk/src/share/classes/java/util/List.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/List.java Sat May 14 11:52:15 2011 -0700 @@ -134,9 +134,11 @@ * @param o element whose presence in this list is to be tested * @return <tt>true</tt> if this list contains the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean contains(Object o); @@ -245,9 +247,11 @@ * @param o element to be removed from this list, if present * @return <tt>true</tt> if this list contained the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this list */ @@ -265,10 +269,13 @@ * specified collection * @throws ClassCastException if the types of one or more elements * in the specified collection are incompatible with this - * list (optional) + * list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified collection contains one * or more null elements and this list does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #contains(Object) */ boolean containsAll(Collection<?> c); @@ -334,9 +341,11 @@ * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation * is not supported by this list * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) @@ -354,9 +363,11 @@ * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation * is not supported by this list * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) @@ -493,9 +504,11 @@ * @return the index of the first occurrence of the specified element in * this list, or -1 if this list does not contain the element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ int indexOf(Object o); @@ -510,9 +523,11 @@ * @return the index of the last occurrence of the specified element in * this list, or -1 if this list does not contain the element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ int lastIndexOf(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/ListIterator.java --- a/jdk/src/share/classes/java/util/ListIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/ListIterator.java Sat May 14 11:52:15 2011 -0700 @@ -173,9 +173,9 @@ /** * Inserts the specified element into the list (optional operation). - * The element is inserted immediately before the next element that - * would be returned by {@link #next}, if any, and after the next - * element that would be returned by {@link #previous}, if any. (If the + * The element is inserted immediately before the element that + * would be returned by {@link #next}, if any, and after the element + * that would be returned by {@link #previous}, if any. (If the * list contains no elements, the new element becomes the sole element * on the list.) The new element is inserted before the implicit * cursor: a subsequent call to {@code next} would be unaffected, and a diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Map.java --- a/jdk/src/share/classes/java/util/Map.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Map.java Sat May 14 11:52:15 2011 -0700 @@ -144,9 +144,11 @@ * @return <tt>true</tt> if this map contains a mapping for the specified * key * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key is null and this map - * does not permit null keys (optional) + * does not permit null keys + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean containsKey(Object key); @@ -162,9 +164,11 @@ * @return <tt>true</tt> if this map maps one or more keys to the * specified value * @throws ClassCastException if the value is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified value is null and this - * map does not permit null values (optional) + * map does not permit null values + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean containsValue(Object value); @@ -187,9 +191,11 @@ * @return the value to which the specified key is mapped, or * {@code null} if this map contains no mapping for the key * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key is null and this map - * does not permit null keys (optional) + * does not permit null keys + * (<a href="Collection.html#optional-restrictions">optional</a>) */ V get(Object key); @@ -245,9 +251,11 @@ * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this map * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key is null and this - * map does not permit null keys (optional) + * map does not permit null keys + * (<a href="Collection.html#optional-restrictions">optional</a>) */ V remove(Object key); @@ -466,4 +474,5 @@ * @see #equals(Object) */ int hashCode(); + } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Set.java --- a/jdk/src/share/classes/java/util/Set.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Set.java Sat May 14 11:52:15 2011 -0700 @@ -110,9 +110,11 @@ * @param o element whose presence in this set is to be tested * @return <tt>true</tt> if this set contains the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this set (optional) + * is incompatible with this set + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * set does not permit null elements (optional) + * set does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean contains(Object o); @@ -236,9 +238,11 @@ * @param o object to be removed from this set, if present * @return <tt>true</tt> if this set contained the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this set (optional) + * is incompatible with this set + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * set does not permit null elements (optional) + * set does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this set */ @@ -257,10 +261,13 @@ * specified collection * @throws ClassCastException if the types of one or more elements * in the specified collection are incompatible with this - * set (optional) + * set + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified collection contains one * or more null elements and this set does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #contains(Object) */ boolean containsAll(Collection<?> c); @@ -302,9 +309,11 @@ * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation * is not supported by this set * @throws ClassCastException if the class of an element of this set - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this set contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) */ @@ -322,9 +331,11 @@ * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation * is not supported by this set * @throws ClassCastException if the class of an element of this set - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this set contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Vector.java --- a/jdk/src/share/classes/java/util/Vector.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Vector.java Sat May 14 11:52:15 2011 -0700 @@ -893,10 +893,13 @@ * @return true if this Vector changed as a result of the call * @throws ClassCastException if the types of one or more elements * in this vector are incompatible with the specified - * collection (optional) + * collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this vector contains one or more null * elements and the specified collection does not support null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @since 1.2 */ public synchronized boolean removeAll(Collection<?> c) { @@ -913,10 +916,13 @@ * @return true if this Vector changed as a result of the call * @throws ClassCastException if the types of one or more elements * in this vector are incompatible with the specified - * collection (optional) + * collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this vector contains one or more null * elements and the specified collection does not support null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @since 1.2 */ public synchronized boolean retainAll(Collection<?> c) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/BlockingDeque.java --- a/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java Sat May 14 11:52:15 2011 -0700 @@ -400,8 +400,10 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean removeFirstOccurrence(Object o); @@ -416,8 +418,10 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean removeLastOccurrence(Object o); @@ -591,8 +595,10 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if this deque changed as a result of the call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object o); @@ -604,8 +610,10 @@ * @param o object to be checked for containment in this deque * @return <tt>true</tt> if this deque contains the specified element * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ public boolean contains(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/BlockingQueue.java --- a/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java Sat May 14 11:52:15 2011 -0700 @@ -303,8 +303,10 @@ * @param o element to be removed from this queue, if present * @return <tt>true</tt> if this queue changed as a result of the call * @throws ClassCastException if the class of the specified element - * is incompatible with this queue (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this queue + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object o); @@ -316,8 +318,10 @@ * @param o object to be checked for containment in this queue * @return <tt>true</tt> if this queue contains the specified element * @throws ClassCastException if the class of the specified element - * is incompatible with this queue (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this queue + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ public boolean contains(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java Sat May 14 11:52:15 2011 -0700 @@ -239,7 +239,8 @@ /** * Gets the ith element of given table (if nonnull) with volatile - * read semantics. + * read semantics. Note: This is manually integrated into a few + * performance-sensitive methods to reduce call overhead. */ @SuppressWarnings("unchecked") static final <K,V> HashEntry<K,V> entryAt(HashEntry<K,V>[] tab, int i) { @@ -389,8 +390,7 @@ else node = new HashEntry<K,V>(hash, key, value, first); int c = count + 1; - if (c > threshold && first != null && - tab.length < MAXIMUM_CAPACITY) + if (c > threshold && tab.length < MAXIMUM_CAPACITY) rehash(node); else setEntryAt(tab, index, node); @@ -647,7 +647,11 @@ /** * Gets the jth element of given segment array (if nonnull) with - * volatile element access semantics via Unsafe. + * volatile element access semantics via Unsafe. (The null check + * can trigger harmlessly only during deserialization.) Note: + * because each element of segments array is set only once (using + * fully ordered writes), some performance-sensitive methods rely + * on this method only as a recheck upon null reads. */ @SuppressWarnings("unchecked") static final <K,V> Segment<K,V> segmentAt(Segment<K,V>[] ss, int j) { @@ -913,12 +917,19 @@ * @throws NullPointerException if the specified key is null */ public V get(Object key) { - int hash = hash(key.hashCode()); - for (HashEntry<K,V> e = entryForHash(segmentForHash(hash), hash); - e != null; e = e.next) { - K k; - if ((k = e.key) == key || (e.hash == hash && key.equals(k))) - return e.value; + Segment<K,V> s; // manually integrate access methods to reduce overhead + HashEntry<K,V>[] tab; + int h = hash(key.hashCode()); + long u = (((h >>> segmentShift) & segmentMask) << SSHIFT) + SBASE; + if ((s = (Segment<K,V>)UNSAFE.getObjectVolatile(segments, u)) != null && + (tab = s.table) != null) { + for (HashEntry<K,V> e = (HashEntry<K,V>) UNSAFE.getObjectVolatile + (tab, ((long)(((tab.length - 1) & h)) << TSHIFT) + TBASE); + e != null; e = e.next) { + K k; + if ((k = e.key) == key || (e.hash == h && key.equals(k))) + return e.value; + } } return null; } @@ -932,13 +943,21 @@ * <tt>equals</tt> method; <tt>false</tt> otherwise. * @throws NullPointerException if the specified key is null */ + @SuppressWarnings("unchecked") public boolean containsKey(Object key) { - int hash = hash(key.hashCode()); - for (HashEntry<K,V> e = entryForHash(segmentForHash(hash), hash); - e != null; e = e.next) { - K k; - if ((k = e.key) == key || (e.hash == hash && key.equals(k))) - return true; + Segment<K,V> s; // same as get() except no need for volatile value read + HashEntry<K,V>[] tab; + int h = hash(key.hashCode()); + long u = (((h >>> segmentShift) & segmentMask) << SSHIFT) + SBASE; + if ((s = (Segment<K,V>)UNSAFE.getObjectVolatile(segments, u)) != null && + (tab = s.table) != null) { + for (HashEntry<K,V> e = (HashEntry<K,V>) UNSAFE.getObjectVolatile + (tab, ((long)(((tab.length - 1) & h)) << TSHIFT) + TBASE); + e != null; e = e.next) { + K k; + if ((k = e.key) == key || (e.hash == h && key.equals(k))) + return true; + } } return false; } @@ -1032,13 +1051,15 @@ * <tt>null</tt> if there was no mapping for <tt>key</tt> * @throws NullPointerException if the specified key or value is null */ + @SuppressWarnings("unchecked") public V put(K key, V value) { + Segment<K,V> s; if (value == null) throw new NullPointerException(); int hash = hash(key.hashCode()); int j = (hash >>> segmentShift) & segmentMask; - Segment<K,V> s = segmentAt(segments, j); - if (s == null) + if ((s = (Segment<K,V>)UNSAFE.getObject // nonvolatile; recheck + (segments, (j << SSHIFT) + SBASE)) == null) // in ensureSegment s = ensureSegment(j); return s.put(key, hash, value, false); } @@ -1050,13 +1071,15 @@ * or <tt>null</tt> if there was no mapping for the key * @throws NullPointerException if the specified key or value is null */ + @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) { + Segment<K,V> s; if (value == null) throw new NullPointerException(); int hash = hash(key.hashCode()); int j = (hash >>> segmentShift) & segmentMask; - Segment<K,V> s = segmentAt(segments, j); - if (s == null) + if ((s = (Segment<K,V>)UNSAFE.getObject + (segments, (j << SSHIFT) + SBASE)) == null) s = ensureSegment(j); return s.put(key, hash, value, true); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Sat May 14 11:52:15 2011 -0700 @@ -59,10 +59,17 @@ * ConcurrentModificationException}, and may proceed concurrently with * other operations. * - * Beware that, unlike in most collections, the {@code size} - * method is NOT a constant-time operation. Because of the + * Beware that, unlike in most collections, the {@code size} method + * is NOT a constant-time operation. Because of the * asynchronous nature of these deques, determining the current number - * of elements requires a traversal of the elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations {@code addAll}, + * {@code removeAll}, {@code retainAll}, {@code containsAll}, + * {@code equals}, and {@code toArray} are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an {@code addAll} operation might view only some + * of the added elements. * * This class and its iterator implement all of the optional * methods of the {@link Deque} and {@link Iterator} interfaces. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Sat May 14 11:52:15 2011 -0700 @@ -72,7 +72,14 @@ * Beware that, unlike in most collections, the {@code size} method * is NOT a constant-time operation. Because of the * asynchronous nature of these queues, determining the current number - * of elements requires a traversal of the elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations {@code addAll}, + * {@code removeAll}, {@code retainAll}, {@code containsAll}, + * {@code equals}, and {@code toArray} are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an {@code addAll} operation might view only some + * of the added elements. * * This class and its iterator implement all of the optional * methods of the {@link Queue} and {@link Iterator} interfaces. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java Sat May 14 11:52:15 2011 -0700 @@ -103,9 +103,11 @@ * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this map * @throws ClassCastException if the key or value is of an inappropriate - * type for this map (optional) + * type for this map + * (<a href="../Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key or value is null, - * and this map does not permit null keys or values (optional) + * and this map does not permit null keys or values + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object key, Object value); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Sat May 14 11:52:15 2011 -0700 @@ -66,12 +66,13 @@ * Beware that, unlike in most collections, the <tt>size</tt> * method is not a constant-time operation. Because of the * asynchronous nature of these maps, determining the current number - * of elements requires a traversal of the elements. Additionally, - * the bulk operations <tt>putAll</tt>, <tt>equals</tt>, and - * <tt>clear</tt> are not guaranteed to be performed - * atomically. For example, an iterator operating concurrently with a - * <tt>putAll</tt> operation might view only some of the added - * elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations <tt>putAll</tt>, <tt>equals</tt>, + * <tt>toArray</tt>, <tt>containsValue</tt>, and <tt>clear</tt> are + * not guaranteed to be performed atomically. For example, an + * iterator operating concurrently with a <tt>putAll</tt> operation + * might view only some of the added elements. * * This class and its views and iterators implement all of the * optional methods of the {@link Map} and {@link Iterator} @@ -1661,7 +1662,9 @@ /** * Returns <tt>true</tt> if this map maps one or more keys to the * specified value. This operation requires time linear in the - * map size. + * map size. Additionally, it is possible for the map to change + * during execution of this method, in which case the returned + * result may be inaccurate. * * @param value value whose presence in this map is to be tested * @return <tt>true</tt> if a mapping to <tt>value</tt> exists; @@ -1751,7 +1754,7 @@ * * @return a navigable set view of the keys in this map */ - public NavigableSet<K> keySet() { + public NavigableSet<K> keySet() { KeySet ks = keySet; return (ks != null) ? ks : (keySet = new KeySet(this)); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Sat May 14 11:52:15 2011 -0700 @@ -58,12 +58,14 @@ * Beware that, unlike in most collections, the <tt>size</tt> * method is not a constant-time operation. Because of the * asynchronous nature of these sets, determining the current number - * of elements requires a traversal of the elements. Additionally, the - * bulk operations <tt>addAll</tt>, <tt>removeAll</tt>, - * <tt>retainAll</tt>, and <tt>containsAll</tt> are not - * guaranteed to be performed atomically. For example, an iterator - * operating concurrently with an <tt>addAll</tt> operation might view - * only some of the added elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations <tt>addAll</tt>, + * <tt>removeAll</tt>, <tt>retainAll</tt>, <tt>containsAll</tt>, + * <tt>equals</tt>, and <tt>toArray</tt> are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an <tt>addAll</tt> operation might view only some + * of the added elements. * * This class and its iterators implement all of the * optional methods of the {@link Set} and {@link Iterator} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java --- a/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Sat May 14 11:52:15 2011 -0700 @@ -631,9 +631,11 @@ * @param c collection containing elements to be removed from this list * @return <tt>true</tt> if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="../Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="../Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) */ @@ -671,9 +673,11 @@ * @param c collection containing elements to be retained in this list * @return <tt>true</tt> if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="../Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="../Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java --- a/jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java Sat May 14 11:52:15 2011 -0700 @@ -51,10 +51,17 @@ * producer. The tail of the queue is that element that has * been on the queue the shortest time for some producer. * - * Beware that, unlike in most collections, the {@code size} - * method is NOT a constant-time operation. Because of the + * Beware that, unlike in most collections, the {@code size} method + * is NOT a constant-time operation. Because of the * asynchronous nature of these queues, determining the current number - * of elements requires a traversal of the elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations {@code addAll}, + * {@code removeAll}, {@code retainAll}, {@code containsAll}, + * {@code equals}, and {@code toArray} are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an {@code addAll} operation might view only some + * of the added elements. * * This class and its iterator implement all of the * optional methods of the {@link Collection} and {@link diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/jar/JarFile.java --- a/jdk/src/share/classes/java/util/jar/JarFile.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/jar/JarFile.java Sat May 14 11:52:15 2011 -0700 @@ -37,7 +37,6 @@ import sun.security.action.GetPropertyAction; import sun.security.util.ManifestEntryVerifier; import sun.misc.SharedSecrets; -import sun.security.util.SignatureFileVerifier; /** * The <code>JarFile</code> class is used to read the contents of a jar file @@ -179,7 +178,7 @@ byte[] b = getBytes(manEntry); man = new Manifest(new ByteArrayInputStream(b)); if (!jvInitialized) { - jv = new JarVerifier(b, man); + jv = new JarVerifier(b); } } else { man = new Manifest(super.getInputStream(manEntry)); @@ -298,7 +297,10 @@ if (names != null) { for (int i = 0; i < names.length; i++) { String name = names[i].toUpperCase(Locale.ENGLISH); - if (SignatureFileVerifier.isBlockOrSF(name)) { + if (name.endsWith(".DSA") || + name.endsWith(".RSA") || + name.endsWith(".EC") || + name.endsWith(".SF")) { // Assume since we found a signature-related file // that the jar is signed and that we therefore // need a JarVerifier and Manifest @@ -327,17 +329,17 @@ if (names != null) { for (int i = 0; i < names.length; i++) { JarEntry e = getJarEntry(names[i]); - if (!e.isDirectory() && - SignatureFileVerifier.isBlock(names[i])) { + if (!e.isDirectory()) { if (mev == null) { mev = new ManifestEntryVerifier (getManifestFromReference()); } - String key = names[i].substring( - 0, names[i].lastIndexOf(".")); - jv.verifyBlock(names[i], - getBytes(e), - super.getInputStream(getJarEntry(key + ".SF"))); + byte[] b = getBytes(e); + if (b != null && b.length > 0) { + jv.beginEntry(e, mev); + jv.update(b.length, b, 0, b.length, mev); + jv.update(-1, null, 0, 0, mev); + } } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/jar/JarInputStream.java --- a/jdk/src/share/classes/java/util/jar/JarInputStream.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/jar/JarInputStream.java Sat May 14 11:52:15 2011 -0700 @@ -95,7 +95,7 @@ man.read(new ByteArrayInputStream(bytes)); closeEntry(); if (doVerify) { - jv = new JarVerifier(bytes, man); + jv = new JarVerifier(bytes); mev = new ManifestEntryVerifier(man); } return (JarEntry)super.getNextEntry(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/jar/JarVerifier.java --- a/jdk/src/share/classes/java/util/jar/JarVerifier.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/jar/JarVerifier.java Sat May 14 11:52:15 2011 -0700 @@ -48,18 +48,35 @@ /* a table mapping names to code signers, for jar entries that have had their actual hashes verified */ - private Map verifiedSigners; + private Hashtable verifiedSigners; /* a table mapping names to code signers, for jar entries that have passed the .SF/.DSA/.EC -> MANIFEST check */ - private Map sigFileSigners; + private Hashtable sigFileSigners; + + /* a hash table to hold .SF bytes */ + private Hashtable sigFileData; + + /** "queue" of pending PKCS7 blocks that we couldn't parse + * until we parsed the .SF file */ + private ArrayList pendingBlocks; /* cache of CodeSigner objects */ private ArrayList signerCache; + /* Are we parsing a block? */ + private boolean parsingBlockOrSF = false; + + /* Are we done parsing META-INF entries? */ + private boolean parsingMeta = true; + /* Are there are files to verify? */ private boolean anyToVerify = true; + /* The output stream to use when keeping track of files we are interested + in */ + private ByteArrayOutputStream baos; + /** The ManifestDigester object */ private volatile ManifestDigester manDig; @@ -75,20 +92,20 @@ /** collect -DIGEST-MANIFEST values for blacklist */ private List manifestDigests; - /** The manifest object */ - Manifest man = null; - - public JarVerifier(byte rawBytes[], Manifest man) { - this.man = man; + public JarVerifier(byte rawBytes[]) { manifestRawBytes = rawBytes; - sigFileSigners = new HashMap(); - verifiedSigners = new HashMap(); + sigFileSigners = new Hashtable(); + verifiedSigners = new Hashtable(); + sigFileData = new Hashtable(11); + pendingBlocks = new ArrayList(); + baos = new ByteArrayOutputStream(); manifestDigests = new ArrayList(); } /** - * This method scans to see which entry we're parsing and keeps - * various state information depending on the file being parsed. + * This method scans to see which entry we're parsing and + * keeps various state information depending on what type of + * file is being parsed. */ public void beginEntry(JarEntry je, ManifestEntryVerifier mev) throws IOException @@ -112,6 +129,30 @@ * b. digest mismatch between the actual jar entry and the manifest */ + if (parsingMeta) { + String uname = name.toUpperCase(Locale.ENGLISH); + if ((uname.startsWith("META-INF/") || + uname.startsWith("/META-INF/"))) { + + if (je.isDirectory()) { + mev.setEntry(null, je); + return; + } + + if (SignatureFileVerifier.isBlockOrSF(uname)) { + /* We parse only DSA, RSA or EC PKCS7 blocks. */ + parsingBlockOrSF = true; + baos.reset(); + mev.setEntry(null, je); + } + return; + } + } + + if (parsingMeta) { + doneWithMeta(); + } + if (je.isDirectory()) { mev.setEntry(null, je); return; @@ -147,7 +188,11 @@ throws IOException { if (b != -1) { - mev.update((byte)b); + if (parsingBlockOrSF) { + baos.write(b); + } else { + mev.update((byte)b); + } } else { processEntry(mev); } @@ -162,7 +207,11 @@ throws IOException { if (n != -1) { - mev.update(b, off, n); + if (parsingBlockOrSF) { + baos.write(b, off, n); + } else { + mev.update(b, off, n); + } } else { processEntry(mev); } @@ -174,10 +223,101 @@ private void processEntry(ManifestEntryVerifier mev) throws IOException { - JarEntry je = mev.getEntry(); - if ((je != null) && (je.signers == null)) { - je.signers = mev.verify(verifiedSigners, sigFileSigners); - je.certs = mapSignersToCertArray(je.signers); + if (!parsingBlockOrSF) { + JarEntry je = mev.getEntry(); + if ((je != null) && (je.signers == null)) { + je.signers = mev.verify(verifiedSigners, sigFileSigners); + je.certs = mapSignersToCertArray(je.signers); + } + } else { + + try { + parsingBlockOrSF = false; + + if (debug != null) { + debug.println("processEntry: processing block"); + } + + String uname = mev.getEntry().getName() + .toUpperCase(Locale.ENGLISH); + + if (uname.endsWith(".SF")) { + String key = uname.substring(0, uname.length()-3); + byte bytes[] = baos.toByteArray(); + // add to sigFileData in case future blocks need it + sigFileData.put(key, bytes); + // check pending blocks, we can now process + // anyone waiting for this .SF file + Iterator it = pendingBlocks.iterator(); + while (it.hasNext()) { + SignatureFileVerifier sfv = + (SignatureFileVerifier) it.next(); + if (sfv.needSignatureFile(key)) { + if (debug != null) { + debug.println( + "processEntry: processing pending block"); + } + + sfv.setSignatureFile(bytes); + sfv.process(sigFileSigners, manifestDigests); + } + } + return; + } + + // now we are parsing a signature block file + + String key = uname.substring(0, uname.lastIndexOf(".")); + + if (signerCache == null) + signerCache = new ArrayList(); + + if (manDig == null) { + synchronized(manifestRawBytes) { + if (manDig == null) { + manDig = new ManifestDigester(manifestRawBytes); + manifestRawBytes = null; + } + } + } + + SignatureFileVerifier sfv = + new SignatureFileVerifier(signerCache, + manDig, uname, baos.toByteArray()); + + if (sfv.needSignatureFileBytes()) { + // see if we have already parsed an external .SF file + byte[] bytes = (byte[]) sigFileData.get(key); + + if (bytes == null) { + // put this block on queue for later processing + // since we don't have the .SF bytes yet + // (uname, block); + if (debug != null) { + debug.println("adding pending block"); + } + pendingBlocks.add(sfv); + return; + } else { + sfv.setSignatureFile(bytes); + } + } + sfv.process(sigFileSigners, manifestDigests); + + } catch (IOException ioe) { + // e.g. sun.security.pkcs.ParsingException + if (debug != null) debug.println("processEntry caught: "+ioe); + // ignore and treat as unsigned + } catch (SignatureException se) { + if (debug != null) debug.println("processEntry caught: "+se); + // ignore and treat as unsigned + } catch (NoSuchAlgorithmException nsae) { + if (debug != null) debug.println("processEntry caught: "+nsae); + // ignore and treat as unsigned + } catch (CertificateException ce) { + if (debug != null) debug.println("processEntry caught: "+ce); + // ignore and treat as unsigned + } } } @@ -214,15 +354,15 @@ * Force a read of the entry data to generate the * verification hash. */ - try (InputStream s = jar.getInputStream(entry)) { + try { + InputStream s = jar.getInputStream(entry); byte[] buffer = new byte[1024]; int n = buffer.length; while (n != -1) { n = s.read(buffer, 0, buffer.length); } + s.close(); } catch (IOException e) { - // Ignore. When an exception is thrown, code signer - // will not be assigned. } } return getCodeSigners(name); @@ -268,7 +408,11 @@ */ void doneWithMeta() { + parsingMeta = false; anyToVerify = !sigFileSigners.isEmpty(); + baos = null; + sigFileData = null; + pendingBlocks = null; signerCache = null; manDig = null; // MANIFEST.MF is always treated as signed and verified, @@ -279,41 +423,6 @@ } } - /** - * Verifies a PKCS7 SignedData block - * @param key name of block - * @param block the pkcs7 file - * @param ins the clear data - */ - void verifyBlock(String key, byte[] block, InputStream ins) { - try { - if (signerCache == null) - signerCache = new ArrayList(); - - if (manDig == null) { - synchronized(manifestRawBytes) { - if (manDig == null) { - manDig = new ManifestDigester(manifestRawBytes); - manifestRawBytes = null; - } - } - } - SignatureFileVerifier sfv = - new SignatureFileVerifier(signerCache, man, - manDig, key, block); - - if (sfv.needSignatureFile()) { - // see if we have already parsed an external .SF file - sfv.setSignatureFile(ins); - } - sfv.process(sigFileSigners, manifestDigests); - } catch (Exception e) { - if (debug != null) { - e.printStackTrace(); - } - } - } - static class VerifierStream extends java.io.InputStream { private InputStream is; @@ -444,7 +553,10 @@ * but this handles a CodeSource of any type, just in case. */ CodeSource[] sources = mapSignersToCodeSources(cs.getLocation(), getJarCodeSigners(), true); - List sourceList = Arrays.asList(sources); + List sourceList = new ArrayList(); + for (int i = 0; i < sources.length; i++) { + sourceList.add(sources[i]); + } int j = sourceList.indexOf(cs); if (j != -1) { CodeSigner[] match; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/regex/Pattern.java --- a/jdk/src/share/classes/java/util/regex/Pattern.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/regex/Pattern.java Sat May 14 11:52:15 2011 -0700 @@ -206,13 +206,15 @@ * <td>Equivalent to java.lang.Character.isMirrored()</td></tr> * * <tr><th> </th></tr> - * <tr align="left"><th colspan="2" id="unicode">Classes for Unicode scripts, blocks and categories</th></tr> + * <tr align="left"><th colspan="2" id="unicode">Classes for Unicode scripts, blocks, categories and binary properties</th></tr> * * <tr><td valign="top" headers="construct unicode"><tt>\p{IsLatin}</tt></td> - * <td headers="matches">A Latin script character (simple <a href="#ubc">script</a>)</td></tr> + * <td headers="matches">A Latin script character (<a href="#usc">script</a>)</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\p{InGreek}</tt></td> - * <td headers="matches">A character in the Greek block (simple <a href="#ubc">block</a>)</td></tr> + * <td headers="matches">A character in the Greek block (<a href="#ubc">block</a>)</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\p{Lu}</tt></td> - * <td headers="matches">An uppercase letter (simple <a href="#ubc">category</a>)</td></tr> + * <td headers="matches">An uppercase letter (<a href="#ucc">category</a>)</td></tr> + * <tr><td valign="top" headers="construct unicode"><tt>\p{isAlphabetic}</tt></td> + * <td headers="matches">An alphabetic character (<a href="#ubpc">binary property</a>)</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\p{Sc}</tt></td> * <td headers="matches">A currency symbol</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\P{InGreek}</tt></td> @@ -328,10 +330,11 @@ * <td headers="matches">X, as a named-capturing group</td></tr> * <tr><td valign="top" headers="construct special"><tt>(?:</tt>X<tt>)</tt></td> * <td headers="matches">X, as a non-capturing group</td></tr> - * <tr><td valign="top" headers="construct special"><tt>(?idmsux-idmsux) </tt></td> + * <tr><td valign="top" headers="construct special"><tt>(?idmsuxU-idmsuxU) </tt></td> * <td headers="matches">Nothing, but turns match flags <a href="#CASE_INSENSITIVE">i</a> * <a href="#UNIX_LINES">d</a> <a href="#MULTILINE">m</a> <a href="#DOTALL">s</a> - * <a href="#UNICODE_CASE">u</a> <a href="#COMMENTS">x</a> on - off</td></tr> + * <a href="#UNICODE_CASE">u</a> <a href="#COMMENTS">x</a> <a href="#UNICODE_CHARACTER_CLASS">U</a> + * on - off</td></tr> * <tr><td valign="top" headers="construct special"><tt>(?idmsux-idmsux:</tt>X<tt>)</tt> </td> * <td headers="matches">X, as a <a href="#cg">non-capturing group</a> with the * given flags <a href="#CASE_INSENSITIVE">i</a> <a href="#UNIX_LINES">d</a> @@ -518,61 +521,140 @@ * * This class is in conformance with Level 1 of <a * href="http://www.unicode.org/reports/tr18/">Unicode Technical - * Standard #18: Unicode Regular Expression Guidelines</a>, plus RL2.1 + * Standard #18: Unicode Regular Expression</a>, plus RL2.1 * Canonical Equivalents. - * - * Unicode escape sequences such as <tt>\u2014</tt> in Java source code + * + * Unicode escape sequences such as <tt>\u2014</tt> in Java source code * are processed as described in section 3.3 of * <cite>The Java™ Language Specification</cite>. - * Such escape sequences are also - * implemented directly by the regular-expression parser so that Unicode - * escapes can be used in expressions that are read from files or from the - * keyboard. Thus the strings <tt>"\u2014"</tt> and <tt>"\\u2014"</tt>, - * while not equal, compile into the same pattern, which matches the character - * with hexadecimal value <tt>0x2014</tt>. - * - * A Unicode character can also be represented in a regular-expression by - * using its hexadecimal code point value directly as described in construct + * Such escape sequences are also implemented directly by the regular-expression + * parser so that Unicode escapes can be used in expressions that are read from + * files or from the keyboard. Thus the strings <tt>"\u2014"</tt> and + * <tt>"\\u2014"</tt>, while not equal, compile into the same pattern, which + * matches the character with hexadecimal value <tt>0x2014</tt>. + * + * A Unicode character can also be represented in a regular-expression by + * using its Hex notation(hexadecimal code point value) directly as described in construct * <tt>\x{...}</tt>, for example a supplementary character U+2011F * can be specified as <tt>\x{2011F}</tt>, instead of two consecutive * Unicode escape sequences of the surrogate pair * <tt>\uD840</tt><tt>\uDD1F</tt>. - * - * <a name="ubc"> - * Unicode scripts, blocks and categories are written with the <tt>\p</tt> and - * <tt>\P</tt> constructs as in Perl. <tt>\p{</tt>prop<tt>}</tt> matches if + * + * Unicode scripts, blocks, categories and binary properties are written with + * the <tt>\p</tt> and <tt>\P</tt> constructs as in Perl. + * <tt>\p{</tt>prop<tt>}</tt> matches if * the input has the property prop, while <tt>\P{</tt>prop<tt>}</tt> * does not match if the input has that property. * - * Scripts are specified either with the prefix {@code Is}, as in + * Scripts, blocks, categories and binary properties can be used both inside + * and outside of a character class. + * <a name="usc"> + * + * Scripts are specified either with the prefix {@code Is}, as in * {@code IsHiragana}, or by using the {@code script} keyword (or its short * form {@code sc})as in {@code script=Hiragana} or {@code sc=Hiragana}. * - * Blocks are specified with the prefix {@code In}, as in + * The script names supported by <code>Pattern</code> are the valid script names + * accepted and defined by + * {@link java.lang.Character.UnicodeScript#forName(String) UnicodeScript.forName}. + * <a name="ubc"> + * + * Blocks are specified with the prefix {@code In}, as in * {@code InMongolian}, or by using the keyword {@code block} (or its short * form {@code blk}) as in {@code block=Mongolian} or {@code blk=Mongolian}. * - * Categories may be specified with the optional prefix {@code Is}: + * The block names supported by <code>Pattern</code> are the valid block names + * accepted and defined by + * {@link java.lang.Character.UnicodeBlock#forName(String) UnicodeBlock.forName}. + * + * <a name="ucc"> + * Categories may be specified with the optional prefix {@code Is}: * Both {@code \p{L}} and {@code \p{IsL}} denote the category of Unicode * letters. Same as scripts and blocks, categories can also be specified * by using the keyword {@code general_category} (or its short form * {@code gc}) as in {@code general_category=Lu} or {@code gc=Lu}. * - * Scripts, blocks and categories can be used both inside and outside of a - * character class. - * The supported categories are those of + * The supported categories are those of * <a href="http://www.unicode.org/unicode/standard/standard.html"> * The Unicode Standard</a> in the version specified by the * {@link java.lang.Character Character} class. The category names are those * defined in the Standard, both normative and informative. - * The script names supported by <code>Pattern</code> are the valid script names - * accepted and defined by - * {@link java.lang.Character.UnicodeScript#forName(String) UnicodeScript.forName}. - * The block names supported by <code>Pattern</code> are the valid block names - * accepted and defined by - * {@link java.lang.Character.UnicodeBlock#forName(String) UnicodeBlock.forName}. + * + * <a name="ubpc"> + * Binary properties are specified with the prefix {@code Is}, as in + * {@code IsAlphabetic}. The supported binary properties by <code>Pattern</code> + * are + * <ul> + * <li> Alphabetic + * <li> Ideographic + * <li> Letter + * <li> Lowercase + * <li> Uppercase + * <li> Titlecase + * <li> Punctuation + * <Li> Control + * <li> White_Space + * <li> Digit + * <li> Hex_Digit + * <li> Noncharacter_Code_Point + * <li> Assigned + * </ul> + + + * + * Predefined Character classes and POSIX character classes are in + * conformance with the recommendation of Annex C: Compatibility Properties + * of <a href="http://www.unicode.org/reports/tr18/">Unicode Regular Expression + * </a>, when {@link #UNICODE_CHARACTER_CLASS} flag is specified. * - * <a name="jcc"> Categories that behave like the java.lang.Character + * <table border="0" cellpadding="1" cellspacing="0" + * summary="predefined and posix character classes in Unicode mode"> + * <tr align="left"> + * <th bgcolor="#CCCCFF" align="left" id="classes">Classes</th> + * <th bgcolor="#CCCCFF" align="left" id="matches">Matches</th> + *</tr> + * <tr><td><tt>\p{Lower}</tt></td> + * <td>A lowercase character:<tt>\p{IsLowercase}</tt></td></tr> + * <tr><td><tt>\p{Upper}</tt></td> + * <td>An uppercase character:<tt>\p{IsUppercase}</tt></td></tr> + * <tr><td><tt>\p{ASCII}</tt></td> + * <td>All ASCII:<tt>[\x00-\x7F]</tt></td></tr> + * <tr><td><tt>\p{Alpha}</tt></td> + * <td>An alphabetic character:<tt>\p{IsAlphabetic}</tt></td></tr> + * <tr><td><tt>\p{Digit}</tt></td> + * <td>A decimal digit character:<tt>p{IsDigit}</tt></td></tr> + * <tr><td><tt>\p{Alnum}</tt></td> + * <td>An alphanumeric character:<tt>[\p{IsAlphabetic}\p{IsDigit}]</tt></td></tr> + * <tr><td><tt>\p{Punct}</tt></td> + * <td>A punctuation character:<tt>p{IsPunctuation}</tt></td></tr> + * <tr><td><tt>\p{Graph}</tt></td> + * <td>A visible character: <tt>[^\p{IsWhite_Space}\p{gc=Cc}\p{gc=Cs}\p{gc=Cn}]</tt></td></tr> + * <tr><td><tt>\p{Print}</tt></td> + * <td>A printable character: <tt>[\p{Graph}\p{Blank}&&[^\p{Cntrl}]]</tt></td></tr> + * <tr><td><tt>\p{Blank}</tt></td> + * <td>A space or a tab: <tt>[\p{IsWhite_Space}&&[^\p{gc=Zl}\p{gc=Zp}\x0a\x0b\x0c\x0d\x85]]</tt></td></tr> + * <tr><td><tt>\p{Cntrl}</tt></td> + * <td>A control character: <tt>\p{gc=Cc}</tt></td></tr> + * <tr><td><tt>\p{XDigit}</tt></td> + * <td>A hexadecimal digit: <tt>[\p{gc=Nd}\p{IsHex_Digit}]</tt></td></tr> + * <tr><td><tt>\p{Space}</tt></td> + * <td>A whitespace character:<tt>\p{IsWhite_Space}</tt></td></tr> + * <tr><td><tt>\d</tt></td> + * <td>A digit: <tt>\p{IsDigit}</tt></td></tr> + * <tr><td><tt>\D</tt></td> + * <td>A non-digit: <tt>[^\d]</tt></td></tr> + * <tr><td><tt>\s</tt></td> + * <td>A whitespace character: <tt>\p{IsWhite_Space}</tt></td></tr> + * <tr><td><tt>\S</tt></td> + * <td>A non-whitespace character: <tt>[^\s]</tt></td></tr> + * <tr><td><tt>\w</tt></td> + * <td>A word character: <tt>[\p{Alpha}\p{gc=Mn}\p{gc=Me}\p{gc=Mc}\p{Digit}\p{gc=Pc}]</tt></td></tr> + * <tr><td><tt>\W</tt></td> + * <td>A non-word character: <tt>[^\w]</tt></td></tr> + * </table> + * + * <a name="jcc"> + * Categories that behave like the java.lang.Character * boolean ismethodname methods (except for the deprecated ones) are * available through the same <tt>\p{</tt>prop<tt>}</tt> syntax where * the specified property has the name <tt>javamethodname</tt>. @@ -585,8 +667,30 @@ * Perl constructs not supported by this class: * * <ul> + * <li> Predefined character classes (Unicode character) + * <tt>\h </tt>A horizontal whitespace + * <tt>\H </tt>A non horizontal whitespace + * <tt>\v </tt>A vertical whitespace + * <tt>\V </tt>A non vertical whitespace + * <tt>\R </tt>Any Unicode linebreak sequence + * <tt>\u005cu000D\u005cu000A|[\u005cu000A\u005cu000B\u005cu000C\u005cu000D\u005cu0085\u005cu2028\u005cu2029]</tt> + * <tt>\X </tt>Match Unicode + * <a href="http://www.unicode.org/reports/tr18/#Default_Grapheme_Clusters"> + * extended grapheme cluster</a> + * </li> * - * <li> The conditional constructs <tt>(?{</tt>X<tt>})</tt> and + * <li> The backreference constructs, <tt>\g{</tt>n<tt>}</tt> for + * the nth<a href="#cg">capturing group</a> and + * <tt>\g{</tt>name<tt>}</tt> for + * <a href="#groupname">named-capturing group</a>. + * </li> + * + * <li> The named character construct, <tt>\N{</tt>name<tt>}</tt> + * for a Unicode character by its name. + * </li> + * + * <li> The conditional constructs + * <tt>(?(</tt>condition<tt>)</tt>X<tt>)</tt> and * <tt>(?(</tt>condition<tt>)</tt>X<tt>|</tt>Y<tt>)</tt>, * </li> * @@ -604,10 +708,6 @@ * * <ul> * - * <li> Possessive quantifiers, which greedily match as much as they can - * and do not back off, even when doing so would allow the overall match to - * succeed. </li> - * * <li> Character-class union and intersection as described * <a href="#cc">above</a>.</li> * @@ -641,13 +741,6 @@ * within a group; in the latter case, flags are restored at the end of the * group just as in Perl. </li> * - * <li> Perl is forgiving about malformed matching constructs, as in the - * expression <tt>*a</tt>, as well as dangling brackets, as in the - * expression <tt>abc]</tt>, and treats them as literals. This - * class also accepts dangling brackets but is strict about dangling - * metacharacters like +, ? and *, and will throw a - * {@link PatternSyntaxException} if it encounters them. </li> - * * </ul> * * @@ -796,6 +889,28 @@ */ public static final int CANON_EQ = 0x80; + /** + * Enables the Unicode version of Predefined character classes and + * POSIX character classes. + * + * When this flag is specified then the (US-ASCII only) + * Predefined character classes and POSIX character classes + * are in conformance with + * <a href="http://www.unicode.org/reports/tr18/">Unicode Technical + * Standard #18: Unicode Regular Expression</a> + * Annex C: Compatibility Properties. + * + * The UNICODE_CHARACTER_CLASS mode can also be enabled via the embedded + * flag expression <tt>(?U)</tt>. + * + * The flag implies UNICODE_CASE, that is, it enables Unicode-aware case + * folding. + * + * Specifying this flag may impose a performance penalty. + * @since 1.7 + */ + public static final int UNICODE_CHARACTER_CLASS = 0x100; + /* Pattern has only two serialized components: The pattern string * and the flags, which are all that is needed to recompile the pattern * when it is deserialized. @@ -918,7 +1033,8 @@ * Match flags, a bit mask that may include * {@link #CASE_INSENSITIVE}, {@link #MULTILINE}, {@link #DOTALL}, * {@link #UNICODE_CASE}, {@link #CANON_EQ}, {@link #UNIX_LINES}, - * {@link #LITERAL} and {@link #COMMENTS} + * {@link #LITERAL}, {@link #UNICODE_CHARACTER_CLASS} + * and {@link #COMMENTS} * * @throws IllegalArgumentException * If bit values other than those corresponding to the defined @@ -1209,6 +1325,10 @@ pattern = p; flags = f; + // to use UNICODE_CASE if UNICODE_CHARACTER_CLASS present + if ((flags & UNICODE_CHARACTER_CLASS) != 0) + flags |= UNICODE_CASE; + // Reset group index count capturingGroupCount = 1; localCount = 0; @@ -2164,12 +2284,14 @@ return -1; case 'B': if (inclass) break; - if (create) root = new Bound(Bound.NONE); + if (create) root = new Bound(Bound.NONE, has(UNICODE_CHARACTER_CLASS)); return -1; case 'C': break; case 'D': - if (create) root = new Ctype(ASCII.DIGIT).complement(); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.DIGIT).complement() + : new Ctype(ASCII.DIGIT).complement(); return -1; case 'E': case 'F': @@ -2191,14 +2313,18 @@ case 'R': break; case 'S': - if (create) root = new Ctype(ASCII.SPACE).complement(); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WHITE_SPACE).complement() + : new Ctype(ASCII.SPACE).complement(); return -1; case 'T': case 'U': case 'V': break; case 'W': - if (create) root = new Ctype(ASCII.WORD).complement(); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WORD).complement() + : new Ctype(ASCII.WORD).complement(); return -1; case 'X': case 'Y': @@ -2216,12 +2342,14 @@ return '\007'; case 'b': if (inclass) break; - if (create) root = new Bound(Bound.BOTH); + if (create) root = new Bound(Bound.BOTH, has(UNICODE_CHARACTER_CLASS)); return -1; case 'c': return c(); case 'd': - if (create) root = new Ctype(ASCII.DIGIT); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.DIGIT) + : new Ctype(ASCII.DIGIT); return -1; case 'e': return '\033'; @@ -2259,7 +2387,9 @@ case 'r': return '\r'; case 's': - if (create) root = new Ctype(ASCII.SPACE); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WHITE_SPACE) + : new Ctype(ASCII.SPACE); return -1; case 't': return '\t'; @@ -2268,7 +2398,9 @@ case 'v': return '\013'; case 'w': - if (create) root = new Ctype(ASCII.WORD); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WORD) + : new Ctype(ASCII.WORD); return -1; case 'x': return x(); @@ -2490,7 +2622,7 @@ { next(); String name; - CharProperty node; + CharProperty node = null; if (singleLetter) { int c = temp[cursor]; @@ -2536,11 +2668,21 @@ } else if (name.startsWith("Is")) { // \p{isGeneralCategory} and \p{isScriptName} name = name.substring(2); - node = CharPropertyNames.charPropertyFor(name); + UnicodeProp uprop = UnicodeProp.forName(name); + if (uprop != null) + node = new Utype(uprop); + if (node == null) + node = CharPropertyNames.charPropertyFor(name); if (node == null) node = unicodeScriptPropertyFor(name); } else { - node = charPropertyNodeFor(name); + if (has(UNICODE_CHARACTER_CLASS)) { + UnicodeProp uprop = UnicodeProp.forPOSIXName(name); + if (uprop != null) + node = new Utype(uprop); + } + if (node == null) + node = charPropertyNodeFor(name); } } if (maybeComplement) { @@ -2822,6 +2964,9 @@ case 'x': flags |= COMMENTS; break; + case 'U': + flags |= (UNICODE_CHARACTER_CLASS | UNICODE_CASE); + break; case '-': // subFlag then fall through ch = next(); subFlag(); @@ -2861,6 +3006,8 @@ case 'x': flags &= ~COMMENTS; break; + case 'U': + flags &= ~(UNICODE_CHARACTER_CLASS | UNICODE_CASE); default: return; } @@ -3664,6 +3811,18 @@ } /** + * Node class that matches a Unicode "type" + */ + static final class Utype extends CharProperty { + final UnicodeProp uprop; + Utype(UnicodeProp uprop) { this.uprop = uprop; } + boolean isSatisfiedBy(int ch) { + return uprop.is(ch); + } + } + + + /** * Node class that matches a POSIX type. */ static final class Ctype extends BmpCharProperty { @@ -5025,9 +5184,17 @@ static int BOTH = 0x3; static int NONE = 0x4; int type; - Bound(int n) { + boolean useUWORD; + Bound(int n, boolean useUWORD) { type = n; - } + this.useUWORD = useUWORD; + } + + boolean isWord(int ch) { + return useUWORD ? UnicodeProp.WORD.is(ch) + : (ch == '_' || Character.isLetterOrDigit(ch)); + } + int check(Matcher matcher, int i, CharSequence seq) { int ch; boolean left = false; @@ -5039,14 +5206,14 @@ } if (i > startIndex) { ch = Character.codePointBefore(seq, i); - left = (ch == '_' || Character.isLetterOrDigit(ch) || + left = (isWord(ch) || ((Character.getType(ch) == Character.NON_SPACING_MARK) && hasBaseCharacter(matcher, i-1, seq))); } boolean right = false; if (i < endIndex) { ch = Character.codePointAt(seq, i); - right = (ch == '_' || Character.isLetterOrDigit(ch) || + right = (isWord(ch) || ((Character.getType(ch) == Character.NON_SPACING_MARK) && hasBaseCharacter(matcher, i, seq))); } else { @@ -5428,6 +5595,12 @@ defClone("javaUpperCase", new CloneableProperty() { boolean isSatisfiedBy(int ch) { return Character.isUpperCase(ch);}}); + defClone("javaAlphabetic", new CloneableProperty() { + boolean isSatisfiedBy(int ch) { + return Character.isAlphabetic(ch);}}); + defClone("javaIdeographic", new CloneableProperty() { + boolean isSatisfiedBy(int ch) { + return Character.isIdeographic(ch);}}); defClone("javaTitleCase", new CloneableProperty() { boolean isSatisfiedBy(int ch) { return Character.isTitleCase(ch);}}); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/regex/UnicodeProp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/java/util/regex/UnicodeProp.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,236 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package java.util.regex; + +import java.util.HashMap; +import java.util.Locale; + +enum UnicodeProp { + + ALPHABETIC { + public boolean is(int ch) { + return Character.isAlphabetic(ch); + } + }, + + LETTER { + public boolean is(int ch) { + return Character.isLetter(ch); + } + }, + + IDEOGRAPHIC { + public boolean is(int ch) { + return Character.isIdeographic(ch); + } + }, + + LOWERCASE { + public boolean is(int ch) { + return Character.isLowerCase(ch); + } + }, + + UPPERCASE { + public boolean is(int ch) { + return Character.isUpperCase(ch); + } + }, + + TITLECASE { + public boolean is(int ch) { + return Character.isTitleCase(ch); + } + }, + + WHITE_SPACE { + // \p{Whitespace} + public boolean is(int ch) { + return ((((1 << Character.SPACE_SEPARATOR) | + (1 << Character.LINE_SEPARATOR) | + (1 << Character.PARAGRAPH_SEPARATOR)) >> Character.getType(ch)) & 1) + != 0 || (ch >= 0x9 && ch <= 0xd) || (ch == 0x85); + } + }, + + CONTROL { + // \p{gc=Control} + public boolean is(int ch) { + return Character.getType(ch) == Character.CONTROL; + } + }, + + PUNCTUATION { + // \p{gc=Punctuation} + public boolean is(int ch) { + return ((((1 << Character.CONNECTOR_PUNCTUATION) | + (1 << Character.DASH_PUNCTUATION) | + (1 << Character.START_PUNCTUATION) | + (1 << Character.END_PUNCTUATION) | + (1 << Character.OTHER_PUNCTUATION) | + (1 << Character.INITIAL_QUOTE_PUNCTUATION) | + (1 << Character.FINAL_QUOTE_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0; + } + }, + + HEX_DIGIT { + // \p{gc=Decimal_Number} + // \p{Hex_Digit} -> PropList.txt: Hex_Digit + public boolean is(int ch) { + return DIGIT.is(ch) || + (ch >= 0x0030 && ch <= 0x0039) || + (ch >= 0x0041 && ch <= 0x0046) || + (ch >= 0x0061 && ch <= 0x0066) || + (ch >= 0xFF10 && ch <= 0xFF19) || + (ch >= 0xFF21 && ch <= 0xFF26) || + (ch >= 0xFF41 && ch <= 0xFF46); + } + }, + + ASSIGNED { + public boolean is(int ch) { + return Character.getType(ch) != Character.UNASSIGNED; + } + }, + + NONCHARACTER_CODE_POINT { + // PropList.txt:Noncharacter_Code_Point + public boolean is(int ch) { + return (ch & 0xfffe) == 0xfffe || (ch >= 0xfdd0 && ch <= 0xfdef); + } + }, + + DIGIT { + // \p{gc=Decimal_Number} + public boolean is(int ch) { + return Character.isDigit(ch); + } + }, + + ALNUM { + // \p{alpha} + // \p{digit} + public boolean is(int ch) { + return ALPHABETIC.is(ch) || DIGIT.is(ch); + } + }, + + BLANK { + // \p{Whitespace} -- + // [\N{LF} \N{VT} \N{FF} \N{CR} \N{NEL} -> 0xa, 0xb, 0xc, 0xd, 0x85 + // \p{gc=Line_Separator} + // \p{gc=Paragraph_Separator}] + public boolean is(int ch) { + return Character.getType(ch) == Character.SPACE_SEPARATOR || + ch == 0x9; // \N{HT} + } + }, + + GRAPH { + // [^ + // \p{space} + // \p{gc=Control} + // \p{gc=Surrogate} + // \p{gc=Unassigned}] + public boolean is(int ch) { + return ((((1 << Character.SPACE_SEPARATOR) | + (1 << Character.LINE_SEPARATOR) | + (1 << Character.PARAGRAPH_SEPARATOR) | + (1 << Character.CONTROL) | + (1 << Character.SURROGATE) | + (1 << Character.UNASSIGNED)) >> Character.getType(ch)) & 1) + == 0; + } + }, + + PRINT { + // \p{graph} + // \p{blank} + // -- \p{cntrl} + public boolean is(int ch) { + return (GRAPH.is(ch) || BLANK.is(ch)) && !CONTROL.is(ch); + } + }, + + WORD { + // \p{alpha} + // \p{gc=Mark} + // \p{digit} + // \p{gc=Connector_Punctuation} + + public boolean is(int ch) { + return ALPHABETIC.is(ch) || + ((((1 << Character.NON_SPACING_MARK) | + (1 << Character.ENCLOSING_MARK) | + (1 << Character.COMBINING_SPACING_MARK) | + (1 << Character.DECIMAL_DIGIT_NUMBER) | + (1 << Character.CONNECTOR_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0; + } + }; + + private final static HashMap<String, String> posix = new HashMap<>(); + private final static HashMap<String, String> aliases = new HashMap<>(); + static { + posix.put("ALPHA", "ALPHABETIC"); + posix.put("LOWER", "LOWERCASE"); + posix.put("UPPER", "UPPERCASE"); + posix.put("SPACE", "WHITE_SPACE"); + posix.put("PUNCT", "PUNCTUATION"); + posix.put("XDIGIT","HEX_DIGIT"); + posix.put("ALNUM", "ALNUM"); + posix.put("CNTRL", "CONTROL"); + posix.put("DIGIT", "DIGIT"); + posix.put("BLANK", "BLANK"); + posix.put("GRAPH", "GRAPH"); + posix.put("PRINT", "PRINT"); + + aliases.put("WHITESPACE", "WHITE_SPACE"); + aliases.put("HEXDIGIT","HEX_DIGIT"); + aliases.put("NONCHARACTERCODEPOINT", "NONCHARACTER_CODE_POINT"); + } + + public static UnicodeProp forName(String propName) { + propName = propName.toUpperCase(Locale.ENGLISH); + String alias = aliases.get(propName); + if (alias != null) + propName = alias; + try { + return valueOf (propName); + } catch (IllegalArgumentException x) {} + return null; + } + + public static UnicodeProp forPOSIXName(String propName) { + propName = posix.get(propName.toUpperCase(Locale.ENGLISH)); + if (propName == null) + return null; + return valueOf (propName); + } + + public abstract boolean is(int ch); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipCoder.java --- a/jdk/src/share/classes/java/util/zip/ZipCoder.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipCoder.java Sat May 14 11:52:15 2011 -0700 @@ -28,11 +28,14 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; import java.nio.charset.CodingErrorAction; import java.util.Arrays; +import sun.nio.cs.ArrayDecoder; +import sun.nio.cs.ArrayEncoder; /** * Utility class for zipfile name and comment decoding and encoding @@ -46,6 +49,15 @@ char[] ca = new char[len]; if (len == 0) return new String(ca); + // UTF-8 only for now. Other ArrayDeocder only handles + // CodingErrorAction.REPLACE mode. ZipCoder uses + // REPORT mode. + if (isUTF8 && cd instanceof ArrayDecoder) { + int clen = ((ArrayDecoder)cd).decode(ba, 0, length, ca); + if (clen == -1) // malformed + throw new IllegalArgumentException("MALFORMED"); + return new String(ca, 0, clen); + } ByteBuffer bb = ByteBuffer.wrap(ba, 0, length); CharBuffer cb = CharBuffer.wrap(ca); CoderResult cr = cd.decode(bb, cb, true); @@ -68,6 +80,14 @@ byte[] ba = new byte[len]; if (len == 0) return ba; + // UTF-8 only for now. Other ArrayDeocder only handles + // CodingErrorAction.REPLACE mode. + if (isUTF8 && ce instanceof ArrayEncoder) { + int blen = ((ArrayEncoder)ce).encode(ca, 0, ca.length, ba); + if (blen == -1) // malformed + throw new IllegalArgumentException("MALFORMED"); + return Arrays.copyOf(ba, blen); + } ByteBuffer bb = ByteBuffer.wrap(ba); CharBuffer cb = CharBuffer.wrap(ca); CoderResult cr = ce.encode(cb, bb, true); @@ -84,35 +104,35 @@ // assume invoked only if "this" is not utf8 byte[] getBytesUTF8(String s) { - if (isutf8) + if (isUTF8) return getBytes(s); if (utf8 == null) - utf8 = new ZipCoder(Charset.forName("UTF-8")); + utf8 = new ZipCoder(StandardCharset.UTF_8); return utf8.getBytes(s); } String toStringUTF8(byte[] ba, int len) { - if (isutf8) + if (isUTF8) return toString(ba, len); if (utf8 == null) - utf8 = new ZipCoder(Charset.forName("UTF-8")); + utf8 = new ZipCoder(StandardCharset.UTF_8); return utf8.toString(ba, len); } boolean isUTF8() { - return isutf8; + return isUTF8; } private Charset cs; private CharsetDecoder dec; private CharsetEncoder enc; - private boolean isutf8; + private boolean isUTF8; private ZipCoder utf8; private ZipCoder(Charset cs) { this.cs = cs; - this.isutf8 = cs.name().equals("UTF-8"); + this.isUTF8 = cs.name().equals(StandardCharset.UTF_8.name()); } static ZipCoder get(Charset charset) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipFile.java --- a/jdk/src/share/classes/java/util/zip/ZipFile.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipFile.java Sat May 14 11:52:15 2011 -0700 @@ -31,6 +31,7 @@ import java.io.EOFException; import java.io.File; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import java.util.ArrayDeque; import java.util.Deque; import java.util.Enumeration; @@ -140,7 +141,7 @@ * @since 1.3 */ public ZipFile(File file, int mode) throws IOException { - this(file, mode, Charset.forName("UTF-8")); + this(file, mode, StandardCharset.UTF_8); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipInputStream.java --- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,7 @@ import java.io.EOFException; import java.io.PushbackInputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import static java.util.zip.ZipConstants64.*; /** @@ -75,7 +76,7 @@ * @param in the actual input stream */ public ZipInputStream(InputStream in) { - this(in, Charset.forName("UTF-8")); + this(in, StandardCharset.UTF_8); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipOutputStream.java --- a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipOutputStream.java Sat May 14 11:52:15 2011 -0700 @@ -28,6 +28,7 @@ import java.io.OutputStream; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import java.util.Vector; import java.util.HashSet; import static java.util.zip.ZipConstants64.*; @@ -100,7 +101,7 @@ * @param out the actual output stream */ public ZipOutputStream(OutputStream out) { - this(out, Charset.forName("UTF-8")); + this(out, StandardCharset.UTF_8); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.security.auth.kerberos; + +import sun.misc.JavaxSecurityAuthKerberosAccess; +import sun.security.krb5.EncryptionKey; +import sun.security.krb5.PrincipalName; + +class JavaxSecurityAuthKerberosAccessImpl + implements JavaxSecurityAuthKerberosAccess { + public EncryptionKey[] keyTabGetEncryptionKeys( + KeyTab ktab, PrincipalName principal) { + return ktab.getEncryptionKeys(principal); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java --- a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -35,14 +35,16 @@ * principal. * * All Kerberos JAAS login modules that obtain a principal's password and - * generate the secret key from it should use this class. Where available, - * the login module might even read this secret key directly from a - * Kerberos "keytab". Sometimes, such as when authenticating a server in + * generate the secret key from it should use this class. + * Sometimes, such as when authenticating a server in * the absence of user-to-user authentication, the login module will store * an instance of this class in the private credential set of a * {@link javax.security.auth.Subject Subject} during the commit phase of the * authentication process. * + * A Kerberos service using a keytab to read secret keys should use + * the {@link KeyTab} class, where latest keys can be read when needed. + * * It might be necessary for the application to be granted a * {@link javax.security.auth.PrivateCredentialPermission * PrivateCredentialPermission} if it needs to access the KerberosKey diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,230 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.security.auth.kerberos; + +import java.io.File; +import java.util.Objects; +import sun.misc.SharedSecrets; +import sun.security.krb5.EncryptionKey; +import sun.security.krb5.PrincipalName; +import sun.security.krb5.RealmException; + +/** + * This class encapsulates a keytab file. + * + * A Kerberos JAAS login module that obtains long term secret keys from a + * keytab file should use this class. The login module will store + * an instance of this class in the private credential set of a + * {@link javax.security.auth.Subject Subject} during the commit phase of the + * authentication process. + * + * It might be necessary for the application to be granted a + * {@link javax.security.auth.PrivateCredentialPermission + * PrivateCredentialPermission} if it needs to access the KeyTab + * instance from a Subject. This permission is not needed when the + * application depends on the default JGSS Kerberos mechanism to access the + * KeyTab. In that case, however, the application will need an appropriate + * {@link javax.security.auth.kerberos.ServicePermission ServicePermission}. + * + * The keytab file format is described at + * <a href="http://www.ioplex.com/utilities/keytab.txt"> + * http://www.ioplex.com/utilities/keytab.txt</a>. + * + * @since 1.7 + */ +public final class KeyTab { + + /* + * Impl notes: + * + * This class is only a name, a permanent link to the keytab source + * (can be missing). Itself has no content. In order to read content, + * take a snapshot and read from it. + * + * The snapshot is of type sun.security.krb5.internal.ktab.KeyTab, which + * contains the content of the keytab file when the snapshot is taken. + * Itself has no refresh function and mostly an immutable class (except + * for the create/add/save methods only used by the ktab command). + */ + + // Source, null if using the default one. Note that the default name + // is maintained in snapshot, this field is never "resolved". + private final File file; + + // Set up JavaxSecurityAuthKerberosAccess in SharedSecrets + static { + SharedSecrets.setJavaxSecurityAuthKerberosAccess( + new JavaxSecurityAuthKerberosAccessImpl()); + } + + private KeyTab(File file) { + this.file = file; + } + + /** + * Returns a {@code KeyTab} instance from a {@code File} object. + * + * The result of this method is never null. This method only associates + * the returned {@code KeyTab} object with the file and does not read it. + * @param file the keytab {@code File} object, must not be null + * @return the keytab instance + * @throws NullPointerException if the {@code file} argument is null + */ + public static KeyTab getInstance(File file) { + if (file == null) { + throw new NullPointerException("file must be non null"); + } + return new KeyTab(file); + } + + /** + * Returns the default {@code KeyTab} instance. + * + * The result of this method is never null. This method only associates + * the returned {@code KeyTab} object with the default keytab file and + * does not read it. + * @return the default keytab instance. + */ + public static KeyTab getInstance() { + return new KeyTab(null); + } + + //Takes a snapshot of the keytab content + private sun.security.krb5.internal.ktab.KeyTab takeSnapshot() { + return sun.security.krb5.internal.ktab.KeyTab.getInstance(file); + } + + /** + * Returns fresh keys for the given Kerberos principal. + * + * Implementation of this method should make sure the returned keys match + * the latest content of the keytab file. The result is a newly created + * copy that can be modified by the caller without modifying the keytab + * object. The caller should {@link KerberosKey#destroy() destroy} the + * result keys after they are used. + * + * Please note that the keytab file can be created after the + * {@code KeyTab} object is instantiated and its content may change over + * time. Therefore, an application should call this method only when it + * needs to use the keys. Any previous result from an earlier invocation + * could potentially be expired. + * + * If there is any error (say, I/O error or format error) + * during the reading process of the KeyTab file, a saved result should be + * returned. If there is no saved result (say, this is the first time this + * method is called, or, all previous read attempts failed), an empty array + * should be returned. This can make sure the result is not drastically + * changed during the (probably slow) update of the keytab file. + * + * Each time this method is called and the reading of the file succeeds + * with no exception (say, I/O error or file format error), + * the result should be saved for {@code principal}. The implementation can + * also save keys for other principals having keys in the same keytab object + * if convenient. + * + * Any unsupported key read from the keytab is ignored and not included + * in the result. + * + * @param principal the Kerberos principal, must not be null. + * @return the keys (never null, may be empty) + * @throws NullPointerException if the {@code principal} + * argument is null + * @throws SecurityException if a security manager exists and the read + * access to the keytab file is not permitted + */ + public KerberosKey[] getKeys(KerberosPrincipal principal) { + try { + EncryptionKey[] keys = takeSnapshot().readServiceKeys( + new PrincipalName(principal.getName())); + KerberosKey[] kks = new KerberosKey[keys.length]; + for (int i=0; i<kks.length; i++) { + Integer tmp = keys[i].getKeyVersionNumber(); + kks[i] = new KerberosKey( + principal, + keys[i].getBytes(), + keys[i].getEType(), + tmp == null ? 0 : tmp.intValue()); + keys[i].destroy(); + } + return kks; + } catch (RealmException re) { + return new KerberosKey[0]; + } + } + + EncryptionKey[] getEncryptionKeys(PrincipalName principal) { + return takeSnapshot().readServiceKeys(principal); + } + + /** + * Checks if the keytab file exists. Implementation of this method + * should make sure that the result matches the latest status of the + * keytab file. + * + * The caller can use the result to determine if it should fallback to + * another mechanism to read the keys. + * @return true if the keytab file exists; false otherwise. + * @throws SecurityException if a security manager exists and the read + * access to the keytab file is not permitted + */ + public boolean exists() { + return !takeSnapshot().isMissing(); + } + + public String toString() { + return file == null ? "Default keytab" : file.toString(); + } + + /** + * Returns a hashcode for this KeyTab. + * + * @return a hashCode() for the <code>KeyTab</code> + */ + public int hashCode() { + return Objects.hash(file); + } + + /** + * Compares the specified Object with this KeyTab for equality. + * Returns true if the given object is also a + * <code>KeyTab</code> and the two + * <code>KeyTab</code> instances are equivalent. + * + * @param other the Object to compare to + * @return true if the specified object is equal to this KeyTab + */ + public boolean equals(Object other) { + if (other == this) + return true; + + if (! (other instanceof KeyTab)) { + return false; + } + + KeyTab otherKtab = (KeyTab) other; + return Objects.equals(otherKtab.file, file); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/swing/JPopupMenu.java --- a/jdk/src/share/classes/javax/swing/JPopupMenu.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java Sat May 14 11:52:15 2011 -0700 @@ -342,8 +342,8 @@ // Calculate the screen size that popup should fit Dimension popupSize = JPopupMenu.this.getPreferredSize(); - int popupRightX = popupLocation.x + popupSize.width; - int popupBottomY = popupLocation.y + popupSize.height; + long popupRightX = (long)popupLocation.x + (long)popupSize.width; + long popupBottomY = (long)popupLocation.y + (long)popupSize.height; int scrWidth = scrBounds.width; int scrHeight = scrBounds.height; if (!canPopupOverlapTaskBar()) { @@ -358,13 +358,13 @@ int scrBottomY = scrBounds.y + scrHeight; // Ensure that popup menu fits the screen - if (popupRightX > scrRightX) { + if (popupRightX > (long)scrRightX) { popupLocation.x = scrRightX - popupSize.width; if( popupLocation.x < scrBounds.x ) { popupLocation.x = scrBounds.x ; } } - if (popupBottomY > scrBottomY) { + if (popupBottomY > (long)scrBottomY) { popupLocation.y = scrBottomY - popupSize.height; if( popupLocation.y < scrBounds.y ) { popupLocation.y = scrBounds.y; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/swing/JSplitPane.java --- a/jdk/src/share/classes/javax/swing/JSplitPane.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/JSplitPane.java Sat May 14 11:52:15 2011 -0700 @@ -671,7 +671,7 @@ * which must be <code>true</code> for the child components * to be continuously * redisplayed and laid out during user intervention. - * The default value of this property is <code>false</code>. + * The default value of this property is look and feel dependent. * Some look and feels might not support continuous layout; * they will ignore this property. * diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Sat May 14 11:52:15 2011 -0700 @@ -154,7 +154,7 @@ setBackground(UIManager.getColor("SplitPane.background")); } - private void revalidate() { + private void revalidateSplitPane() { invalidate(); if (splitPane != null) { splitPane.revalidate(); @@ -315,7 +315,7 @@ setCursor((orientation == JSplitPane.HORIZONTAL_SPLIT) ? Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR) : Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR)); - revalidate(); + revalidateSplitPane(); } else if (e.getPropertyName() == JSplitPane. ONE_TOUCH_EXPANDABLE_PROPERTY) { @@ -376,7 +376,7 @@ add(rightButton); } } - revalidate(); + revalidateSplitPane(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java --- a/jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java Sat May 14 11:52:15 2011 -0700 @@ -13,7 +13,7 @@ */ // Keycodes declared in KeyEvent.java with corresponding Unicode values. private final static HashMap<Integer, Integer> regularKeyCodesMap = - new HashMap<Integer,Integer>(83, 1.0f); + new HashMap<Integer,Integer>(98, 1.0f); // Keycodes derived from Unicode values. Here should be collected codes // for characters appearing on the primary layer of at least one @@ -108,6 +108,21 @@ regularKeyCodesMap.put(0x5E, KeyEvent.VK_CIRCUMFLEX); regularKeyCodesMap.put(0x5F, KeyEvent.VK_UNDERSCORE); regularKeyCodesMap.put(0x60, KeyEvent.VK_BACK_QUOTE); + regularKeyCodesMap.put(0x61, KeyEvent.VK_A); + regularKeyCodesMap.put(0x62, KeyEvent.VK_B); + regularKeyCodesMap.put(0x63, KeyEvent.VK_C); + regularKeyCodesMap.put(0x64, KeyEvent.VK_D); + regularKeyCodesMap.put(0x65, KeyEvent.VK_E); + regularKeyCodesMap.put(0x66, KeyEvent.VK_F); + regularKeyCodesMap.put(0x67, KeyEvent.VK_G); + regularKeyCodesMap.put(0x68, KeyEvent.VK_H); + regularKeyCodesMap.put(0x69, KeyEvent.VK_I); + regularKeyCodesMap.put(0x6A, KeyEvent.VK_J); + regularKeyCodesMap.put(0x6B, KeyEvent.VK_K); + regularKeyCodesMap.put(0x6C, KeyEvent.VK_L); + regularKeyCodesMap.put(0x6D, KeyEvent.VK_M); + regularKeyCodesMap.put(0x6E, KeyEvent.VK_N); + regularKeyCodesMap.put(0x6F, KeyEvent.VK_O); regularKeyCodesMap.put(0x70, KeyEvent.VK_P); regularKeyCodesMap.put(0x71, KeyEvent.VK_Q); regularKeyCodesMap.put(0x72, KeyEvent.VK_R); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/FontDescriptor.java --- a/jdk/src/share/classes/sun/awt/FontDescriptor.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/FontDescriptor.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,7 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharset; import sun.nio.cs.HistoricallyNamedCharset; public class FontDescriptor implements Cloneable { @@ -104,8 +105,8 @@ if (useUnicode && unicodeEncoder == null) { try { this.unicodeEncoder = isLE? - Charset.forName("UTF_16LE").newEncoder(): - Charset.forName("UTF_16BE").newEncoder(); + StandardCharset.UTF_16LE.newEncoder(): + StandardCharset.UTF_16BE.newEncoder(); } catch (IllegalArgumentException x) {} } return useUnicode; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Sat May 14 11:52:15 2011 -0700 @@ -29,12 +29,10 @@ import java.awt.EventQueue; import java.awt.Image; import java.awt.Graphics; -import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.FlavorMap; import java.awt.datatransfer.FlavorTable; -import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; @@ -66,8 +64,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.security.AccessControlContext; -import java.security.AccessControlException; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; @@ -171,7 +167,26 @@ */ public static final DataFlavor javaTextEncodingFlavor; - private static SortedSet standardEncodings; + /** + * Lazy initialization of Standard Encodings. + */ + private static class StandardEncodingsHolder { + private static final SortedSet standardEncodings = load(); + + private static SortedSet load() { + final Comparator comparator = + new CharsetComparator(IndexedComparator.SELECT_WORST); + final SortedSet tempSet = new TreeSet(comparator); + tempSet.add("US-ASCII"); + tempSet.add("ISO-8859-1"); + tempSet.add("UTF-8"); + tempSet.add("UTF-16BE"); + tempSet.add("UTF-16LE"); + tempSet.add("UTF-16"); + tempSet.add(getDefaultTextCharset()); + return Collections.unmodifiableSortedSet(tempSet); + } + } /** * Tracks whether a particular text/* MIME type supports the charset @@ -509,18 +524,7 @@ * non-standard, character sets are not included. */ public static Iterator standardEncodings() { - if (standardEncodings == null) { - TreeSet tempSet = new TreeSet(defaultCharsetComparator); - tempSet.add("US-ASCII"); - tempSet.add("ISO-8859-1"); - tempSet.add("UTF-8"); - tempSet.add("UTF-16BE"); - tempSet.add("UTF-16LE"); - tempSet.add("UTF-16"); - tempSet.add(getDefaultTextCharset()); - standardEncodings = Collections.unmodifiableSortedSet(tempSet); - } - return standardEncodings.iterator(); + return StandardEncodingsHolder.standardEncodings.iterator(); } /** @@ -2398,7 +2402,9 @@ public static DataFlavor[] setToSortedDataFlavorArray(Set flavorsSet) { DataFlavor[] flavors = new DataFlavor[flavorsSet.size()]; flavorsSet.toArray(flavors); - Arrays.sort(flavors, defaultFlavorComparator); + final Comparator comparator = + new DataFlavorComparator(IndexedComparator.SELECT_WORST); + Arrays.sort(flavors, comparator); return flavors; } @@ -2455,11 +2461,6 @@ return new ArrayList(); } - private static CharsetComparator defaultCharsetComparator = - new CharsetComparator(IndexedComparator.SELECT_WORST); - private static DataFlavorComparator defaultFlavorComparator = - new DataFlavorComparator(IndexedComparator.SELECT_WORST); - /** * A Comparator which includes a helper function for comparing two Objects * which are likely to be keys in the specified Map. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/resources/awt_es.properties --- a/jdk/src/share/classes/sun/awt/resources/awt_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/resources/awt_es.properties Sat May 14 11:52:15 2011 -0700 @@ -175,7 +175,7 @@ AWT.HostInputMethodDisplayName=M\u00E9todos de Entrada del Sistema AWT.InputMethodLanguage.ja=Japon\u00E9s AWT.InputMethodLanguage.ko=Coreano -AWT.InputMethodLanguage.zh=Chino +AWT.InputMethodLanguage.zh=chino AWT.InputMethodLanguage.zh_CN=Chino Simplificado AWT.InputMethodLanguage.zh_TW=Chino Tradicional AWT.InputMethodCreationFailed=No se ha podido crear {0}. Motivo: {1} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_de.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_es.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_it.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,20 +24,20 @@ # # Translators please note do not translate the options themselves -java.launcher.opt.header = Syntax: {0} [-options] class [args...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-options] -jar jarfile [args...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n +java.launcher.opt.header = Syntax: {0} [-alternativ] class [argument...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-alternativ] -jar jarfile [argument...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n java.launcher.opt.datamodel =\ -d{0}\t anv\u00E4nd en {0}-bitsdatamodell om det finns\n java.launcher.opt.vmselect =\ {0}\t f\u00F6r att v\u00E4lja "{1}" VM\n -java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [deprecated]\n +java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [inaktuell]\n java.launcher.ergo.message1 =\ Standard-VM \u00E4r {0} java.launcher.ergo.message2 =\ eftersom du k\u00F6r en serverklassmaskin.\n # Translators please note do not translate the options themselves -java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-separerad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<name>=<value>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<value>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<libname>[=<options>]\n\ ladda ursprungligt agentbibliotek <libname>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jarpath>[=<options>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<imagepath>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference. +java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-avgr\u00E4nsad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<namn>=<v\u00E4rde>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<v\u00E4rde>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<paket>...|:<klass>]\n\ -enableassertions[:<paket>...|:<klass>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<klass>]\n\ -disableassertions[:<paket>...|:<klass>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<bibliotek>[=<alternativ>]\n\ ladda ursprungligt agentbibliotek <bibliotek>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<s\u00F6kv\u00E4g>[=<alternativ>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jar-s\u00F6kv\u00E4g>[=<alternativ>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<bilds\u00F6kv\u00E4g>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference. # Translators please note do not translate the options themselves -java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer separeras med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<file> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<size> ange initial storlek f\u00F6r Java-heap\n\ -Xmx<size> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<size> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delad klassdata\n\ -Xshare:auto anv\u00E4nd delad klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delad klassdata anv\u00E4nds, annars slutf\u00F6rs inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n +java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<fil> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<storlek> ange ursprunglig storlek f\u00F6r Java-heap\n\ -Xmx<storlek> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<storlek> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delade klassdata\n\ -Xshare:auto anv\u00E4nd delade klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delade klassdata anv\u00E4nds, annars slutf\u00F6r inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n java.launcher.cls.error1=Fel: Hittar inte eller kan inte ladda huvudklassen {0} java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n\ public static void main(String[] args) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/FloatingDecimal.java --- a/jdk/src/share/classes/sun/misc/FloatingDecimal.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/misc/FloatingDecimal.java Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ import sun.misc.FloatConsts; import java.util.regex.*; -public strictfp class FloatingDecimal{ +public class FloatingDecimal{ boolean isExceptional; boolean isNegative; int decExponent; @@ -239,8 +239,7 @@ * More difficult if subtracting and the argument * is a normalized a power of 2, as the ULP changes at these points. */ - private static double - ulp( double dval, boolean subtracting ){ + private static double ulp( double dval, boolean subtracting ){ long lbits = Double.doubleToLongBits( dval ) & ~signMask; int binexp = (int)(lbits >>> expShift); double ulpval; @@ -1251,8 +1250,7 @@ * for a single-precision float. */ - public double - doubleValue(){ + public strictfp double doubleValue(){ int kDigits = Math.min( nDigits, maxDecimalDigits+1 ); long lValue; double dValue; @@ -1611,8 +1609,7 @@ * ( because of the preference to a zero low-order bit ). */ - public float - floatValue(){ + public strictfp float floatValue(){ int kDigits = Math.min( nDigits, singleMaxDecimalDigits+1 ); int iValue; float fValue; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java --- a/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ import sun.misc.FloatConsts; import java.util.regex.*; -public strictfp class FormattedFloatingDecimal{ +public class FormattedFloatingDecimal{ boolean isExceptional; boolean isNegative; int decExponent; // value set at construction, then immutable @@ -247,8 +247,7 @@ * More difficult if subtracting and the argument * is a normalized a power of 2, as the ULP changes at these points. */ - private static double - ulp( double dval, boolean subtracting ){ + private static double ulp( double dval, boolean subtracting ){ long lbits = Double.doubleToLongBits( dval ) & ~signMask; int binexp = (int)(lbits >>> expShift); double ulpval; @@ -1157,8 +1156,7 @@ * for a single-precision float. */ - public double - doubleValue(){ + public strictfp double doubleValue(){ int kDigits = Math.min( nDigits, maxDecimalDigits+1 ); long lValue; double dValue; @@ -1517,8 +1515,7 @@ * ( because of the preference to a zero low-order bit ). */ - public float - floatValue(){ + public strictfp float floatValue(){ int kDigits = Math.min( nDigits, singleMaxDecimalDigits+1 ); int iValue; float fValue; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.misc; + +import javax.security.auth.kerberos.KeyTab; +import sun.security.krb5.EncryptionKey; +import sun.security.krb5.PrincipalName; + +/** + * An unsafe tunnel to get non-public access to classes in the + * javax.security.auth.kerberos package. + */ +public interface JavaxSecurityAuthKerberosAccess { + /** + * Returns keys for a principal in a keytab. + * @return the keys, never null, can be empty. + */ + public EncryptionKey[] keyTabGetEncryptionKeys( + KeyTab ktab, PrincipalName principal); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/SharedSecrets.java --- a/jdk/src/share/classes/sun/misc/SharedSecrets.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/misc/SharedSecrets.java Sat May 14 11:52:15 2011 -0700 @@ -29,6 +29,7 @@ import java.io.Console; import java.io.FileDescriptor; import java.security.ProtectionDomain; +import javax.security.auth.kerberos.KeyTab; import java.security.AccessController; @@ -51,6 +52,7 @@ private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess; private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess; private static JavaSecurityAccess javaSecurityAccess; + private static JavaxSecurityAuthKerberosAccess javaxSecurityAuthKerberosAccess; public static JavaUtilJarAccess javaUtilJarAccess() { if (javaUtilJarAccess == null) { @@ -139,4 +141,16 @@ } return javaSecurityAccess; } + + public static void setJavaxSecurityAuthKerberosAccess + (JavaxSecurityAuthKerberosAccess jsaka) { + javaxSecurityAuthKerberosAccess = jsaka; + } + + public static JavaxSecurityAuthKerberosAccess + getJavaxSecurityAuthKerberosAccess() { + if (javaxSecurityAuthKerberosAccess == null) + unsafe.ensureClassInitialized(KeyTab.class); + return javaxSecurityAuthKerberosAccess; + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/net/www/URLConnection.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/net/www/http/HttpClient.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/nio/cs/UTF_8.java --- a/jdk/src/share/classes/sun/nio/cs/UTF_8.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/nio/cs/UTF_8.java Sat May 14 11:52:15 2011 -0700 @@ -32,6 +32,7 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; +import java.nio.charset.CodingErrorAction; /* Legal UTF-8 Byte Sequences * @@ -77,7 +78,8 @@ dst.position(dp - dst.arrayOffset()); } - private static class Decoder extends CharsetDecoder { + private static class Decoder extends CharsetDecoder + implements ArrayDecoder { private Decoder(Charset cs) { super(cs, 1.0f, 1.0f); } @@ -353,9 +355,132 @@ else return decodeBufferLoop(src, dst); } + + private static ByteBuffer getByteBuffer(ByteBuffer bb, byte[] ba, int sp) + { + if (bb == null) + bb = ByteBuffer.wrap(ba); + bb.position(sp); + return bb; + } + + // returns -1 if there is malformed byte(s) and the + // "action" for malformed input is not REPLACE. + public int decode(byte[] sa, int sp, int len, char[] da) { + final int sl = sp + len; + int dp = 0; + int dlASCII = Math.min(len, da.length); + ByteBuffer bb = null; // only necessary if malformed + + // ASCII only optimized loop + while (dp < dlASCII && sa[sp] >= 0) + da[dp++] = (char) sa[sp++]; + + while (sp < sl) { + int b1 = sa[sp++]; + if (b1 >= 0) { + // 1 byte, 7 bits: 0xxxxxxx + da[dp++] = (char) b1; + } else if ((b1 >> 5) == -2) { + // 2 bytes, 11 bits: 110xxxxx 10xxxxxx + if (sp < sl) { + int b2 = sa[sp++]; + if (isMalformed2(b1, b2)) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp--; // malformedN(bb, 2) always returns 1 + } else { + da[dp++] = (char) (((b1 << 6) ^ b2)^ + (((byte) 0xC0 << 6) ^ + ((byte) 0x80 << 0))); + } + continue; + } + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + return dp; + } else if ((b1 >> 4) == -2) { + // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx + if (sp + 1 < sl) { + int b2 = sa[sp++]; + int b3 = sa[sp++]; + if (isMalformed3(b1, b2, b3)) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp -=3; + bb = getByteBuffer(bb, sa, sp); + sp += malformedN(bb, 3).length(); + } else { + da[dp++] = (char)((b1 << 12) ^ + (b2 << 6) ^ + (b3 ^ + (((byte) 0xE0 << 12) ^ + ((byte) 0x80 << 6) ^ + ((byte) 0x80 << 0)))); + } + continue; + } + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + return dp; + } else if ((b1 >> 3) == -2) { + // 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + if (sp + 2 < sl) { + int b2 = sa[sp++]; + int b3 = sa[sp++]; + int b4 = sa[sp++]; + int uc = ((b1 << 18) ^ + (b2 << 12) ^ + (b3 << 6) ^ + (b4 ^ + (((byte) 0xF0 << 18) ^ + ((byte) 0x80 << 12) ^ + ((byte) 0x80 << 6) ^ + ((byte) 0x80 << 0)))); + if (isMalformed4(b2, b3, b4) || + // shortest form check + !Character.isSupplementaryCodePoint(uc)) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp -= 4; + bb = getByteBuffer(bb, sa, sp); + sp += malformedN(bb, 4).length(); + } else { + da[dp++] = Character.highSurrogate(uc); + da[dp++] = Character.lowSurrogate(uc); + } + continue; + } + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + return dp; + } else { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp--; + bb = getByteBuffer(bb, sa, sp); + CoderResult cr = malformedN(bb, 1); + if (!cr.isError()) { + // leading byte for 5 or 6-byte, but don't have enough + // bytes in buffer to check. Consumed rest as malformed. + return dp; + } + sp += cr.length(); + } + } + return dp; + } } - private static class Encoder extends CharsetEncoder { + private static class Encoder extends CharsetEncoder + implements ArrayEncoder { private Encoder(Charset cs) { super(cs, 1.1f, 3.0f); @@ -495,5 +620,50 @@ else return encodeBufferLoop(src, dst); } + + // returns -1 if there is malformed char(s) and the + // "action" for malformed input is not REPLACE. + public int encode(char[] sa, int sp, int len, byte[] da) { + int sl = sp + len; + int dp = 0; + int dlASCII = dp + Math.min(len, da.length); + + // ASCII only optimized loop + while (dp < dlASCII && sa[sp] < '\u0080') + da[dp++] = (byte) sa[sp++]; + + while (sp < sl) { + char c = sa[sp++]; + if (c < 0x80) { + // Have at most seven bits + da[dp++] = (byte)c; + } else if (c < 0x800) { + // 2 bytes, 11 bits + da[dp++] = (byte)(0xc0 | (c >> 6)); + da[dp++] = (byte)(0x80 | (c & 0x3f)); + } else if (Character.isSurrogate(c)) { + if (sgp == null) + sgp = new Surrogate.Parser(); + int uc = sgp.parse(c, sa, sp - 1, sl); + if (uc < 0) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement()[0]; + } else { + da[dp++] = (byte)(0xf0 | ((uc >> 18))); + da[dp++] = (byte)(0x80 | ((uc >> 12) & 0x3f)); + da[dp++] = (byte)(0x80 | ((uc >> 6) & 0x3f)); + da[dp++] = (byte)(0x80 | (uc & 0x3f)); + sp++; // 2 chars + } + } else { + // 3 bytes, 16 bits + da[dp++] = (byte)(0xe0 | ((c >> 12))); + da[dp++] = (byte)(0x80 | ((c >> 6) & 0x3f)); + da[dp++] = (byte)(0x80 | (c & 0x3f)); + } + } + return dp; + } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_de.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Sat May 14 11:52:15 2011 -0700 @@ -18,11 +18,11 @@ button.properties.mnemonic=I # checkbox.collate=Sortieren -checkbox.collate.mnemonic=S +checkbox.collate.mnemonic=R checkbox.jobsheets=Bannerseite checkbox.jobsheets.mnemonic=B checkbox.printtofile=Ausgabe in Datei -checkbox.printtofile.mnemonic=D +checkbox.printtofile.mnemonic=U # dialog.printtitle=Drucken dialog.pstitle=Seite einrichten @@ -44,18 +44,18 @@ label.pstype=Typ: label.rangeto=Bis label.size=Gr\u00F6\u00DFe: -label.size.mnemonic=R +label.size.mnemonic=E label.source=Quelle: -label.source.mnemonic=Q +label.source.mnemonic=U label.status=Status: label.username=Benutzername: -label.username.mnemonic=B +label.username.mnemonic=U label.millimetres=(mm) label.inches=(Zoll) label.topmargin=oben label.topmargin.mnemonic=O label.bottommargin=unten -label.bottommargin.mnemonic=U +label.bottommargin.mnemonic=N label.leftmargin=links label.leftmargin.mnemonic=L label.rightmargin=rechts @@ -66,7 +66,7 @@ radiobutton.draftq=Entwurf radiobutton.draftq.mnemonic=W radiobutton.duplex=Duplex -radiobutton.duplex.mnemonic=D +radiobutton.duplex.mnemonic=P radiobutton.highq=Hoch radiobutton.highq.mnemonic=H radiobutton.landscape=Querformat @@ -78,15 +78,15 @@ radiobutton.oneside=Einseitig radiobutton.oneside.mnemonic=E radiobutton.portrait=Hochformat -radiobutton.portrait.mnemonic=M +radiobutton.portrait.mnemonic=H radiobutton.rangeall=Alle radiobutton.rangeall.mnemonic=L radiobutton.rangepages=Seiten radiobutton.rangepages.mnemonic=E radiobutton.revlandscape=Umgekehrtes Querformat -radiobutton.revlandscape.mnemonic=U +radiobutton.revlandscape.mnemonic=M radiobutton.revportrait=Umgekehrtes Hochformat -radiobutton.revportrait.mnemonic=H +radiobutton.revportrait.mnemonic=K radiobutton.tumble=Kalenderdruck radiobutton.tumble.mnemonic=K # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Allgemein tab.general.vkMnemonic=65 tab.pagesetup=Seite einrichten -tab.pagesetup.vkMnemonic=69 +tab.pagesetup.vkMnemonic=83 # error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10) error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_es.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Sat May 14 11:52:15 2011 -0700 @@ -20,7 +20,7 @@ checkbox.collate=Intercalar checkbox.collate.mnemonic=C checkbox.jobsheets=P\u00E1gina de R\u00F3tulo -checkbox.jobsheets.mnemonic=L +checkbox.jobsheets.mnemonic=E checkbox.printtofile=Imprimir en Archivo checkbox.printtofile.mnemonic=M # @@ -34,7 +34,7 @@ # label.info=Informaci\u00F3n: label.jobname=Nombre del Trabajo: -label.jobname.mnemonic=N +label.jobname.mnemonic=T label.numcopies=N\u00FAmero de Copias: label.numcopies.mnemonic=O label.priority=Prioridad: @@ -44,12 +44,12 @@ label.pstype=Tipo: label.rangeto=A label.size=Tama\u00F1o: -label.size.mnemonic=\ +label.size.mnemonic=T label.source=Origen: -label.source.mnemonic=G +label.source.mnemonic=O label.status=Estado: label.username=Usuario: -label.username.mnemonic=U +label.username.mnemonic=S label.millimetres=(mm) label.inches=(pulg.) label.topmargin=superior @@ -68,7 +68,7 @@ radiobutton.duplex=D\u00FAplex radiobutton.duplex.mnemonic=D radiobutton.highq=Alta -radiobutton.highq.mnemonic=A +radiobutton.highq.mnemonic=L radiobutton.landscape=Horizontal radiobutton.landscape.mnemonic=Z radiobutton.monochrome=Monocromo @@ -76,7 +76,7 @@ radiobutton.normalq=Normal radiobutton.normalq.mnemonic=N radiobutton.oneside=Una Cara -radiobutton.oneside.mnemonic=R +radiobutton.oneside.mnemonic=U radiobutton.portrait=Vertical radiobutton.portrait.mnemonic=V radiobutton.rangeall=Todo @@ -86,7 +86,7 @@ radiobutton.revlandscape=Horizontal Inverso radiobutton.revlandscape.mnemonic=H radiobutton.revportrait=Vertical Inverso -radiobutton.revportrait.mnemonic=S +radiobutton.revportrait.mnemonic=R radiobutton.tumble=Cambio de Cara radiobutton.tumble.mnemonic=B # The vkMnemonics correspond with the constants defined in KeyEvent, eg diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_fr.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -49,7 +49,7 @@ label.source.mnemonic=C label.status=Statut : label.username=Nom utilisateur : -label.username.mnemonic=U +label.username.mnemonic=O label.millimetres=(mm) label.inches=(po) label.topmargin=haut @@ -62,7 +62,7 @@ label.rightmargin.mnemonic=D # radiobutton.color=Couleur -radiobutton.color.mnemonic=U +radiobutton.color.mnemonic=C radiobutton.draftq=Brouillon radiobutton.draftq.mnemonic=L radiobutton.duplex=Duplex @@ -70,7 +70,7 @@ radiobutton.highq=Max. radiobutton.highq.mnemonic=X radiobutton.landscape=Paysage -radiobutton.landscape.mnemonic=S +radiobutton.landscape.mnemonic=Y radiobutton.monochrome=Monochrome radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normal diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_it.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Sat May 14 11:52:15 2011 -0700 @@ -20,7 +20,7 @@ checkbox.collate=Fascicola checkbox.collate.mnemonic=L checkbox.jobsheets=Pagina banner -checkbox.jobsheets.mnemonic=B +checkbox.jobsheets.mnemonic=P checkbox.printtofile=Stampa su file checkbox.printtofile.mnemonic=F # @@ -38,7 +38,7 @@ label.numcopies=Numero di copie: label.numcopies.mnemonic=O label.priority=Priorit\u00E0: -label.priority.mnemonic=R +label.priority.mnemonic=I label.psname=Nome: label.psname.mnemonic=N label.pstype=Tipo: @@ -72,7 +72,7 @@ radiobutton.landscape=Orizzontale radiobutton.landscape.mnemonic=L radiobutton.monochrome=Monocromatico -radiobutton.monochrome.mnemonic=A +radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normale radiobutton.normalq.mnemonic=N radiobutton.oneside=Un lato diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -15,10 +15,10 @@ button.ok=OK button.print=Imprimir button.properties=Propriedades... -button.properties.mnemonic=R +button.properties.mnemonic=D # checkbox.collate=Agrupar -checkbox.collate.mnemonic=A +checkbox.collate.mnemonic=R checkbox.jobsheets=P\u00E1gina com Banner checkbox.jobsheets.mnemonic=B checkbox.printtofile=Imprimir em Arquivo @@ -38,7 +38,7 @@ label.numcopies=N\u00FAmero de c\u00F3pias: label.numcopies.mnemonic=O label.priority=Prioridade: -label.priority.mnemonic=R +label.priority.mnemonic=P label.psname=Nome: label.psname.mnemonic=N label.pstype=Tipo: @@ -59,7 +59,7 @@ label.leftmargin=esquerda: label.leftmargin.mnemonic=Q label.rightmargin=direita -label.rightmargin.mnemonic=R +label.rightmargin.mnemonic=D # radiobutton.color=Cor radiobutton.color.mnemonic=O @@ -68,7 +68,7 @@ radiobutton.duplex=Duplex radiobutton.duplex.mnemonic=D radiobutton.highq=Alta -radiobutton.highq.mnemonic=A +radiobutton.highq.mnemonic=T radiobutton.landscape=Paisagem radiobutton.landscape.mnemonic=P radiobutton.monochrome=Monocrom\u00E1tico @@ -76,7 +76,7 @@ radiobutton.normalq=Normal radiobutton.normalq.mnemonic=N radiobutton.oneside=Um Lado -radiobutton.oneside.mnemonic=O +radiobutton.oneside.mnemonic=L radiobutton.portrait=Retrato radiobutton.portrait.mnemonic=R radiobutton.rangeall=Tudo @@ -86,7 +86,7 @@ radiobutton.revlandscape=Paisagem Invertida radiobutton.revlandscape.mnemonic=N radiobutton.revportrait=Retrato Invertido -radiobutton.revportrait.mnemonic=I +radiobutton.revportrait.mnemonic=E radiobutton.tumble=Virar radiobutton.tumble.mnemonic=V # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Geral tab.general.vkMnemonic=71 tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina -tab.pagesetup.vkMnemonic=80 +tab.pagesetup.vkMnemonic=67 # error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10) error.destination=Nome de arquivo inv\u00E1lido; tente novamente diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_sv.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -15,14 +15,14 @@ button.ok=OK button.print=Skriv ut button.properties=Egenskaper... -button.properties.mnemonic=E +button.properties.mnemonic=R # checkbox.collate=Sortera -checkbox.collate.mnemonic=S +checkbox.collate.mnemonic=T checkbox.jobsheets=F\u00F6rs\u00E4ttsblad -checkbox.jobsheets.mnemonic=F +checkbox.jobsheets.mnemonic=R checkbox.printtofile=Skriv ut till fil -checkbox.printtofile.mnemonic=F +checkbox.printtofile.mnemonic=K # dialog.printtitle=Skriv ut dialog.pstitle=Utskriftsformat @@ -33,38 +33,38 @@ dialog.writeerror=Kan inte skriva till filen: # label.info=Information: -label.jobname=Jobbnamn -label.jobname.mnemonic=J -label.numcopies=Antal exemplar +label.jobname=Utskrift: +label.jobname.mnemonic=U +label.numcopies=Antal exemplar: label.numcopies.mnemonic=E -label.priority=Prioritet +label.priority=Prioritet: label.priority.mnemonic=R label.psname=Namn: label.psname.mnemonic=N label.pstype=Typ: label.rangeto=Till label.size=Storlek: -label.size.mnemonic=L -label.source=K\u00E4lla -label.source.mnemonic=L +label.size.mnemonic=O +label.source=K\u00E4lla: +label.source.mnemonic=K label.status=Status: label.username=Anv\u00E4ndarnamn: label.username.mnemonic=N label.millimetres=(mm) label.inches=(tum) label.topmargin=\u00F6verkant -label.topmargin.mnemonic=\ +label.topmargin.mnemonic=R label.bottommargin=nederkant label.bottommargin.mnemonic=N label.leftmargin=v\u00E4nster -label.leftmargin.mnemonic=\ +label.leftmargin.mnemonic=V label.rightmargin=h\u00F6ger label.rightmargin.mnemonic=H # radiobutton.color=F\u00E4rg -radiobutton.color.mnemonic=F +radiobutton.color.mnemonic=G radiobutton.draftq=Utkast -radiobutton.draftq.mnemonic=S +radiobutton.draftq.mnemonic=K radiobutton.duplex=Dubbelsidig radiobutton.duplex.mnemonic=D radiobutton.highq=H\u00F6g @@ -74,19 +74,19 @@ radiobutton.monochrome=Monokrom radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normal -radiobutton.normalq.mnemonic=N +radiobutton.normalq.mnemonic=O radiobutton.oneside=Ensidig radiobutton.oneside.mnemonic=E radiobutton.portrait=St\u00E5ende -radiobutton.portrait.mnemonic=S +radiobutton.portrait.mnemonic=D radiobutton.rangeall=Alla radiobutton.rangeall.mnemonic=L radiobutton.rangepages=Sidor -radiobutton.rangepages.mnemonic=O +radiobutton.rangepages.mnemonic=D radiobutton.revlandscape=Omv\u00E4nt liggande radiobutton.revlandscape.mnemonic=G radiobutton.revportrait=Omv\u00E4nt st\u00E5ende -radiobutton.revportrait.mnemonic=D +radiobutton.revportrait.mnemonic=M radiobutton.tumble=V\u00E4nd radiobutton.tumble.mnemonic=V # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Allm\u00E4nt tab.general.vkMnemonic=65 tab.pagesetup=Utskriftsformat -tab.pagesetup.vkMnemonic=70 +tab.pagesetup.vkMnemonic=83 # error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10) error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/rmi/log/ReliableLog.java --- a/jdk/src/share/classes/sun/rmi/log/ReliableLog.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/rmi/log/ReliableLog.java Sat May 14 11:52:15 2011 -0700 @@ -380,9 +380,7 @@ } catch (IOException e) { throw e; } catch (Exception e) { - throw new IOException("snapshot failed with exception of type: " + - e.getClass().getName() + - ", message was: " + e.getMessage()); + throw new IOException("snapshot failed", e); } lastSnapshot = System.currentTimeMillis(); } finally { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/rmi/server/Activation.java --- a/jdk/src/share/classes/sun/rmi/server/Activation.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/rmi/server/Activation.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; import java.io.OutputStream; import java.io.PrintStream; import java.io.PrintWriter; @@ -98,6 +99,7 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import sun.rmi.log.LogHandler; import sun.rmi.log.ReliableLog; import sun.rmi.registry.RegistryImpl; @@ -147,10 +149,10 @@ /** maps activation id to its respective group id */ private Map<ActivationID,ActivationGroupID> idTable = - new HashMap<ActivationID,ActivationGroupID>(); + new ConcurrentHashMap<>(); /** maps group id to its GroupEntry groups */ private Map<ActivationGroupID,GroupEntry> groupTable = - new HashMap<ActivationGroupID,GroupEntry>(); + new ConcurrentHashMap<>(); private byte majorVersion = MAJOR_VERSION; private byte minorVersion = MINOR_VERSION; @@ -236,9 +238,11 @@ groupSemaphore = getInt("sun.rmi.activation.groupThrottle", 3); groupCounter = 0; Runtime.getRuntime().addShutdownHook(shutdownHook); + + // Use array size of 0, since the value from calling size() + // may be out of date by the time toArray() is called. ActivationGroupID[] gids = - groupTable.keySet().toArray( - new ActivationGroupID[groupTable.size()]); + groupTable.keySet().toArray(new ActivationGroupID[0]); synchronized (startupLock = new Object()) { // all the remote methods briefly synchronize on startupLock @@ -274,6 +278,23 @@ } } + /** + * Previous versions used HashMap instead of ConcurrentHashMap. + * Replace any HashMaps found during deserialization with + * ConcurrentHashMaps. + */ + private void readObject(ObjectInputStream ois) + throws IOException, ClassNotFoundException + { + ois.defaultReadObject(); + if (! (groupTable instanceof ConcurrentHashMap)) { + groupTable = new ConcurrentHashMap<>(groupTable); + } + if (! (idTable instanceof ConcurrentHashMap)) { + idTable = new ConcurrentHashMap<>(idTable); + } + } + private static class SystemRegistryImpl extends RegistryImpl { private static final String NAME = ActivationSystem.class.getName(); @@ -488,9 +509,7 @@ ActivationGroupID id = new ActivationGroupID(systemStub); GroupEntry entry = new GroupEntry(id, desc); // table insertion must take place before log update - synchronized (groupTable) { - groupTable.put(id, entry); - } + groupTable.put(id, entry); addLogRecord(new LogRegisterGroup(id, desc)); return id; } @@ -515,11 +534,7 @@ // remove entry before unregister so state is updated before // logged - synchronized (groupTable) { - GroupEntry entry = getGroupEntry(id); - groupTable.remove(id); - entry.unregisterGroup(true); - } + removeGroupEntry(id).unregisterGroup(true); } public ActivationDesc setActivationDesc(ActivationID id, @@ -637,12 +652,7 @@ unexport(system); // destroy all child processes (groups) - GroupEntry[] groupEntries; - synchronized (groupTable) { - groupEntries = groupTable.values(). - toArray(new GroupEntry[groupTable.size()]); - } - for (GroupEntry groupEntry : groupEntries) { + for (GroupEntry groupEntry : groupTable.values()) { groupEntry.shutdown(); } @@ -693,10 +703,8 @@ } // destroy all child processes (groups) quickly - synchronized (groupTable) { - for (GroupEntry groupEntry : groupTable.values()) { - groupEntry.shutdownFast(); - } + for (GroupEntry groupEntry : groupTable.values()) { + groupEntry.shutdownFast(); } } } @@ -708,13 +716,32 @@ private ActivationGroupID getGroupID(ActivationID id) throws UnknownObjectException { - synchronized (idTable) { - ActivationGroupID groupID = idTable.get(id); - if (groupID != null) { - return groupID; + ActivationGroupID groupID = idTable.get(id); + if (groupID != null) { + return groupID; + } + throw new UnknownObjectException("unknown object: " + id); + } + + /** + * Returns the group entry for the group id, optionally removing it. + * Throws UnknownGroupException if the group is not registered. + */ + private GroupEntry getGroupEntry(ActivationGroupID id, boolean rm) + throws UnknownGroupException + { + if (id.getClass() == ActivationGroupID.class) { + GroupEntry entry; + if (rm) { + entry = groupTable.remove(id); + } else { + entry = groupTable.get(id); + } + if (entry != null && !entry.removed) { + return entry; } } - throw new UnknownObjectException("unknown object: " + id); + throw new UnknownGroupException("group unknown"); } /** @@ -724,15 +751,17 @@ private GroupEntry getGroupEntry(ActivationGroupID id) throws UnknownGroupException { - if (id.getClass() == ActivationGroupID.class) { - synchronized (groupTable) { - GroupEntry entry = groupTable.get(id); - if (entry != null && !entry.removed) { - return entry; - } - } - } - throw new UnknownGroupException("group unknown"); + return getGroupEntry(id, false); + } + + /** + * Removes and returns the group entry for the group id. Throws + * UnknownGroupException if the group is not registered. + */ + private GroupEntry removeGroupEntry(ActivationGroupID id) + throws UnknownGroupException + { + return getGroupEntry(id, true); } /** @@ -744,11 +773,9 @@ throws UnknownObjectException { ActivationGroupID gid = getGroupID(id); - synchronized (groupTable) { - GroupEntry entry = groupTable.get(gid); - if (entry != null) { - return entry; - } + GroupEntry entry = groupTable.get(gid); + if (entry != null && !entry.removed) { + return entry; } throw new UnknownObjectException("object's group removed"); } @@ -882,9 +909,7 @@ } // table insertion must take place before log update - synchronized (idTable) { - idTable.put(id, groupID); - } + idTable.put(id, groupID); if (addRecord) { addLogRecord(new LogRegisterObject(id, desc)); @@ -901,10 +926,8 @@ restartSet.remove(id); } - // table insertion must take place before log update - synchronized (idTable) { - idTable.remove(id); - } + // table removal must take place before log update + idTable.remove(id); if (addRecord) { addLogRecord(new LogUnregisterObject(id)); } @@ -919,9 +942,7 @@ objects.entrySet()) { ActivationID id = entry.getKey(); - synchronized (idTable) { - idTable.remove(id); - } + idTable.remove(id); ObjectEntry objEntry = entry.getValue(); objEntry.removed = true; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties --- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties Sat May 14 11:52:15 2011 -0700 @@ -93,4 +93,4 @@ rmid.log.snapshot.warning=\nrmid: (GRAVE) la instant\u00E1nea del log indica: # "rmid" should not be translated -rmid.log.recover.warning=\nrmid: (ADVERTENCIA) {0}: saltando el registro del log durante la recuperaci\u00F3n: +rmid.log.recover.warning=\nrmid: (ADVERTENCIA) {0}: se omitir\u00E1 el registro del log durante la recuperaci\u00F3n: diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java --- a/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, 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 @@ -121,15 +121,16 @@ } random.nextBytes(seed); - long[] handles = generateECKeyPair(keySize, encodedParams, seed); + try { - // The 'params' object supplied above is equivalent to the native one - // so there is no need to fetch it. + long[] handles = generateECKeyPair(keySize, encodedParams, seed); - // handles[0] points to the native private key - BigInteger s = new BigInteger(1, getEncodedBytes(handles[0])); + // The 'params' object supplied above is equivalent to the native + // one so there is no need to fetch it. - try { + // handles[0] points to the native private key + BigInteger s = new BigInteger(1, getEncodedBytes(handles[0])); + PrivateKey privateKey = new ECPrivateKeyImpl(s, (ECParameterSpec)params); @@ -163,7 +164,7 @@ * The first handle points to the private key, the second to the public key. */ private static native long[] generateECKeyPair(int keySize, - byte[] encodedParams, byte[] seed); + byte[] encodedParams, byte[] seed) throws GeneralSecurityException; /* * Extracts the encoded key data using the supplied handle. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java --- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,6 @@ import sun.security.jgss.GSSCaller; import sun.security.jgss.spi.*; import sun.security.krb5.*; -import javax.security.auth.kerberos.*; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.security.AccessController; @@ -43,40 +42,23 @@ * @since 1.4 */ public class Krb5AcceptCredential - extends KerberosKey implements Krb5CredElement { private static final long serialVersionUID = 7714332137352567952L; private Krb5NameElement name; - /** - * We cache an EncryptionKey representation of this key because many - * Krb5 operation require a key in that form. At some point we might do - * away with EncryptionKey altogether and use the base class - * KerberosKey everywhere. - */ - private EncryptionKey[] krb5EncryptionKeys; + private Krb5Util.ServiceCreds screds; - private Krb5AcceptCredential(Krb5NameElement name, KerberosKey[] keys) { + private Krb5AcceptCredential(Krb5NameElement name, Krb5Util.ServiceCreds creds) { /* * Initialize this instance with the data from the acquired * KerberosKey. This class needs to be a KerberosKey too * hence we can't just store a reference. */ - super(keys[0].getPrincipal(), - keys[0].getEncoded(), - keys[0].getKeyType(), - keys[0].getVersionNumber()); this.name = name; - // Cache this for later use by the sun.security.krb5 package. - krb5EncryptionKeys = new EncryptionKey[keys.length]; - for (int i = 0; i < keys.length; i++) { - krb5EncryptionKeys[i] = new EncryptionKey(keys[i].getEncoded(), - keys[i].getKeyType(), - new Integer(keys[i].getVersionNumber())); - } + this.screds = creds; } static Krb5AcceptCredential getInstance(final GSSCaller caller, Krb5NameElement name) @@ -86,12 +68,12 @@ name.getKrb5PrincipalName().getName()); final AccessControlContext acc = AccessController.getContext(); - KerberosKey[] keys; + Krb5Util.ServiceCreds creds = null; try { - keys = AccessController.doPrivileged( - new PrivilegedExceptionAction<KerberosKey[]>() { - public KerberosKey[] run() throws Exception { - return Krb5Util.getKeys( + creds = AccessController.doPrivileged( + new PrivilegedExceptionAction<Krb5Util.ServiceCreds>() { + public Krb5Util.ServiceCreds run() throws Exception { + return Krb5Util.getServiceCreds( caller == GSSCaller.CALLER_UNKNOWN ? GSSCaller.CALLER_ACCEPT: caller, serverPrinc, acc); }}); @@ -103,17 +85,17 @@ throw ge; } - if (keys == null || keys.length == 0) + if (creds == null) throw new GSSException(GSSException.NO_CRED, -1, - "Failed to find any Kerberos Key"); + "Failed to find any Kerberos credentails"); if (name == null) { - String fullName = keys[0].getPrincipal().getName(); + String fullName = creds.getName(); name = Krb5NameElement.getInstance(fullName, Krb5MechFactory.NT_GSS_KRB5_PRINCIPAL); } - return new Krb5AcceptCredential(name, keys); + return new Krb5AcceptCredential(name, creds); } /** @@ -171,7 +153,7 @@ } EncryptionKey[] getKrb5EncryptionKeys() { - return krb5EncryptionKeys; + return screds.getEKeys(); } /** @@ -193,13 +175,6 @@ * destroy in the base class. */ public void destroy() throws DestroyFailedException { - if (krb5EncryptionKeys != null) { - for (int i = 0; i < krb5EncryptionKeys.length; i++) { - krb5EncryptionKeys[i].destroy(); - } - krb5EncryptionKeys = null; - } - - super.destroy(); + screds.destroy(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java --- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ import javax.security.auth.kerberos.KerberosTicket; import javax.security.auth.kerberos.KerberosKey; import javax.security.auth.kerberos.KerberosPrincipal; +import javax.security.auth.kerberos.KeyTab; import javax.security.auth.Subject; import javax.security.auth.login.LoginException; import java.security.AccessControlContext; @@ -38,7 +39,13 @@ import sun.security.krb5.EncryptionKey; import sun.security.krb5.KrbException; import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.Objects; +import java.util.Set; +import sun.misc.SharedSecrets; +import sun.security.krb5.PrincipalName; /** * Utilities for obtaining and converting Kerberos tickets. * @@ -75,7 +82,7 @@ // 1. Try to find service ticket in acc subject Subject accSubj = Subject.getSubject(acc); - KerberosTicket ticket = (KerberosTicket) SubjectComber.find(accSubj, + KerberosTicket ticket = SubjectComber.find(accSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); if (ticket != null) { @@ -87,7 +94,7 @@ // 2. Try to get ticket from login try { loginSubj = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); - ticket = (KerberosTicket) SubjectComber.find(loginSubj, + ticket = SubjectComber.find(loginSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); if (ticket != null) { return ticket; // found it @@ -102,13 +109,13 @@ // Try to get TGT to acquire service ticket // 3. Try to get TGT from acc subject - KerberosTicket tgt = (KerberosTicket) SubjectComber.find(accSubj, + KerberosTicket tgt = SubjectComber.find(accSubj, tgsPrincipal, clientPrincipal, KerberosTicket.class); boolean fromAcc; if (tgt == null && loginSubj != null) { // 4. Try to get TGT from login subject - tgt = (KerberosTicket) SubjectComber.find(loginSubj, + tgt = SubjectComber.find(loginSubj, tgsPrincipal, clientPrincipal, KerberosTicket.class); fromAcc = false; } else { @@ -145,14 +152,14 @@ // Try to get ticket from acc's Subject Subject accSubj = Subject.getSubject(acc); - KerberosTicket ticket = (KerberosTicket) + KerberosTicket ticket = SubjectComber.find(accSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); // Try to get ticket from Subject obtained from GSSUtil if (ticket == null && !GSSUtil.useSubjectCredsOnly(caller)) { Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); - ticket = (KerberosTicket) SubjectComber.find(subject, + ticket = SubjectComber.find(subject, serverPrincipal, clientPrincipal, KerberosTicket.class); } return ticket; @@ -182,37 +189,152 @@ return subject; } + // A special KerberosKey, used as keys read from a KeyTab object. + // Each time new keys are read from KeyTab objects in the private + // credentials set, old ones are removed and new ones added. + public static class KeysFromKeyTab extends KerberosKey { + public KeysFromKeyTab(KerberosKey key) { + super(key.getPrincipal(), key.getEncoded(), + key.getKeyType(), key.getVersionNumber()); + } + } + /** - * Retrieves the keys for the specified server principal from - * the Subject in the specified AccessControlContext. - * If the ticket can not be found in the Subject, and if - * useSubjectCredsOnly is false, then obtain keys from - * a LoginContext. + * Credentials of a service, the private secret to authenticate its + * identity, which can be: + * 1. Some KerberosKeys (generated from password) + * 2. A KeyTab (for a typical service) + * 3. A TGT (for a user2user service. Not supported yet) * - * NOTE: This method is used by JSSE Kerberos Cipher Suites + * Note that some creds can coexist. For example, a user2user service + * can use its keytab (or keys) if the client can successfully obtain a + * normal service ticket, otherwise, it can uses the TGT (actually, the + * session key of the TGT) if the client can only acquire a service ticket + * of ENC-TKT-IN-SKEY style. */ - public static KerberosKey[] getKeys(GSSCaller caller, + public static class ServiceCreds { + private KerberosPrincipal kp; + private List<KeyTab> ktabs; + private List<KerberosKey> kk; + private Subject subj; + //private KerberosTicket tgt; // user2user, not supported yet + + private static ServiceCreds getInstance( + Subject subj, String serverPrincipal) { + + ServiceCreds sc = new ServiceCreds(); + sc.subj = subj; + + for (KerberosPrincipal p: subj.getPrincipals(KerberosPrincipal.class)) { + if (serverPrincipal == null || + p.getName().equals(serverPrincipal)) { + sc.kp = p; + serverPrincipal = p.getName(); + break; + } + } + if (sc.kp == null) { + // Compatibility with old behavior: even when there is no + // KerberosPrincipal, we can find one from KerberosKeys + List<KerberosKey> keys = SubjectComber.findMany( + subj, null, null, KerberosKey.class); + if (!keys.isEmpty()) { + sc.kp = keys.get(0).getPrincipal(); + serverPrincipal = sc.kp.getName(); + if (DEBUG) { + System.out.println(">>> ServiceCreds: no kp?" + + " find one from kk: " + serverPrincipal); + } + } else { + return null; + } + } + sc.ktabs = SubjectComber.findMany( + subj, null, null, KeyTab.class); + sc.kk = SubjectComber.findMany( + subj, serverPrincipal, null, KerberosKey.class); + if (sc.ktabs.isEmpty() && sc.kk.isEmpty()) { + return null; + } + return sc; + } + + public String getName() { + return kp.getName(); + } + + public KerberosKey[] getKKeys() { + if (ktabs.isEmpty()) { + return kk.toArray(new KerberosKey[kk.size()]); + } else { + List<KerberosKey> keys = new ArrayList<>(); + for (KeyTab ktab: ktabs) { + for (KerberosKey k: ktab.getKeys(kp)) { + keys.add(k); + } + } + // Compatibility: also add keys to privCredSet. Remove old + // ones first, only remove those from keytab. + if (!subj.isReadOnly()) { + Set<Object> pcs = subj.getPrivateCredentials(); + synchronized (pcs) { + Iterator<Object> iterator = pcs.iterator(); + while (iterator.hasNext()) { + Object obj = iterator.next(); + if (obj instanceof KeysFromKeyTab) { + KerberosKey key = (KerberosKey)obj; + if (Objects.equals(key.getPrincipal(), kp)) { + iterator.remove(); + } + } + } + } + for (KerberosKey key: keys) { + subj.getPrivateCredentials().add(new KeysFromKeyTab(key)); + } + } + return keys.toArray(new KerberosKey[keys.size()]); + } + } + + public EncryptionKey[] getEKeys() { + KerberosKey[] kkeys = getKKeys(); + EncryptionKey[] ekeys = new EncryptionKey[kkeys.length]; + for (int i=0; i<ekeys.length; i++) { + ekeys[i] = new EncryptionKey( + kkeys[i].getEncoded(), kkeys[i].getKeyType(), + new Integer(kkeys[i].getVersionNumber())); + } + return ekeys; + } + + public void destroy() { + kp = null; + ktabs = null; + kk = null; + } + } + /** + * Retrieves the ServiceCreds for the specified server principal from + * the Subject in the specified AccessControlContext. If not found, and if + * useSubjectCredsOnly is false, then obtain from a LoginContext. + * + * NOTE: This method is also used by JSSE Kerberos Cipher Suites + */ + public static ServiceCreds getServiceCreds(GSSCaller caller, String serverPrincipal, AccessControlContext acc) throws LoginException { Subject accSubj = Subject.getSubject(acc); - List<KerberosKey> kkeys = (List<KerberosKey>)SubjectComber.findMany( - accSubj, serverPrincipal, null, KerberosKey.class); - - if (kkeys == null && !GSSUtil.useSubjectCredsOnly(caller)) { - Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); - kkeys = (List<KerberosKey>) SubjectComber.findMany(subject, - serverPrincipal, null, KerberosKey.class); + ServiceCreds sc = null; + if (accSubj != null) { + sc = ServiceCreds.getInstance(accSubj, serverPrincipal); } - - int len; - if (kkeys != null && (len = kkeys.size()) > 0) { - KerberosKey[] keys = new KerberosKey[len]; - kkeys.toArray(keys); - return keys; - } else { - return null; + if (sc == null && !GSSUtil.useSubjectCredsOnly(caller)) { + Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); + sc = ServiceCreds.getInstance(subject, serverPrincipal); } + return sc; } public static KerberosTicket credsToTicket(Credentials serviceCreds) { @@ -247,4 +369,17 @@ kerbTicket.getRenewTill(), kerbTicket.getClientAddresses()); } + + /** + * A helper method to get EncryptionKeys from a javax..KeyTab + * @param ktab the javax..KeyTab class + * @param cname the PrincipalName + * @return the EKeys, never null, might be empty + */ + public static EncryptionKey[] keysFromJavaxKeyTab( + KeyTab ktab, PrincipalName cname) { + return SharedSecrets.getJavaxSecurityAuthKerberosAccess(). + keyTabGetEncryptionKeys(ktab, cname); + } + } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java --- a/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,10 +33,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.security.auth.kerberos.KeyTab; /** - * This utility looks through the current Subject and retrieves a ticket or key - * for the desired client/server principals. + * This utility looks through the current Subject and retrieves private + * credentials for the desired client/server principals. * * @author Ram Marti * @since 1.4.2 @@ -52,58 +53,70 @@ private SubjectComber() { // Cannot create one of these } - static Object find(Subject subject, String serverPrincipal, - String clientPrincipal, Class credClass) { + static <T> T find(Subject subject, String serverPrincipal, + String clientPrincipal, Class<T> credClass) { - return findAux(subject, serverPrincipal, clientPrincipal, credClass, + return (T)findAux(subject, serverPrincipal, clientPrincipal, credClass, true); } - static Object findMany(Subject subject, String serverPrincipal, - String clientPrincipal, Class credClass) { + static <T> List<T> findMany(Subject subject, String serverPrincipal, + String clientPrincipal, Class<T> credClass) { - return findAux(subject, serverPrincipal, clientPrincipal, credClass, + return (List<T>)findAux(subject, serverPrincipal, clientPrincipal, credClass, false); } /** - * Find the ticket or key for the specified client/server principals + * Find private credentials for the specified client/server principals * in the subject. Returns null if the subject is null. * - * @return the ticket or key + * @return the private credentials */ - private static Object findAux(Subject subject, String serverPrincipal, - String clientPrincipal, Class credClass, boolean oneOnly) { + private static <T> Object findAux(Subject subject, String serverPrincipal, + String clientPrincipal, Class<T> credClass, boolean oneOnly) { if (subject == null) { return null; } else { - List<Object> answer = (oneOnly ? null : new ArrayList<Object>()); + List<T> answer = (oneOnly ? null : new ArrayList<T>()); - if (credClass == KerberosKey.class) { - // We are looking for a KerberosKey credentials for the - // serverPrincipal - Iterator<KerberosKey> iterator = - subject.getPrivateCredentials(KerberosKey.class).iterator(); + if (credClass == KeyTab.class) { // Principal un-related + // We are looking for credentials unrelated to serverPrincipal + Iterator<T> iterator = + subject.getPrivateCredentials(credClass).iterator(); while (iterator.hasNext()) { - KerberosKey key = iterator.next(); - if (serverPrincipal == null || - serverPrincipal.equals(key.getPrincipal().getName())) { + T t = iterator.next(); + if (DEBUG) { + System.out.println("Found " + credClass.getSimpleName()); + } + if (oneOnly) { + return t; + } else { + answer.add(t); + } + } + } else if (credClass == KerberosKey.class) { + // We are looking for credentials for the serverPrincipal + Iterator<T> iterator = + subject.getPrivateCredentials(credClass).iterator(); + while (iterator.hasNext()) { + T t = iterator.next(); + String name = ((KerberosKey)t).getPrincipal().getName(); + if (serverPrincipal == null || serverPrincipal.equals(name)) { if (DEBUG) { - System.out.println("Found key for " - + key.getPrincipal() + "(" + - key.getKeyType() + ")"); + System.out.println("Found " + + credClass.getSimpleName() + " for " + name); } if (oneOnly) { - return key; + return t; } else { if (serverPrincipal == null) { // Record name so that keys returned will all // belong to the same principal - serverPrincipal = - key.getPrincipal().getName(); + serverPrincipal = name; } - answer.add(key); + answer.add(t); } } } @@ -167,7 +180,7 @@ serverPrincipal = ticket.getServer().getName(); } - answer.add(ticket); + answer.add((T)ticket); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java --- a/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -152,75 +152,50 @@ "did not have the Sequence tag"); } - // parse SEQUENCE of mechTypes, if present - if (tmp1.data.available() > 0) { + // parse various fields if present + int lastField = -1; + while (tmp1.data.available() > 0) { DerValue tmp2 = tmp1.data.getDerValue(); - if (!tmp2.isContextSpecific((byte)0x00)) { - throw new IOException("SPNEGO NegoTokenInit : " + - "did not have the right context tag for mechTypes"); - } - // get the DER-encoded sequence of mechTypes - DerInputStream mValue = tmp2.data; - mechTypes = mValue.toByteArray(); + if (tmp2.isContextSpecific((byte)0x00)) { + // get the DER-encoded sequence of mechTypes + lastField = checkNextField(lastField, 0); + DerInputStream mValue = tmp2.data; + mechTypes = mValue.toByteArray(); - // read all the mechTypes - DerValue[] mList = mValue.getSequence(0); - mechTypeList = new Oid[mList.length]; - ObjectIdentifier mech = null; - for (int i = 0; i < mList.length; i++) { - mech = mList[i].getOID(); + // read all the mechTypes + DerValue[] mList = mValue.getSequence(0); + mechTypeList = new Oid[mList.length]; + ObjectIdentifier mech = null; + for (int i = 0; i < mList.length; i++) { + mech = mList[i].getOID(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenInit: " + + "reading Mechanism Oid = " + mech); + } + mechTypeList[i] = new Oid(mech.toString()); + } + } else if (tmp2.isContextSpecific((byte)0x01)) { + lastField = checkNextField(lastField, 1); + // received reqFlags, skip it + } else if (tmp2.isContextSpecific((byte)0x02)) { + lastField = checkNextField(lastField, 2); if (DEBUG) { System.out.println("SpNegoToken NegTokenInit: " + - "reading Mechanism Oid = " + mech); + "reading Mech Token"); } - mechTypeList[i] = new Oid(mech.toString()); - } - } - - // parse mechToken, if present (skip reqFlags) - if (tmp1.data.available() > 0) { - DerValue tmp3 = tmp1.data.getDerValue(); - if (tmp3.isContextSpecific((byte)0x01)) { - // received reqFlags, skip it - // now parse next field mechToken - if (tmp1.data.available() > 0) { - tmp3 = tmp1.data.getDerValue(); + mechToken = tmp2.data.getOctetString(); + } else if (tmp2.isContextSpecific((byte)0x03)) { + lastField = checkNextField(lastField, 3); + if (!GSSUtil.useMSInterop()) { + mechListMIC = tmp2.data.getOctetString(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenInit: " + + "MechListMIC Token = " + + getHexBytes(mechListMIC)); + } } } - if (!tmp3.isContextSpecific((byte)0x02)) { - throw new IOException("SPNEGO NegoTokenInit : " + - "did not have the right context tag for mechToken"); - } - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit: " + - "reading Mech Token"); - } - mechToken = tmp3.data.getOctetString(); } - - // parse mechListMIC, if present and not in MS interop mode - if (!GSSUtil.useMSInterop() && (tmp1.data.available() > 0)) { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit: " + - "receiving MechListMIC"); - } - DerValue tmp6 = tmp1.data.getDerValue(); - if (!tmp6.isContextSpecific((byte)0x03)) { - throw new IOException("SPNEGO NegoTokenInit : " + - "did not have the right context tag for MICToken"); - } - mechListMIC = tmp6.data.getOctetString(); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit: " + - "MechListMIC Token = " + getHexBytes(mechListMIC)); - } - } else { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit : " + - "no MIC token included"); - } - } - } catch (IOException e) { throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1, "Invalid SPNEGO NegTokenInit token : " + e.getMessage()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java --- a/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -153,69 +153,40 @@ "did not have the Sequence tag"); } - // parse negResult, if present - if (tmp1.data.available() > 0) { + // parse various fields if present + int lastField = -1; + while (tmp1.data.available() > 0) { DerValue tmp2 = tmp1.data.getDerValue(); - if (!tmp2.isContextSpecific((byte)0x00)) { - throw new IOException("SPNEGO NegoTokenTarg : " + - "did not have the right context tag for negResult"); - } - negResult = tmp2.data.getEnumerated(); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: negotiated" + - " result = " + getNegoResultString(negResult)); - } - } - - // parse supportedMech, if present - if (tmp1.data.available() > 0) { - DerValue tmp3 = tmp1.data.getDerValue(); - if (!tmp3.isContextSpecific((byte)0x01)) { - throw new IOException("SPNEGO NegoTokenTarg : " + - "did not have the right context tag for supportedMech"); - } - ObjectIdentifier mech = tmp3.data.getOID(); - supportedMech = new Oid(mech.toString()); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: " + - "supported mechanism = " + supportedMech); + if (tmp2.isContextSpecific((byte)0x00)) { + lastField = checkNextField(lastField, 0); + negResult = tmp2.data.getEnumerated(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenTarg: negotiated" + + " result = " + getNegoResultString(negResult)); + } + } else if (tmp2.isContextSpecific((byte)0x01)) { + lastField = checkNextField(lastField, 1); + ObjectIdentifier mech = tmp2.data.getOID(); + supportedMech = new Oid(mech.toString()); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenTarg: " + + "supported mechanism = " + supportedMech); + } + } else if (tmp2.isContextSpecific((byte)0x02)) { + lastField = checkNextField(lastField, 2); + responseToken = tmp2.data.getOctetString(); + } else if (tmp2.isContextSpecific((byte)0x03)) { + lastField = checkNextField(lastField, 3); + if (!GSSUtil.useMSInterop()) { + mechListMIC = tmp2.data.getOctetString(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenTarg: " + + "MechListMIC Token = " + + getHexBytes(mechListMIC)); + } + } } } - - // parse ResponseToken, if present - if (tmp1.data.available() > 0) { - DerValue tmp4 = tmp1.data.getDerValue(); - if (!tmp4.isContextSpecific((byte)0x02)) { - throw new IOException("SPNEGO NegoTokenTarg : did not" + - " have the right context tag for response token"); - } - responseToken = tmp4.data.getOctetString(); - } - - // parse mechListMIC if present and not in MS interop - if (!GSSUtil.useMSInterop() && (tmp1.data.available() > 0)) { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: " + - "receiving MechListMIC"); - } - DerValue tmp5 = tmp1.data.getDerValue(); - if (!tmp5.isContextSpecific((byte)0x03)) { - throw new IOException("SPNEGO NegoTokenTarg : " + - "did not have the right context tag for mechListMIC"); - } - mechListMIC = tmp5.data.getOctetString(); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: " + - "MechListMIC Token = " + - getHexBytes(mechListMIC)); - } - } else { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg : " + - "no MIC token included"); - } - } - } catch (IOException e) { throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1, "Invalid SPNEGO NegTokenTarg token : " + e.getMessage()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java --- a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -187,4 +187,21 @@ return ("Unknown Negotiated Result: " + result); } } + + /** + * Checks if the context tag in a sequence is in correct order. The "last" + * value must be smaller than "current". + * @param last the last tag seen + * @param current the current tag + * @return the current tag, used as the next value for last + * @throws GSSException if there's a wrong order + */ + static int checkNextField(int last, int current) throws GSSException { + if (last < current) { + return current; + } else { + throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1, + "Invalid SpNegoToken token : wrong order"); + } + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/Config.java --- a/jdk/src/share/classes/sun/security/krb5/Config.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/Config.java Sat May 14 11:52:15 2011 -0700 @@ -110,7 +110,6 @@ public static synchronized void refresh() throws KrbException { singleton = new Config(); - KeyTab.refresh(); KdcComm.initStatic(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/EncryptionKey.java --- a/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -138,8 +138,7 @@ * @returns an array of secret keys or null if none were found. */ public static EncryptionKey[] acquireSecretKeys(PrincipalName princ, - String keytab) - throws KrbException, IOException { + String keytab) { if (princ == null) throw new IllegalArgumentException( @@ -148,11 +147,6 @@ // KeyTab getInstance(keytab) will call KeyTab.getInstance() // if keytab is null KeyTab ktab = KeyTab.getInstance(keytab); - - if (ktab == null) { - return null; - } - return ktab.readServiceKeys(princ); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/KrbAsRep.java --- a/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java Sat May 14 11:52:15 2011 -0700 @@ -37,6 +37,8 @@ import sun.security.util.*; import java.io.IOException; import java.util.Objects; +import javax.security.auth.kerberos.KeyTab; +import sun.security.jgss.krb5.Krb5Util; /** * This class encapsulates a AS-REP message that the KDC sends to the @@ -90,29 +92,32 @@ } /** - * Called by KrbAsReqBuilder to resolve a AS-REP message using keys. - * @param keys user provided keys, not null + * Called by KrbAsReqBuilder to resolve a AS-REP message using a keytab. + * @param ktab the keytab, not null * @param asReq the original AS-REQ sent, used to validate AS-REP + * @param cname the user principal name, used to locate keys in ktab */ - void decryptUsingKeys(EncryptionKey[] keys, KrbAsReq asReq) + void decryptUsingKeyTab(KeyTab ktab, KrbAsReq asReq, PrincipalName cname) throws KrbException, Asn1Exception, IOException { EncryptionKey dkey = null; int encPartKeyType = rep.encPart.getEType(); Integer encPartKvno = rep.encPart.kvno; - try { - dkey = EncryptionKey.findKey(encPartKeyType, encPartKvno, keys); - } catch (KrbException ke) { - if (ke.returnCode() == Krb5.KRB_AP_ERR_BADKEYVER) { - // Fallback to no kvno. In some cases, keytab is generated - // not by sysadmin but Java's ktab command - dkey = EncryptionKey.findKey(encPartKeyType, keys); + try { + dkey = EncryptionKey.findKey(encPartKeyType, encPartKvno, + Krb5Util.keysFromJavaxKeyTab(ktab, cname)); + } catch (KrbException ke) { + if (ke.returnCode() == Krb5.KRB_AP_ERR_BADKEYVER) { + // Fallback to no kvno. In some cases, keytab is generated + // not by sysadmin but Java's ktab command + dkey = EncryptionKey.findKey(encPartKeyType, + Krb5Util.keysFromJavaxKeyTab(ktab, cname)); + } } - } - if (dkey == null) { - throw new KrbException(Krb5.API_INVALID_ARG, - "Cannot find key for type/kvno to decrypt AS REP - " + - EType.toString(encPartKeyType) + "/" + encPartKvno); - } + if (dkey == null) { + throw new KrbException(Krb5.API_INVALID_ARG, + "Cannot find key for type/kvno to decrypt AS REP - " + + EType.toString(encPartKeyType) + "/" + encPartKvno); + } decrypt(dkey, asReq); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java --- a/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ import java.io.IOException; import java.util.Arrays; +import javax.security.auth.kerberos.KeyTab; +import sun.security.jgss.krb5.Krb5Util; import sun.security.krb5.internal.HostAddresses; import sun.security.krb5.internal.KDCOptions; import sun.security.krb5.internal.KRBError; @@ -42,13 +44,16 @@ * 1. Gather information to create AS-REQ * 2. Create and send AS-REQ * 3. Receive AS-REP and KRB-ERROR (-KRB_ERR_RESPONSE_TOO_BIG) and parse them - * 4. Emit credentials and secret keys (for JAAS storeKey=true) + * 4. Emit credentials and secret keys (for JAAS storeKey=true with password) * * This class does not: * 1. Deal with real communications (KdcComm does it, and TGS-REQ) * a. Name of KDCs for a realm * b. Server availability, timeout, UDP or TCP * d. KRB_ERR_RESPONSE_TOO_BIG + * 2. Stores its own copy of password, this means: + * a. Do not change/wipe it before Builder finish + * b. Builder will not wipe it for you * * With this class: * 1. KrbAsReq has only one constructor @@ -70,19 +75,17 @@ private HostAddresses addresses; // Secret source: can't be changed once assigned, only one (of the two - // sources) can be set and should be non-null - private EncryptionKey[] keys; - private char[] password; + // sources) can be set to non-null + private final char[] password; + private final KeyTab ktab; // Used to create a ENC-TIMESTAMP in the 2nd AS-REQ - private EncryptionKey pakey; private PAData[] paList; // PA-DATA from both KRB-ERROR and AS-REP. // Used by getKeys() only. // Only AS-REP should be enough per RFC, // combined in case etypes are different. // The generated and received: - int[] eTypes; private KrbAsReq req; private KrbAsRep rep; @@ -94,7 +97,7 @@ private State state; // Called by other constructors - private KrbAsReqBuilder(PrincipalName cname) + private void init(PrincipalName cname) throws KrbException { if (cname.getRealm() == null) { cname.setRealm(Config.getInstance().getDefaultRealm()); @@ -114,14 +117,11 @@ * This argument will neither be modified nor stored by the method. * @throws KrbException */ - public KrbAsReqBuilder(PrincipalName cname, EncryptionKey[] keys) + public KrbAsReqBuilder(PrincipalName cname, KeyTab ktab) throws KrbException { - this(cname); - this.keys = new EncryptionKey[keys.length]; - for (int i=0; i<keys.length; i++) { - this.keys[i] = (EncryptionKey)keys[i].clone(); - } - eTypes = EType.getDefaults("default_tkt_enctypes", keys); + init(cname); + this.ktab = ktab; + this.password = null; } /** @@ -137,30 +137,24 @@ */ public KrbAsReqBuilder(PrincipalName cname, char[] pass) throws KrbException { - this(cname); + init(cname); this.password = pass.clone(); - eTypes = EType.getDefaults("default_tkt_enctypes"); + this.ktab = null; } /** - * Retrieves an array of secret keys for the client. This is useful if + * Retrieves an array of secret keys for the client. This is used when * the client supplies password but need keys to act as an acceptor * (in JAAS words, isInitiator=true and storeKey=true) - * @return original keys if initiated with keys, or generated keys if - * password. In latter case, PA-DATA from server might be used to - * generate keys. All "default_tkt_enctypes" keys will be generated, - * Never null. + * @return generated keys from password. PA-DATA from server might be used. + * All "default_tkt_enctypes" keys will be generated, Never null. + * @throws IllegalStateException if not constructed from a password * @throws KrbException */ public EncryptionKey[] getKeys() throws KrbException { checkState(State.REQ_OK, "Cannot get keys"); - if (keys != null) { - EncryptionKey[] result = new EncryptionKey[keys.length]; - for (int i=0; i<keys.length; i++) { - result[i] = (EncryptionKey)keys[i].clone(); - } - return result; - } else { + if (password != null) { + int[] eTypes = EType.getDefaults("default_tkt_enctypes"); EncryptionKey[] result = new EncryptionKey[eTypes.length]; /* @@ -205,6 +199,8 @@ } } return result; + } else { + throw new IllegalStateException("Required password not provided"); } } @@ -241,12 +237,22 @@ /** * Build a KrbAsReq object from all info fed above. Normally this method * will be called twice: initial AS-REQ and second with pakey + * @param key null (initial AS-REQ) or pakey (with preauth) * @return the KrbAsReq object * @throws KrbException * @throws IOException */ - private KrbAsReq build() throws KrbException, IOException { - return new KrbAsReq(pakey, + private KrbAsReq build(EncryptionKey key) throws KrbException, IOException { + int[] eTypes; + if (password != null) { + eTypes = EType.getDefaults("default_tkt_enctypes"); + } else { + EncryptionKey[] ks = Krb5Util.keysFromJavaxKeyTab(ktab, cname); + eTypes = EType.getDefaults("default_tkt_enctypes", + ks); + for (EncryptionKey k: ks) k.destroy(); + } + return new KrbAsReq(key, options, cname, sname, @@ -263,9 +269,10 @@ * @throws Asn1Exception * @throws IOException */ - private KrbAsReqBuilder resolve() throws KrbException, Asn1Exception, IOException { - if (keys != null) { - rep.decryptUsingKeys(keys, req); + private KrbAsReqBuilder resolve() + throws KrbException, Asn1Exception, IOException { + if (ktab != null) { + rep.decryptUsingKeyTab(ktab, req, cname); } else { rep.decryptUsingPassword(password, req, cname); } @@ -292,9 +299,10 @@ private KrbAsReqBuilder send() throws KrbException, IOException { boolean preAuthFailedOnce = false; KdcComm comm = new KdcComm(cname.getRealmAsString()); + EncryptionKey pakey = null; while (true) { try { - req = build(); + req = build(pakey); rep = new KrbAsRep(comm.send(req.encoding())); return this; } catch (KrbException ke) { @@ -308,7 +316,10 @@ preAuthFailedOnce = true; KRBError kerr = ke.getError(); if (password == null) { - pakey = EncryptionKey.findKey(kerr.getEType(), keys); + EncryptionKey[] ks = Krb5Util.keysFromJavaxKeyTab(ktab, cname); + pakey = EncryptionKey.findKey(kerr.getEType(), ks); + if (pakey != null) pakey = (EncryptionKey)pakey.clone(); + for (EncryptionKey k: ks) k.destroy(); } else { PAData.SaltAndParams snp = PAData.getSaltAndParams( kerr.getEType(), kerr.getPA()); @@ -317,7 +328,7 @@ // does not recommend this pakey = EncryptionKey.acquireSecretKey(password, snp.salt == null ? cname.getSalt() : snp.salt, - eTypes[0], + EType.getDefaults("default_tkt_enctypes")[0], null); } else { pakey = EncryptionKey.acquireSecretKey(password, @@ -369,15 +380,8 @@ */ public void destroy() { state = State.DESTROYED; - if (keys != null) { - for (EncryptionKey k: keys) { - k.destroy(); - } - keys = null; - } if (password != null) { Arrays.fill(password, (char)0); - password = null; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java --- a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Sat May 14 11:52:15 2011 -0700 @@ -40,6 +40,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.File; +import java.io.FileNotFoundException; import java.util.Comparator; import java.util.HashMap; import java.util.Map; @@ -50,92 +51,138 @@ * This class represents key table. The key table functions deal with storing * and retrieving service keys for use in authentication exchanges. * + * A KeyTab object is always constructed, if the file specified does not + * exist, it's still valid but empty. If there is an I/O error or file format + * error, it's invalid. + * + * The class is immutable on the read side (the write side is only used by + * the ktab tool). + * * @author Yanni Zhang */ public class KeyTab implements KeyTabConstants { - int kt_vno; - private static KeyTab singleton = null; + private static final boolean DEBUG = Krb5.DEBUG; - private static String name; + private static String defaultTabName = null; + + // Attention: Currently there is no way to remove a keytab from this map, + // this might lead to a memory leak. + private static Map<String,KeyTab> map = new HashMap<>(); + + // KeyTab file does not exist. Note: a missing keytab is still valid + private boolean isMissing = false; + + // KeyTab file is invalid, possibly an I/O error or a file format error. + private boolean isValid = true; + + private final String tabName; + private long lastModified; + private int kt_vno; + private Vector<KeyTabEntry> entries = new Vector<>(); - private KeyTab(String filename) throws IOException, RealmException { - init(filename); - } - - public static KeyTab getInstance(String s) { - name = parse(s); - if (name == null) { - return getInstance(); + /** + * Constructs a KeyTab object. + * + * If there is any I/O error or format errot during the loading, the + * isValid flag is set to false, and all half-read entries are dismissed. + * @param filename path name for the keytab file, must not be null + */ + private KeyTab(String filename) { + tabName = filename; + try { + lastModified = new File(tabName).lastModified(); + try (KeyTabInputStream kis = + new KeyTabInputStream(new FileInputStream(filename))) { + load(kis); + } + } catch (FileNotFoundException e) { + entries.clear(); + isMissing = true; + } catch (Exception ioe) { + entries.clear(); + isValid = false; } - return getInstance(new File(name)); } /** - * Gets the single instance of KeyTab class. - * @param file the key tab file. - * @return single instance of KeyTab; - * return null if error occurs while reading data out of the file. + * Read a keytab file. Returns a new object and save it into cache when + * new content (modified since last read) is available. If keytab file is + * invalid, the old object will be returned. This is a safeguard for + * partial-written keytab files or non-stable network. Please note that + * a missing keytab is valid, which is equivalent to an empty keytab. + * + * @param s file name of keytab, must not be null + * @return the keytab object, can be invalid, but never null. */ - public static KeyTab getInstance(File file) { - try { - if (!(file.exists())) { - singleton = null; - } else { - String fname = file.getAbsolutePath(); - // Since this class deals with file I/O operations, - // we want only one class instance existing. - if (singleton != null) { - File kfile = new File(singleton.name); - String kname = kfile.getAbsolutePath(); - if (kname.equalsIgnoreCase(fname)) { - if (DEBUG) { - System.out.println("KeyTab instance already exists"); - } - } - } else { - singleton = new KeyTab(fname); - } - } - } catch (Exception e) { - singleton = null; - if (DEBUG) { - System.out.println("Could not obtain an instance of KeyTab" + - e.getMessage()); - } + private synchronized static KeyTab getInstance0(String s) { + long lm = new File(s).lastModified(); + KeyTab old = map.get(s); + if (old != null && old.isValid() && old.lastModified == lm) { + return old; } - return singleton; + KeyTab ktab = new KeyTab(s); + if (ktab.isValid()) { // A valid new keytab + map.put(s, ktab); + return ktab; + } else if (old != null) { // An existing old one + return old; + } else { + return ktab; // first read is invalid + } } /** - * Gets the single instance of KeyTab class. - * @return single instance of KeyTab; return null if default keytab file - * does not exist, or error occurs while reading data from the file. + * Gets a KeyTab object. + * @param s the key tab file name. + * @return the KeyTab object, never null. + */ + public static KeyTab getInstance(String s) { + if (s == null) { + return getInstance(); + } else { + return getInstance0(s); + } + } + + /** + * Gets a KeyTab object. + * @param file the key tab file. + * @return the KeyTab object, never null. + */ + public static KeyTab getInstance(File file) { + if (file == null) { + return getInstance(); + } else { + return getInstance0(file.getPath()); + } + } + + /** + * Gets the default KeyTab object. + * @return the KeyTab object, never null. */ public static KeyTab getInstance() { - try { - name = getDefaultKeyTab(); - if (name != null) { - singleton = getInstance(new File(name)); - } - } catch (Exception e) { - singleton = null; - if (DEBUG) { - System.out.println("Could not obtain an instance of KeyTab" + - e.getMessage()); - } - } - return singleton; + return getInstance(getDefaultTabName()); + } + + public boolean isMissing() { + return isMissing; + } + + public boolean isValid() { + return isValid; } /** * The location of keytab file will be read from the configuration file * If it is not specified, consider user.home as the keytab file's * default location. + * @return never null */ - private static String getDefaultKeyTab() { - if (name != null) { - return name; + private static String getDefaultTabName() { + if (defaultTabName != null) { + return defaultTabName; } else { String kname = null; try { @@ -145,7 +192,7 @@ StringTokenizer st = new StringTokenizer(keytab_names, " "); while (st.hasMoreTokens()) { kname = parse(st.nextToken()); - if (kname != null) { + if (new File(kname).exists()) { break; } } @@ -165,19 +212,20 @@ new sun.security.action.GetPropertyAction("user.dir")); } - if (user_home != null) { - kname = user_home + File.separator + "krb5.keytab"; - } + kname = user_home + File.separator + "krb5.keytab"; } + defaultTabName = kname; return kname; } } + /** + * Parses some common keytab name formats + * @param name never null + * @return never null + */ private static String parse(String name) { - String kname = null; - if (name == null) { - return null; - } + String kname; if ((name.length() >= 5) && (name.substring(0, 5).equalsIgnoreCase("FILE:"))) { kname = name.substring(5); @@ -194,18 +242,6 @@ return kname; } - private synchronized void init(String filename) - throws IOException, RealmException { - - if (filename != null) { - KeyTabInputStream kis = - new KeyTabInputStream(new FileInputStream(filename)); - load(kis); - kis.close(); - name = filename; - } - } - private void load(KeyTabInputStream kis) throws IOException, RealmException { @@ -234,14 +270,13 @@ * etypes that have been configured for use. If there are multiple * keys with same etype, the one with the highest kvno is returned. * @param service the PrincipalName of the requested service - * @return an array containing all the service keys + * @return an array containing all the service keys, never null */ public EncryptionKey[] readServiceKeys(PrincipalName service) { KeyTabEntry entry; EncryptionKey key; int size = entries.size(); ArrayList<EncryptionKey> keys = new ArrayList<>(size); - for (int i = size-1; i >= 0; i--) { entry = entries.elementAt(i); if (entry.service.match(service)) { @@ -260,10 +295,7 @@ } } } - size = keys.size(); - if (size == 0) - return null; EncryptionKey[] retVal = keys.toArray(new EncryptionKey[size]); // Sort keys according to default_tkt_enctypes @@ -328,10 +360,13 @@ return false; } - public static String tabName() { - return name; + public String tabName() { + return tabName; } + /////////////////// THE WRITE SIDE /////////////////////// + /////////////// only used by ktab tool ////////////////// + /** * Adds a new entry in the key table. * @param service the service which will have a new entry in the key table. @@ -394,7 +429,7 @@ */ public synchronized static KeyTab create() throws IOException, RealmException { - String dname = getDefaultKeyTab(); + String dname = getDefaultTabName(); return create(dname); } @@ -404,25 +439,24 @@ public synchronized static KeyTab create(String name) throws IOException, RealmException { - KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(name)); - kos.writeVersion(KRB5_KT_VNO); - kos.close(); - singleton = new KeyTab(name); - return singleton; + try (KeyTabOutputStream kos = + new KeyTabOutputStream(new FileOutputStream(name))) { + kos.writeVersion(KRB5_KT_VNO); + } + return new KeyTab(name); } /** * Saves the file at the directory. */ public synchronized void save() throws IOException { - KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(name)); - kos.writeVersion(kt_vno); - for (int i = 0; i < entries.size(); i++) { - kos.writeEntry(entries.elementAt(i)); + try (KeyTabOutputStream kos = + new KeyTabOutputStream(new FileOutputStream(tabName))) { + kos.writeVersion(kt_vno); + for (int i = 0; i < entries.size(); i++) { + kos.writeEntry(entries.elementAt(i)); + } } - kos.close(); } /** @@ -485,18 +519,9 @@ * @exception IOException. */ public synchronized void createVersion(File file) throws IOException { - KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(file)); - kos.write16(KRB5_KT_VNO); - kos.close(); - } - - public static void refresh() { - if (singleton != null) { - if (DEBUG) { - System.out.println("Refreshing Keytab"); - } - singleton = null; + try (KeyTabOutputStream kos = + new KeyTabOutputStream(new FileOutputStream(file))) { + kos.write16(KRB5_KT_VNO); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/pkcs/PKCS7.java --- a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/pkcs/PKCS7.java Sat May 14 11:52:15 2011 -0700 @@ -38,7 +38,6 @@ import sun.security.util.*; import sun.security.x509.AlgorithmId; import sun.security.x509.CertificateIssuerName; -import sun.security.x509.KeyUsageExtension; import sun.security.x509.X509CertImpl; import sun.security.x509.X509CertInfo; import sun.security.x509.X509CRLImpl; @@ -493,7 +492,7 @@ // CRLs (optional) if (crls != null && crls.length != 0) { // cast to X509CRLImpl[] since X509CRLImpl implements DerEncoder - Set<X509CRLImpl> implCRLs = new HashSet<>(crls.length); + Set<X509CRLImpl> implCRLs = new HashSet<X509CRLImpl>(crls.length); for (X509CRL crl: crls) { if (crl instanceof X509CRLImpl) implCRLs.add((X509CRLImpl) crl); @@ -531,168 +530,6 @@ } /** - * Verifying signed data using an external chunked data source. - */ - public static class PKCS7Verifier { - - private final SignerInfo si; // Signer to verify - private final MessageDigest md; // MessageDigest object for chunks - private final Signature sig; // Signature object for chunks - - private PKCS7Verifier(SignerInfo si, MessageDigest md, Signature sig) { - this.si = si; - this.md = md; - this.sig = sig; - } - - public static PKCS7Verifier from(PKCS7 block, SignerInfo si) throws - SignatureException, NoSuchAlgorithmException { - - try { - MessageDigest md = null; - Signature sig; - - ContentInfo content = block.getContentInfo(); - String digestAlgname = si.getDigestAlgorithmId().getName(); - - // if there are authenticate attributes, feed data chunks to - // the message digest. In this case, pv.md is not null - if (si.authenticatedAttributes != null) { - // first, check content type - ObjectIdentifier contentType = (ObjectIdentifier) - si.authenticatedAttributes.getAttributeValue( - PKCS9Attribute.CONTENT_TYPE_OID); - if (contentType == null || - !contentType.equals(content.contentType)) - return null; // contentType does not match, bad SignerInfo - - // now, check message digest - byte[] messageDigest = (byte[]) - si.authenticatedAttributes.getAttributeValue( - PKCS9Attribute.MESSAGE_DIGEST_OID); - - if (messageDigest == null) // fail if there is no message digest - return null; - - md = MessageDigest.getInstance(digestAlgname); - } - - // put together digest algorithm and encryption algorithm - // to form signing algorithm - String encryptionAlgname = - si.getDigestEncryptionAlgorithmId().getName(); - - // Workaround: sometimes the encryptionAlgname is actually - // a signature name - String tmp = AlgorithmId.getEncAlgFromSigAlg(encryptionAlgname); - if (tmp != null) encryptionAlgname = tmp; - String algname = AlgorithmId.makeSigAlg( - digestAlgname, encryptionAlgname); - - sig = Signature.getInstance(algname); - X509Certificate cert = si.getCertificate(block); - - if (cert == null) { - return null; - } - if (cert.hasUnsupportedCriticalExtension()) { - throw new SignatureException("Certificate has unsupported " - + "critical extension(s)"); - } - - // Make sure that if the usage of the key in the certificate is - // restricted, it can be used for digital signatures. - // XXX We may want to check for additional extensions in the - // future. - boolean[] keyUsageBits = cert.getKeyUsage(); - if (keyUsageBits != null) { - KeyUsageExtension keyUsage; - try { - // We don't care whether or not this extension was marked - // critical in the certificate. - // We're interested only in its value (i.e., the bits set) - // and treat the extension as critical. - keyUsage = new KeyUsageExtension(keyUsageBits); - } catch (IOException ioe) { - throw new SignatureException("Failed to parse keyUsage " - + "extension"); - } - - boolean digSigAllowed = ((Boolean)keyUsage.get( - KeyUsageExtension.DIGITAL_SIGNATURE)).booleanValue(); - - boolean nonRepuAllowed = ((Boolean)keyUsage.get( - KeyUsageExtension.NON_REPUDIATION)).booleanValue(); - - if (!digSigAllowed && !nonRepuAllowed) { - throw new SignatureException("Key usage restricted: " - + "cannot be used for " - + "digital signatures"); - } - } - - PublicKey key = cert.getPublicKey(); - sig.initVerify(key); - return new PKCS7Verifier(si, md, sig); - } catch (IOException e) { - throw new SignatureException("IO error verifying signature:\n" + - e.getMessage()); - - } catch (InvalidKeyException e) { - throw new SignatureException("InvalidKey: " + e.getMessage()); - - } - } - - public void update(byte[] data, int off, int end) - throws SignatureException { - if (md != null) { - md.update(data, off, end-off); - } else { - sig.update(data, off, end-off); - } - } - - public SignerInfo verify() throws SignatureException { - try { - // if there are authenticate attributes, get the message - // digest and compare it with the digest of data - if (md != null) { - // now, check message digest - byte[] messageDigest = (byte[]) - si.authenticatedAttributes.getAttributeValue( - PKCS9Attribute.MESSAGE_DIGEST_OID); - - byte[] computedMessageDigest = md.digest(); - - if (!MessageDigest.isEqual( - messageDigest, computedMessageDigest)) { - return null; - } - - // message digest attribute matched - // digest of original data - - // the data actually signed is the DER encoding of - // the authenticated attributes (tagged with - // the "SET OF" tag, not 0xA0). - byte[] dataSigned = si.authenticatedAttributes.getDerEncoding(); - sig.update(dataSigned); - } - - if (sig.verify(si.getEncryptedDigest())) { - return si; - } - - } catch (IOException e) { - throw new SignatureException("IO error verifying signature:\n" + - e.getMessage()); - } - return null; - } - } - - /** * This verifies a given SignerInfo. * * @param info the signer information. @@ -717,16 +554,19 @@ public SignerInfo[] verify(byte[] bytes) throws NoSuchAlgorithmException, SignatureException { - List<SignerInfo> intResult = new ArrayList<>(); + Vector<SignerInfo> intResult = new Vector<SignerInfo>(); for (int i = 0; i < signerInfos.length; i++) { SignerInfo signerInfo = verify(signerInfos[i], bytes); if (signerInfo != null) { - intResult.add(signerInfo); + intResult.addElement(signerInfo); } } - if (!intResult.isEmpty()) { - return intResult.toArray(new SignerInfo[intResult.size()]); + if (intResult.size() != 0) { + + SignerInfo[] result = new SignerInfo[intResult.size()]; + intResult.copyInto(result); + return result; } return null; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/pkcs/SignerInfo.java --- a/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Sat May 14 11:52:15 2011 -0700 @@ -230,7 +230,7 @@ if (userCert == null) return null; - ArrayList<X509Certificate> certList = new ArrayList<>(); + ArrayList<X509Certificate> certList = new ArrayList<X509Certificate>(); certList.add(userCert); X509Certificate[] pkcsCerts = block.getCertificates(); @@ -276,20 +276,132 @@ /* Returns null if verify fails, this signerInfo if verify succeeds. */ SignerInfo verify(PKCS7 block, byte[] data) - throws NoSuchAlgorithmException, SignatureException { + throws NoSuchAlgorithmException, SignatureException { + + try { + + ContentInfo content = block.getContentInfo(); + if (data == null) { + data = content.getContentBytes(); + } + + String digestAlgname = getDigestAlgorithmId().getName(); + + byte[] dataSigned; + + // if there are authenticate attributes, get the message + // digest and compare it with the digest of data + if (authenticatedAttributes == null) { + dataSigned = data; + } else { + + // first, check content type + ObjectIdentifier contentType = (ObjectIdentifier) + authenticatedAttributes.getAttributeValue( + PKCS9Attribute.CONTENT_TYPE_OID); + if (contentType == null || + !contentType.equals(content.contentType)) + return null; // contentType does not match, bad SignerInfo + + // now, check message digest + byte[] messageDigest = (byte[]) + authenticatedAttributes.getAttributeValue( + PKCS9Attribute.MESSAGE_DIGEST_OID); + + if (messageDigest == null) // fail if there is no message digest + return null; + + MessageDigest md = MessageDigest.getInstance(digestAlgname); + byte[] computedMessageDigest = md.digest(data); + + if (messageDigest.length != computedMessageDigest.length) + return null; + for (int i = 0; i < messageDigest.length; i++) { + if (messageDigest[i] != computedMessageDigest[i]) + return null; + } + + // message digest attribute matched + // digest of original data + + // the data actually signed is the DER encoding of + // the authenticated attributes (tagged with + // the "SET OF" tag, not 0xA0). + dataSigned = authenticatedAttributes.getDerEncoding(); + } + + // put together digest algorithm and encryption algorithm + // to form signing algorithm + String encryptionAlgname = + getDigestEncryptionAlgorithmId().getName(); - PKCS7.PKCS7Verifier p7v = PKCS7.PKCS7Verifier.from(block, this); - if (p7v == null) return null; - if (data == null) { - try { - data = block.getContentInfo().getContentBytes(); - } catch (IOException e) { - throw new SignatureException("IO error verifying signature:\n" + - e.getMessage()); + // Workaround: sometimes the encryptionAlgname is actually + // a signature name + String tmp = AlgorithmId.getEncAlgFromSigAlg(encryptionAlgname); + if (tmp != null) encryptionAlgname = tmp; + String algname = AlgorithmId.makeSigAlg( + digestAlgname, encryptionAlgname); + + Signature sig = Signature.getInstance(algname); + X509Certificate cert = getCertificate(block); + + if (cert == null) { + return null; + } + if (cert.hasUnsupportedCriticalExtension()) { + throw new SignatureException("Certificate has unsupported " + + "critical extension(s)"); } + + // Make sure that if the usage of the key in the certificate is + // restricted, it can be used for digital signatures. + // XXX We may want to check for additional extensions in the + // future. + boolean[] keyUsageBits = cert.getKeyUsage(); + if (keyUsageBits != null) { + KeyUsageExtension keyUsage; + try { + // We don't care whether or not this extension was marked + // critical in the certificate. + // We're interested only in its value (i.e., the bits set) + // and treat the extension as critical. + keyUsage = new KeyUsageExtension(keyUsageBits); + } catch (IOException ioe) { + throw new SignatureException("Failed to parse keyUsage " + + "extension"); + } + + boolean digSigAllowed = ((Boolean)keyUsage.get( + KeyUsageExtension.DIGITAL_SIGNATURE)).booleanValue(); + + boolean nonRepuAllowed = ((Boolean)keyUsage.get( + KeyUsageExtension.NON_REPUDIATION)).booleanValue(); + + if (!digSigAllowed && !nonRepuAllowed) { + throw new SignatureException("Key usage restricted: " + + "cannot be used for " + + "digital signatures"); + } + } + + PublicKey key = cert.getPublicKey(); + sig.initVerify(key); + + sig.update(dataSigned); + + if (sig.verify(encryptedDigest)) { + return this; + } + + } catch (IOException e) { + throw new SignatureException("IO error verifying signature:\n" + + e.getMessage()); + + } catch (InvalidKeyException e) { + throw new SignatureException("InvalidKey: " + e.getMessage()); + } - p7v.update(data, 0, data.length); - return p7v.verify(); + return null; } /* Verify the content of the pkcs7 block. */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java --- a/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java Sat May 14 11:52:15 2011 -0700 @@ -312,7 +312,8 @@ DistributionPointFetcher.getInstance(); // all CRLs returned by the DP Fetcher have also been verified mApprovedCRLs.addAll(store.getCRLs(sel, signFlag, prevKey, - mSigProvider, mStores, reasonsMask, trustAnchors)); + mSigProvider, mStores, reasonsMask, trustAnchors, + mParams.getDate())); } catch (Exception e) { if (debug != null) { debug.println("CrlRevocationChecker.verifyRevocationStatus() " @@ -769,7 +770,7 @@ for (X509CRL crl : crls) { if (dpf.verifyCRL(certImpl, point, crl, reasonsMask, signFlag, prevKey, mSigProvider, - trustAnchors, mStores)) { + trustAnchors, mStores, mParams.getDate())) { results.add(crl); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java --- a/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Sat May 14 11:52:15 2011 -0700 @@ -90,8 +90,8 @@ */ Collection<X509CRL> getCRLs(X509CRLSelector selector, boolean signFlag, PublicKey prevKey, String provider, List<CertStore> certStores, - boolean[] reasonsMask, - Set<TrustAnchor> trustAnchors) throws CertStoreException { + boolean[] reasonsMask, Set<TrustAnchor> trustAnchors, + Date validity) throws CertStoreException { if (USE_CRLDP == false) { return Collections.emptySet(); @@ -122,7 +122,7 @@ DistributionPoint point = t.next(); Collection<X509CRL> crls = getCRLs(selector, certImpl, point, reasonsMask, signFlag, prevKey, provider, - certStores, trustAnchors); + certStores, trustAnchors, validity); results.addAll(crls); } if (debug != null) { @@ -143,7 +143,8 @@ private Collection<X509CRL> getCRLs(X509CRLSelector selector, X509CertImpl certImpl, DistributionPoint point, boolean[] reasonsMask, boolean signFlag, PublicKey prevKey, String provider, - List<CertStore> certStores, Set<TrustAnchor> trustAnchors) { + List<CertStore> certStores, Set<TrustAnchor> trustAnchors, + Date validity) { // check for full name GeneralNames fullName = point.getFullName(); @@ -196,7 +197,7 @@ selector.setIssuerNames(null); if (selector.match(crl) && verifyCRL(certImpl, point, crl, reasonsMask, signFlag, prevKey, provider, trustAnchors, - certStores)) { + certStores, validity)) { crls.add(crl); } } catch (Exception e) { @@ -280,13 +281,15 @@ * @param trustAnchors a {@code Set} of {@code TrustAnchor}s * @param certStores a {@code List} of {@code CertStore}s to be used in * finding certificates and CRLs + * @param validity the time for which the validity of the CRL issuer's + * certification path should be determined * @return true if ok, false if not */ boolean verifyCRL(X509CertImpl certImpl, DistributionPoint point, X509CRL crl, boolean[] reasonsMask, boolean signFlag, PublicKey prevKey, String provider, - Set<TrustAnchor> trustAnchors, - List<CertStore> certStores) throws CRLException, IOException { + Set<TrustAnchor> trustAnchors, List<CertStore> certStores, + Date validity) throws CRLException, IOException { boolean indirectCRL = false; X509CRLImpl crlImpl = X509CRLImpl.toImpl(crl); @@ -605,6 +608,7 @@ } params.setCertStores(certStores); params.setSigProvider(provider); + params.setDate(validity); try { CertPathBuilder builder = CertPathBuilder.getInstance("PKIX"); PKIXCertPathBuilderResult result = diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java --- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1453,6 +1453,21 @@ } } + private void closeSocket(boolean selfInitiated) throws IOException { + if ((debug != null) && Debug.isOn("ssl")) { + System.out.println(threadName() + ", called closeSocket(selfInitiated)"); + } + if (self == this) { + super.close(); + } else if (autoClose) { + self.close(); + } else if (selfInitiated) { + // layered && non-autoclose + // read close_notify alert to clear input stream + waitForClose(false); + } + } + /* * Closing the connection is tricky ... we can't officially close the * connection until we know the other end is ready to go away too, @@ -1491,6 +1506,8 @@ } int state = getConnectionState(); + boolean closeSocketCalled = false; + Throwable cachedThrowable = null; try { switch (state) { /* @@ -1531,8 +1548,18 @@ return; // connection was closed while we waited } if (state != cs_SENT_CLOSE) { - warning(Alerts.alert_close_notify); - connectionState = cs_SENT_CLOSE; + try { + warning(Alerts.alert_close_notify); + connectionState = cs_SENT_CLOSE; + } catch (Throwable th) { + // we need to ensure socket is closed out + // if we encounter any errors. + connectionState = cs_ERROR; + // cache this for later use + cachedThrowable = th; + closeSocketCalled = true; + closeSocket(selfInitiated); + } } } // If state was cs_SENT_CLOSE before, we don't do the actual @@ -1569,22 +1596,11 @@ return; } - if (self == this) { - super.close(); - } else if (autoClose) { - self.close(); - } else if (selfInitiated) { - // layered && non-autoclose - // read close_notify alert to clear input stream - waitForClose(false); + if (!closeSocketCalled) { + closeSocketCalled = true; + closeSocket(selfInitiated); } - // See comment in changeReadCiphers() - readCipher.dispose(); - writeCipher.dispose(); - - // state will be set to cs_CLOSED in the finally block below - break; } } finally { @@ -1595,6 +1611,20 @@ // notify any threads waiting for the closing to finish this.notifyAll(); } + if (closeSocketCalled) { + // Dispose of ciphers since we've closed socket + disposeCiphers(); + } + if (cachedThrowable != null) { + /* + * Rethrow the error to the calling method + * The Throwable caught can only be an Error or RuntimeException + */ + if (cachedThrowable instanceof Error) + throw (Error) cachedThrowable; + if (cachedThrowable instanceof RuntimeException) + throw (RuntimeException) cachedThrowable; + } } } @@ -1641,6 +1671,24 @@ } } + /** + * Called by closeInternal() only. Be sure to consider the + * synchronization locks carefully before calling it elsewhere. + */ + private void disposeCiphers() { + // See comment in changeReadCiphers() + synchronized (readLock) { + readCipher.dispose(); + } + // See comment in changeReadCiphers() + writeLock.lock(); + try { + writeCipher.dispose(); + } finally { + writeLock.unlock(); + } + } + // // EXCEPTION AND ALERT HANDLING // @@ -1761,7 +1809,9 @@ } int oldState = connectionState; - connectionState = cs_ERROR; + if (connectionState < cs_ERROR) { + connectionState = cs_ERROR; + } /* * Has there been an error received yet? If not, remember it. @@ -1792,13 +1842,17 @@ * Clean up our side. */ closeSocket(); + // Another thread may have disposed the ciphers during closing + if (connectionState < cs_CLOSED) { + connectionState = (oldState == cs_APP_CLOSED) ? cs_APP_CLOSED + : cs_CLOSED; - // See comment in changeReadCiphers() - readCipher.dispose(); - writeCipher.dispose(); + // We should lock readLock and writeLock if no deadlock risks. + // See comment in changeReadCiphers() + readCipher.dispose(); + writeCipher.dispose(); + } - connectionState = (oldState == cs_APP_CLOSED) ? cs_APP_CLOSED - : cs_CLOSED; throw closeReason; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java --- a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2011, 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 @@ -1285,11 +1285,12 @@ // check permission to access and use the secret key of the // Kerberized "host" service - if (kerberosKeys != null) { - + if (kerberosKeys != null && kerberosKeys.length > 0) { if (debug != null && Debug.isOn("handshake")) { - System.out.println("Using Kerberos key: " + - kerberosKeys[0]); + for (SecretKey k: kerberosKeys) { + System.out.println("Using Kerberos key: " + + k); + } } String serverPrincipal = diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java --- a/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, 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 @@ -40,7 +40,7 @@ import sun.security.ssl.Krb5Proxy; /** - * An implementatin of Krb5Proxy that simply delegates to the appropriate + * An implementation of Krb5Proxy that simply delegates to the appropriate * Kerberos APIs. */ public class Krb5ProxyImpl implements Krb5Proxy { @@ -62,7 +62,7 @@ @Override public SecretKey[] getServerKeys(AccessControlContext acc) throws LoginException { - return Krb5Util.getKeys(GSSCaller.CALLER_SSL_SERVER, null, acc); + return Krb5Util.getServiceCreds(GSSCaller.CALLER_SSL_SERVER, null, acc).getKKeys(); } @Override diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java --- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -74,8 +74,6 @@ "[-digestalg <algorithm>] \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"}, {".sigalg.algorithm.name.of.signature.algorithm", "[-sigalg <algorithm>] \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"}, - {".crl.auto.file.include.CRL.in.signed.jar", - "[-crl[:auto| <file>] \u7F72\u540D\u4ED8\u304Djar\u306BCRL\u3092\u542B\u3081\u308B"}, {".verify.verify.a.signed.JAR.file", "[-verify] \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"}, {".verbose.suboptions.verbose.output.when.signing.verifying.", @@ -183,17 +181,13 @@ {"TSA.location.", "TSA\u306E\u5834\u6240: "}, {"TSA.certificate.", "TSA\u8A3C\u660E\u66F8: "}, {"no.response.from.the.Timestamping.Authority.", - "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002 "}, - {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.", - "\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 "}, - {"Supply.the.following.options.to.jarsigner.", - "jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044: "}, + "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u307E\u305F\u306FHTTPS\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044:"}, + {"or", "\u307E\u305F\u306F"}, {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the", "\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}\u3002{1}\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306EX.509\u516C\u958B\u9375\u8A3C\u660E\u66F8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u6709\u52B9\u306AKeyStore\u30A8\u30F3\u30C8\u30EA\u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"}, {"using.an.alternative.signing.mechanism", "\u4EE3\u66FF\u7F72\u540D\u30E1\u30AB\u30CB\u30BA\u30E0\u306E\u4F7F\u7528"}, {"entry.was.signed.on", "\u30A8\u30F3\u30C8\u30EA\u306F{0}\u306B\u7F72\u540D\u3055\u308C\u307E\u3057\u305F"}, - {"with.a.CRL.including.d.entries", "%d\u500B\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u542B\u3080CRL\u3092\u4F7F\u7528"}, {"Warning.", "\u8B66\u544A: "}, {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.", "\u3053\u306Ejar\u306B\u306F\u3001\u6574\u5408\u6027\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u3044\u306A\u3044\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java --- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -53,9 +53,9 @@ {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified", "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"}, {"Usage.jarsigner.options.jar.file.alias", - "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"}, + "\u7528\u6CD5: jarsigner [\u9009\u9879] jar\u6587\u4EF6 \u522B\u540D"}, {".jarsigner.verify.options.jar.file.alias.", - " jarsigner -verify [options] jar-file [alias...]"}, + " jarsigner -verify [\u9009\u9879] jar\u6587\u4EF6 [\u522B\u540D...]"}, {".keystore.url.keystore.location", "[-keystore <url>] \u5BC6\u94A5\u5E93\u4F4D\u7F6E"}, {".storepass.password.password.for.keystore.integrity", @@ -65,7 +65,7 @@ {".keypass.password.password.for.private.key.if.different.", "[-keypass <\u53E3\u4EE4>] \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"}, {".certchain.file.name.of.alternative.certchain.file", - "[-certchain <file>] \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"}, + "[-certchain <\u6587\u4EF6>] \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"}, {".sigfile.file.name.of.SF.DSA.file", "[-sigfile <\u6587\u4EF6>] .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"}, {".signedjar.file.name.of.signed.JAR.file", @@ -74,12 +74,10 @@ "[-digestalg <\u7B97\u6CD5>] \u6458\u8981\u7B97\u6CD5\u7684\u540D\u79F0"}, {".sigalg.algorithm.name.of.signature.algorithm", "[-sigalg <\u7B97\u6CD5>] \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"}, - {".crl.auto.file.include.CRL.in.signed.jar", - "[-crl[:auto| <file>] \u5728\u5DF2\u7B7E\u540D\u7684 jar \u4E2D\u5305\u542B CRL"}, {".verify.verify.a.signed.JAR.file", "[-verify] \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"}, {".verbose.suboptions.verbose.output.when.signing.verifying.", - "[-verbose[:suboptions]] \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"}, + "[-verbose[:\u5B50\u9009\u9879]] \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"}, {".suboptions.can.be.all.grouped.or.summary", " \u5B50\u9009\u9879\u53EF\u4EE5\u662F all, grouped \u6216 summary"}, {".certs.display.certificates.when.verbose.and.verifying", @@ -108,7 +106,7 @@ "[-strict] \u5C06\u8B66\u544A\u89C6\u4E3A\u9519\u8BEF"}, {"Option.lacks.argument", "\u9009\u9879\u7F3A\u5C11\u53C2\u6570"}, {"Please.type.jarsigner.help.for.usage", "\u8BF7\u952E\u5165 jarsigner -help \u4EE5\u4E86\u89E3\u7528\u6CD5"}, - {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jarfile \u540D\u79F0"}, + {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jar \u6587\u4EF6\u7684\u540D\u79F0"}, {"Please.specify.alias.name", "\u8BF7\u6307\u5B9A\u522B\u540D"}, {"Only.one.alias.can.be.specified", "\u53EA\u80FD\u6307\u5B9A\u4E00\u4E2A\u522B\u540D"}, {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.", @@ -159,7 +157,7 @@ {"File.specified.by.certchain.does.not.exist", "\u7531 -certchain \u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728"}, {"Cannot.restore.certchain.from.file.specified", - "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F certchain"}, + "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F\u8BC1\u4E66\u94FE"}, {"Certificate.chain.not.found.in.the.file.specified.", "\u5728\u6307\u5B9A\u7684\u6587\u4EF6\u4E2D\u627E\u4E0D\u5230\u8BC1\u4E66\u94FE\u3002"}, {"found.non.X.509.certificate.in.signer.s.chain", @@ -183,17 +181,13 @@ {"TSA.location.", "TSA \u4F4D\u7F6E: "}, {"TSA.certificate.", "TSA \u8BC1\u4E66: "}, {"no.response.from.the.Timestamping.Authority.", - "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002"}, - {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.", - "\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u4EE3\u7406\u3002 "}, - {"Supply.the.following.options.to.jarsigner.", - "\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "}, + "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u6216 HTTPS \u4EE3\u7406\u3002\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "}, + {"or", "\u6216"}, {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the", "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548 KeyStore \u6761\u76EE\u3002"}, {"using.an.alternative.signing.mechanism", "\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"}, {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"}, - {"with.a.CRL.including.d.entries", "\u5177\u6709\u5305\u542B %d \u4E2A\u6761\u76EE\u7684 CRL"}, {"Warning.", "\u8B66\u544A: "}, {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.", "\u6B64 jar \u5305\u542B\u5C1A\u672A\u8FDB\u884C\u5B8C\u6574\u6027\u68C0\u67E5\u7684\u672A\u7B7E\u540D\u6761\u76EE\u3002 "}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_de.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_de.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_de.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "Keystore-Typ erwartet"}, - {"can.not.specify.Principal.with.a.", - "Principal kann nicht mit einer "}, - {"wildcard.class.without.a.wildcard.name", - "Platzhalterklasse ohne Platzhalternamen angegeben werden"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "Principal kann nicht mit einer Platzhalterklasse ohne Platzhalternamen angegeben werden"}, {"expected.codeBase.or.SignedBy", "codeBase oder SignedBy erwartet"}, {"only.Principal.based.grant.entries.permitted", "Nur Principal-basierte Berechtigungseintr\u00E4ge zul\u00E4ssig"}, {"expected.permission.entry", "Berechtigungseintrag erwartet"}, {"number.", "Nummer "}, - {"expected.", "erwartet "}, - {".read.end.of.file", ", Dateiende gelesen"}, + {"expected.expect.read.end.of.file.", + "{0} erwartet, Dateiende gelesen"}, {"expected.read.end.of.file", "\";\" erwartet, Dateiende gelesen"}, {"line.", "Zeile "}, {".expected.", ": erwartet: \""}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "Nullname angegeben"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_es.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_es.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_es.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "se esperaba un tipo de almac\u00E9n de claves"}, - {"can.not.specify.Principal.with.a.", - "no se puede especificar Principal con una "}, - {"wildcard.class.without.a.wildcard.name", - "clase comod\u00EDn sin nombre de comod\u00EDn"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "no se puede especificar Principal con una clase de comod\u00EDn sin un nombre de comod\u00EDn"}, {"expected.codeBase.or.SignedBy", "se esperaba codeBase o SignedBy"}, {"only.Principal.based.grant.entries.permitted", "s\u00F3lo se permite otorgar entradas basadas en Principal"}, {"expected.permission.entry", "se esperaba un permiso de entrada"}, {"number.", "n\u00FAmero "}, - {"expected.", "se esperaba "}, - {".read.end.of.file", ", se ha le\u00EDdo el final de archivo"}, + {"expected.expect.read.end.of.file.", + "se esperaba [{0}], se ha le\u00EDdo final de archivo"}, {"expected.read.end.of.file", "se esperaba ';', se ha le\u00EDdo el final de archivo"}, {"line.", "l\u00EDnea "}, {".expected.", ": se esperaba '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "se ha proporcionado un nombre nulo"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_fr.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_fr.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_fr.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "type de fichier de cl\u00E9s attendu"}, - {"can.not.specify.Principal.with.a.", - "impossible de sp\u00E9cifier le principal avec une "}, - {"wildcard.class.without.a.wildcard.name", - "classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "impossible de sp\u00E9cifier le principal avec une classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"}, {"expected.codeBase.or.SignedBy", "codeBase ou SignedBy attendu"}, {"only.Principal.based.grant.entries.permitted", "seules les entr\u00E9es bas\u00E9es sur Principal sont autoris\u00E9es"}, {"expected.permission.entry", "entr\u00E9e de droit attendue"}, {"number.", "nombre "}, - {"expected.", "attendu "}, - {".read.end.of.file", ", lecture de fin de fichier"}, + {"expected.expect.read.end.of.file.", + "attendu {0}, lecture de fin de fichier"}, {"expected.read.end.of.file", "attendu ';', lecture de fin de fichier"}, {"line.", "ligne "}, {".expected.", ": attendu '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal : "}, {"SolarisPrincipal.", "SolarisPrincipal : "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "nom NULL fourni"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_it.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_it.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_it.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "tipo keystore previsto"}, - {"can.not.specify.Principal.with.a.", - "impossibile specificare il principal con una "}, - {"wildcard.class.without.a.wildcard.name", - "classe carattere jolly senza un nome carattere jolly"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "impossibile specificare un principal con una classe carattere jolly senza un nome carattere jolly"}, {"expected.codeBase.or.SignedBy", "previsto codeBase o SignedBy"}, {"only.Principal.based.grant.entries.permitted", "sono consentiti solo valori garantiti basati sul principal"}, {"expected.permission.entry", "prevista voce di autorizzazione"}, {"number.", "numero "}, - {"expected.", "previsto "}, - {".read.end.of.file", ", letto end of file"}, + {"expected.expect.read.end.of.file.", + "previsto {0}, letto end of file"}, {"expected.read.end.of.file", "previsto ';', letto end of file"}, {"line.", "riga "}, {".expected.", ": previsto '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "il nome fornito \u00E8 nullo"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_ja.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\u4E88\u60F3\u3055\u308C\u305F\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30BF\u30A4\u30D7"}, - {"can.not.specify.Principal.with.a.", - "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306F\u3001\u6B21\u306E\u3082\u306E\u3092\u4F7F\u7528\u3057\u3066\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 "}, - {"wildcard.class.without.a.wildcard.name", - "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u3001\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"}, {"expected.codeBase.or.SignedBy", "\u4E88\u60F3\u3055\u308C\u305FcodeBase\u307E\u305F\u306FSignedBy"}, {"only.Principal.based.grant.entries.permitted", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u30FB\u30D9\u30FC\u30B9\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u307F\u304C\u8A31\u53EF\u3055\u308C\u307E\u3059\u3002"}, {"expected.permission.entry", "\u4E88\u60F3\u3055\u308C\u305F\u30A2\u30AF\u30BB\u30B9\u6A29\u30A8\u30F3\u30C8\u30EA"}, {"number.", "\u6570 "}, - {"expected.", "\u4E88\u60F3\u5024 "}, - {".read.end.of.file", ", \u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F\u3002"}, + {"expected.expect.read.end.of.file.", + "{0}\u3067\u306F\u306A\u304F\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"}, {"expected.read.end.of.file", "\u4E88\u60F3\u5024\u306F';'\u3067\u3059\u304C\u3001\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"}, {"line.", "\u884C\u756A\u53F7 "}, {".expected.", ": \u4E88\u60F3\u5024'"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "null\u306E\u540D\u524D\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_ko.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_ko.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_ko.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."}, - {"can.not.specify.Principal.with.a.", - "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294"}, - {"wildcard.class.without.a.wildcard.name", - "\uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}, {"expected.codeBase.or.SignedBy", "codeBase \uB610\uB294 SignedBy\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."}, {"only.Principal.based.grant.entries.permitted", "\uC8FC\uCCB4 \uAE30\uBC18 \uAD8C\uD55C \uBD80\uC5EC \uD56D\uBAA9\uB9CC \uD5C8\uC6A9\uB429\uB2C8\uB2E4."}, {"expected.permission.entry", "\uAD8C\uD55C \uD56D\uBAA9\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."}, {"number.", "\uC22B\uC790 "}, - {"expected.", "\uD544\uC694\uD55C \uD56D\uBAA9: "}, - {".read.end.of.file", ", \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."}, + {"expected.expect.read.end.of.file.", + "{0}\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."}, {"expected.read.end.of.file", "';'\uC774 \uD544\uC694\uD558\uC9C0\uB9CC \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."}, {"line.", "\uD589 "}, {".expected.", ": \uD544\uC694\uD55C \uD56D\uBAA9: '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "\uB110 \uC774\uB984\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "tipo de armazenamento de chaves esperado"}, - {"can.not.specify.Principal.with.a.", - "n\u00E3o \u00E9 poss\u00EDvel especificar um Principal com uma "}, - {"wildcard.class.without.a.wildcard.name", - "de curinga sem um nome de curinga"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "n\u00E3o \u00E9 poss\u00EDvel especificar um principal com uma classe curinga sem um nome curinga"}, {"expected.codeBase.or.SignedBy", "CodeBase ou SignedBy esperado"}, {"only.Principal.based.grant.entries.permitted", "somente \u00E9 permitido conceder entradas com base no Principal"}, {"expected.permission.entry", "entrada de permiss\u00E3o esperada"}, {"number.", "n\u00FAmero "}, - {"expected.", "esperado "}, - {".read.end.of.file", ", fim de arquivo lido"}, + {"expected.expect.read.end.of.file.", + "esperado {0}, ler fim do arquivo"}, {"expected.read.end.of.file", "esperado ';', fim de arquivo lido"}, {"line.", "linha "}, {".expected.", ": esperado '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "nome nulo fornecido"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_sv.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_sv.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_sv.java Sat May 14 11:52:15 2011 -0700 @@ -70,11 +70,11 @@ {"Configuration.Error.Can.not.specify.multiple.entries.for.appName", "Konfigurationsfel:\n\tKan inte ange flera poster f\u00F6r {0}"}, {"Configuration.Error.expected.expect.read.end.of.file.", - "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [end of file]"}, + "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"}, {"Configuration.Error.Line.line.expected.expect.found.value.", - "Konfigurationsfel:\n\tLine {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"}, + "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"}, {"Configuration.Error.Line.line.expected.expect.", - "Konfigurationsfel:\n\tLine {0}: f\u00F6rv\u00E4ntade [{1}]"}, + "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}]"}, {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value", "Konfigurationsfel:\n\tRad {0}: systemegenskapen [{1}] ut\u00F6kad till tomt v\u00E4rde"}, @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "f\u00F6rv\u00E4ntad nyckellagertyp"}, - {"can.not.specify.Principal.with.a.", - "kan inte ange identitetshavare med "}, - {"wildcard.class.without.a.wildcard.name", - "jokerteckenklass utan jokerteckennamn"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "kan inte ange identitetshavare med en jokerteckenklass utan ett jokerteckennamn"}, {"expected.codeBase.or.SignedBy", "f\u00F6rv\u00E4ntade codeBase eller SignedBy"}, {"only.Principal.based.grant.entries.permitted", "endast identitetshavarbaserade poster till\u00E5ts"}, {"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"}, {"number.", "antal "}, - {"expected.", "f\u00F6rv\u00E4ntade "}, - {".read.end.of.file", ", l\u00E4ste filslut"}, + {"expected.expect.read.end.of.file.", + "f\u00F6rv\u00E4ntade {0}, l\u00E4ste filslut"}, {"expected.read.end.of.file", "f\u00F6rv\u00E4ntade ';', l\u00E4ste filslut"}, {"line.", "rad "}, {".expected.", ": f\u00F6rv\u00E4ntade '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "angav null-namn"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\u5E94\u4E3A\u5BC6\u94A5\u5E93\u7C7B\u578B"}, - {"can.not.specify.Principal.with.a.", - "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528"}, - {"wildcard.class.without.a.wildcard.name", - "\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"}, {"expected.codeBase.or.SignedBy", "\u5E94\u4E3A codeBase \u6216 SignedBy"}, {"only.Principal.based.grant.entries.permitted", "\u53EA\u5141\u8BB8\u57FA\u4E8E\u4E3B\u7528\u6237\u7684\u6388\u6743\u6761\u76EE"}, {"expected.permission.entry", "\u5E94\u4E3A\u6743\u9650\u6761\u76EE"}, {"number.", "\u7F16\u53F7 "}, - {"expected.", "\u5E94\u4E3A "}, - {".read.end.of.file", ", \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"}, + {"expected.expect.read.end.of.file.", + "\u5E94\u4E3A{0}, \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"}, {"expected.read.end.of.file", "\u5E94\u4E3A ';', \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"}, {"line.", "\u884C "}, {".expected.", ": \u5E94\u4E3A '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "\u63D0\u4F9B\u7684\u540D\u79F0\u4E3A\u7A7A\u503C"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\u9810\u671F\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, - {"can.not.specify.Principal.with.a.", - "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A"}, - {"wildcard.class.without.a.wildcard.name", - "\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"}, {"expected.codeBase.or.SignedBy", "\u9810\u671F\u7684 codeBase \u6216 SignedBy"}, {"only.Principal.based.grant.entries.permitted", "\u53EA\u5141\u8A31\u4EE5 Principal \u70BA\u57FA\u790E\u7684\u6388\u6B0A\u9805\u76EE"}, {"expected.permission.entry", "\u9810\u671F\u7684\u6B0A\u9650\u9805\u76EE"}, {"number.", "\u865F\u78BC "}, - {"expected.", "\u9810\u671F\u7684 "}, - {".read.end.of.file", "\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"}, + {"expected.expect.read.end.of.file.", + "\u9810\u671F\u70BA {0}, \u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"}, {"expected.read.end.of.file", "\u9810\u671F\u7684 ';'\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"}, {"line.", "\u884C "}, {".expected.", ": \u9810\u671F '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "\u63D0\u4F9B\u7A7A\u503C\u540D\u7A31"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java --- a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Sat May 14 11:52:15 2011 -0700 @@ -191,8 +191,8 @@ * * */ - public CodeSigner[] verify(Map<String, CodeSigner[]> verifiedSigners, - Map<String, CodeSigner[]> sigFileSigners) + public CodeSigner[] verify(Hashtable<String, CodeSigner[]> verifiedSigners, + Hashtable<String, CodeSigner[]> sigFileSigners) throws JarException { if (skip) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_de.java --- a/jdk/src/share/classes/sun/security/util/Resources_de.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_de.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Option]..."}, {"Options.", "Optionen:"}, {"Use.keytool.help.for.all.available.commands", "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"}, @@ -67,6 +68,7 @@ "Exportiert ein Zertifikat"}, //-exportcert {"Generates.a.key.pair", "Generiert ein Schl\u00FCsselpaar"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Generiert einen Secret Key"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "}, {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Eintragstyp: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Keystore-Typ: "}, {"Keystore.provider.", "Keystore-Provider: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]: "}, {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]: "}, - {"YES", "JA"}, + {"YES", "Ja"}, {"New.prompt.", "Neues {0}: "}, {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"}, {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "}, @@ -368,7 +368,7 @@ "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Clonen von Private Key-Eintr\u00E4gen"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Warnung Warnung Warnung *****************"}, {"Signer.d.", "Signaturgeber #%d:"}, {"Timestamp.", "Zeitstempel:"}, {"Signature.", "Signatur:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Kein Zertifikat vom SSL-Server"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* Integrit\u00E4t der im Keystore gespeicherten Informationen *"}, + "* Die Integrit\u00E4t der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* Integrit\u00E4t der in srckeystore gespeicherten Informationen*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* ist NICHT verifiziert worden. Damit die Integrit\u00E4t verifiziert werden kann, *"}, - {".you.must.provide.your.keystore.password.", - "* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"}, - {".you.must.provide.the.srckeystore.password.", - "* m\u00FCssen Sie das Kennwort f\u00FCr srckeystore angeben. *"}, - + "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"}, @@ -403,7 +393,7 @@ "Zertifikat der obersten Ebene in Antwort:\n"}, {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "}, {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]: "}, - {"NO", "NEIN"}, + {"NO", "Nein"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_es.java --- a/jdk/src/share/classes/sun/security/util/Resources_es.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_es.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Opci\u00F3n]..."}, {"Options.", "Opciones:"}, {"Use.keytool.help.for.all.available.commands", "Utilice\"keytool -help\" para todos los comandos disponibles"}, @@ -67,6 +68,7 @@ "Exporta el certificado"}, //-exportcert {"Generates.a.key.pair", "Genera un par de claves"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Genera un clave secreta"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -112,7 +114,7 @@ {"destination.keystore.type", "tipo de almac\u00E9n de claves de destino"}, //-deststoretype {"distinguished.name", - "nombre distinguido"}, //-dname + "nombre distintivo"}, //-dname {"X.509.extension", "extensi\u00F3n X.509"}, //-ext {"output.file.name", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Longitud de la Cadena de Certificado: "}, {"Certificate.i.1.", "Certificado[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Huella Digital de Certificado (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Tipo de Entrada: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Tipo de Almac\u00E9n de Claves: "}, {"Keystore.provider.", "Proveedor de Almac\u00E9n de Claves: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "\u00BFA\u00FAn desea agregarlo a su propio almac\u00E9n de claves? [no]: "}, {"Trust.this.certificate.no.", "\u00BFConfiar en este certificado? [no]: "}, - {"YES", "S\u00CD"}, + {"YES", "S\u00ED"}, {"New.prompt.", "Nuevo {0}: "}, {"Passwords.must.differ", "Las contrase\u00F1as deben ser distintas"}, {"Re.enter.new.prompt.", "Vuelva a escribir el nuevo {0}: "}, @@ -368,7 +368,7 @@ "El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone s\u00F3lo permite la clonaci\u00F3n de entradas de claves privadas"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Advertencia Advertencia Advertencia *****************"}, {"Signer.d.", "#%d de Firmante:"}, {"Timestamp.", "Registro de Hora:"}, {"Signature.", "Firma:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Ning\u00FAn certificado del servidor SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* La integridad de la informaci\u00F3n almacenada en su almac\u00E9n de claves *"}, + "* La integridad de la informaci\u00F3n almacenada en el almac\u00E9n de claves *\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a del almac\u00E9n de claves. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* La totalidad de la informaci\u00F3n almacenada en srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* NO se ha comprobado. Para comprobar dicha integridad, *"}, - {".you.must.provide.your.keystore.password.", - "* deber\u00E1 proporcionar su contrase\u00F1a de almac\u00E9n de claves. *"}, - {".you.must.provide.the.srckeystore.password.", - "* deber\u00E1 indicar la contrase\u00F1a de srckeystore. *"}, - + "* La integridad de la informaci\u00F3n almacenada en srckeystore*\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a de srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "La respuesta de certificado no contiene una clave p\u00FAblica para <{0}>"}, @@ -403,7 +393,7 @@ "Certificado de nivel superior en la respuesta:\n"}, {".is.not.trusted.", "... no es de confianza. "}, {"Install.reply.anyway.no.", "\u00BFInstalar respuesta de todos modos? [no]: "}, - {"NO", "NO"}, + {"NO", "No"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Las claves p\u00FAblicas en la respuesta y en el almac\u00E9n de claves no coinciden"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_fr.java --- a/jdk/src/share/classes/sun/security/util/Resources_fr.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_fr.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Option]..."}, {"Options.", "Options :"}, {"Use.keytool.help.for.all.available.commands", "Utiliser \"keytool -help\" pour toutes les commandes disponibles"}, @@ -67,6 +68,7 @@ "Exporte le certificat"}, //-exportcert {"Generates.a.key.pair", "G\u00E9n\u00E8re une paire de cl\u00E9s"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "G\u00E9n\u00E8re une cl\u00E9 secr\u00E8te"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Longueur de cha\u00EEne du certificat : "}, {"Certificate.i.1.", "Certificat[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Empreinte du certificat (SHA1) : "}, - {"Entry.type.trustedCertEntry.", "Type d'entr\u00E9e : trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Type de fichier de cl\u00E9s : "}, {"Keystore.provider.", "Fournisseur de fichier de cl\u00E9s : "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "Voulez-vous toujours l'ajouter \u00E0 votre fichier de cl\u00E9s ? [non] : "}, {"Trust.this.certificate.no.", "Faire confiance \u00E0 ce certificat ? [non] : "}, - {"YES", "OUI"}, + {"YES", "Oui"}, {"New.prompt.", "Nouveau {0} : "}, {"Passwords.must.differ", "Les mots de passe doivent diff\u00E9rer"}, {"Re.enter.new.prompt.", "Indiquez encore le nouveau {0} : "}, @@ -368,7 +368,7 @@ "L''entr\u00E9e \u00E0 laquelle l''alias <{0}> fait r\u00E9f\u00E9rence n''est pas une entr\u00E9e de type cl\u00E9 priv\u00E9e. La commande -keyclone prend uniquement en charge le clonage des cl\u00E9s priv\u00E9es"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Avertissement Avertissement Avertissement *****************"}, {"Signer.d.", "Signataire n\u00B0%d :"}, {"Timestamp.", "Horodatage :"}, {"Signature.", "Signature :"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Aucun certificat du serveur SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *"}, + "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *"}, - {".you.must.provide.your.keystore.password.", - "* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"}, - {".you.must.provide.the.srckeystore.password.", - "* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"}, - + "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "La r\u00E9ponse au certificat ne contient pas de cl\u00E9 publique pour <{0}>"}, @@ -403,7 +393,7 @@ "Certificat de niveau sup\u00E9rieur dans la r\u00E9ponse :\n"}, {".is.not.trusted.", "... non s\u00E9curis\u00E9. "}, {"Install.reply.anyway.no.", "Installer la r\u00E9ponse quand m\u00EAme ? [non] : "}, - {"NO", "NON"}, + {"NO", "Non"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Les cl\u00E9s publiques de la r\u00E9ponse et du fichier de cl\u00E9s ne concordent pas"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_it.java --- a/jdk/src/share/classes/sun/security/util/Resources_it.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_it.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Opzione]..."}, {"Options.", "Opzioni:"}, {"Use.keytool.help.for.all.available.commands", "Utilizzare \"keytool -help\" per visualizzare tutti i comandi disponibili"}, @@ -67,6 +68,7 @@ "Esporta il certificato"}, //-exportcert {"Generates.a.key.pair", "Genera una coppia di chiavi"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Genera una chiave segreta"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Lunghezza catena certificati: "}, {"Certificate.i.1.", "Certificato[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Impronta digitale certificato (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Tipo di voce: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Tipo keystore: "}, {"Keystore.provider.", "Provider keystore: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "L''alias <{0}> fa riferimento a un tipo di voce che non \u00E8 una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private."}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Avvertenza Avvertenza Avvertenza *****************"}, {"Signer.d.", "Firmatario #%d:"}, {"Timestamp.", "Indicatore orario:"}, {"Signature.", "Firma:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Nessun certificato dal server SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *"}, + "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del keystore. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* L'integrit\u00E0 delle informazioni salvate nel srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* NON \u00E8 stata verificata. A tale scopo \u00E8 necessario fornire *"}, - {".you.must.provide.your.keystore.password.", - "* la password del keystore. *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u00C8 necessario fornire la password per il srckeystore. *"}, - + "* L'integrit\u00E0 delle informazioni memorizzate nel srckeystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "La risposta del certificato non contiene la chiave pubblica per <{0}>"}, @@ -403,7 +393,7 @@ "Certificato di primo livello nella risposta:\n"}, {".is.not.trusted.", "...non \u00E8 considerato sicuro. "}, {"Install.reply.anyway.no.", "Installare la risposta? [no]: "}, - {"NO", "NO"}, + {"NO", "No"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Le chiavi pubbliche nella risposta e nel keystore non corrispondono"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_ja.java --- a/jdk/src/share/classes/sun/security/util/Resources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\u30AA\u30D7\u30B7\u30E7\u30F3]..."}, {"Options.", "\u30AA\u30D7\u30B7\u30E7\u30F3:"}, {"Use.keytool.help.for.all.available.commands", "\u4F7F\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u306B\u3064\u3044\u3066\u306F\"keytool -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"}, @@ -67,6 +68,7 @@ "\u8A3C\u660E\u66F8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-exportcert {"Generates.a.key.pair", "\u9375\u30DA\u30A2\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "\u79D8\u5BC6\u9375\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306E\u9577\u3055: "}, {"Certificate.i.1.", "\u8A3C\u660E\u66F8[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8(SHA1): "}, - {"Entry.type.trustedCertEntry.", "\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30D7: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7: "}, {"Keystore.provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "\u5225\u540D<{0}>\u304C\u53C2\u7167\u3057\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002-keyclone\u30B3\u30DE\u30F3\u30C9\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u4F5C\u6210\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "*****************\u8B66\u544A \u8B66\u544A \u8B66\u544A*****************"}, {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"}, {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"}, {"Signature.", "\u7F72\u540D:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "SSL\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027 *"}, + "*\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* \u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u5B8C\u5168\u6027 *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F *"}, - {".you.must.provide.your.keystore.password.", - "* \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 *"}, - + "*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\u8A3C\u660E\u66F8\u5FDC\u7B54\u306B\u306F\u3001<{0}>\u306E\u516C\u958B\u9375\u306F\u542B\u307E\u308C\u307E\u305B\u3093"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_ko.java --- a/jdk/src/share/classes/sun/security/util/Resources_ko.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_ko.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\uC635\uC158]..."}, {"Options.", "\uC635\uC158:"}, {"Use.keytool.help.for.all.available.commands", "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uBA85\uB839\uC5D0 \"keytool -help\" \uC0AC\uC6A9"}, @@ -67,6 +68,7 @@ "\uC778\uC99D\uC11C\uB97C \uC775\uC2A4\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-exportcert {"Generates.a.key.pair", "\uD0A4 \uC30D\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\uC778\uC99D\uC11C \uCCB4\uC778 \uAE38\uC774: "}, {"Certificate.i.1.", "\uC778\uC99D\uC11C[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\uC778\uC99D\uC11C \uC9C0\uBB38(SHA1): "}, - {"Entry.type.trustedCertEntry.", "\uD56D\uBAA9 \uC720\uD615: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615: "}, {"Keystore.provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "<{0}> \uBCC4\uCE6D\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC774 \uC544\uB2CC \uD56D\uBAA9 \uC720\uD615\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4. -keyclone \uBA85\uB839\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC758 \uBCF5\uC81C\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4."}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** \uACBD\uACE0 \uACBD\uACE0 \uACBD\uACE0 *****************"}, {"Signer.d.", "\uC11C\uBA85\uC790 #%d:"}, {"Timestamp.", "\uC2DC\uAC04 \uAE30\uB85D:"}, {"Signature.", "\uC11C\uBA85:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "SSL \uC11C\uBC84\uC5D0\uC11C \uAC00\uC838\uC628 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *"}, + "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74 *"}, - {".you.must.provide.your.keystore.password.", - "* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, - {".you.must.provide.the.srckeystore.password.", - "* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, - + "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\uC778\uC99D\uC11C \uD68C\uC2E0\uC5D0 <{0}>\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_pt_BR.java --- a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Op\u00E7\u00E3o]..."}, {"Options.", "Op\u00E7\u00F5es:"}, {"Use.keytool.help.for.all.available.commands", "Use \"keytool -help\" para todos os comandos dispon\u00EDveis"}, @@ -67,8 +68,9 @@ "Exporta o certificado"}, //-exportcert {"Generates.a.key.pair", "Gera um par de chaves"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", - "Gera uma chave secreta"}, //-genseckey + "Gera uma chave Secreta"}, //-genseckey {"Generates.certificate.from.a.certificate.request", "Gera um certificado de uma solicita\u00E7\u00E3o de certificado"}, //-gencert {"Generates.CRL", "Gera CRL"}, //-gencrl @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Comprimento da cadeia de certificados: "}, {"Certificate.i.1.", "Certificado[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Fingerprint (MD5) do certificado: "}, - {"Entry.type.trustedCertEntry.", "Tipo de entrada: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Tipo de \u00E1rea de armazenamento de chaves: "}, {"Keystore.provider.", "Fornecedor da \u00E1rea de armazenamento de chaves: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "Ainda deseja adicion\u00E1-lo \u00E0 sua \u00E1rea de armazenamento de chaves? [n\u00E3o]: "}, {"Trust.this.certificate.no.", "Confiar neste certificado? [n\u00E3o]: "}, - {"YES", "SIM"}, + {"YES", "Sim"}, {"New.prompt.", "Nova {0}: "}, {"Passwords.must.differ", "As senhas devem ser diferentes"}, {"Re.enter.new.prompt.", "Informe novamente a nova {0}: "}, @@ -368,7 +368,7 @@ "O alias <{0}> faz refer\u00EAncia a um tipo de entrada que n\u00E3o \u00E9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00E0 clonagem de entradas de chave privada"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Advert\u00EAncia Advert\u00EAncia Advert\u00EAncia *****************"}, {"Signer.d.", "Signat\u00E1rio #%d:"}, {"Timestamp.", "Timestamp:"}, {"Signature.", "Assinatura:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "N\u00E3o \u00E9 um certificado do servidor SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *"}, + "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha da \u00E1rea de armazenamento de chaves. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* N\u00C3O foi verificada! Para verificar a integridade destas informa\u00E7\u00F5es, *"}, - {".you.must.provide.your.keystore.password.", - "* voc\u00EA deve fornecer a senha da sua \u00E1rea de armazenamento de chaves. *"}, - {".you.must.provide.the.srckeystore.password.", - "* voc\u00EA deve fornecer a senha do srckeystore. *"}, - + "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha do srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "A resposta do certificado n\u00E3o cont\u00E9m a chave p\u00FAblica de <{0}>"}, @@ -403,7 +393,7 @@ "Certificado de n\u00EDvel superior na resposta:\n"}, {".is.not.trusted.", "... n\u00E3o \u00E9 confi\u00E1vel. "}, {"Install.reply.anyway.no.", "Instalar resposta assim mesmo? [n\u00E3o]: "}, - {"NO", "N\u00C3O"}, + {"NO", "N\u00E3o"}, {"Public.keys.in.reply.and.keystore.don.t.match", "As chaves p\u00FAblicas da resposta e da \u00E1rea de armazenamento de chaves n\u00E3o correspondem"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", @@ -440,9 +430,9 @@ "Advert\u00EAncia: Argumento(s) inv\u00E1lido(s) para o construtor: {0}"}, {"Illegal.Principal.Type.type", "Tipo Principal Inv\u00E1lido: {0}"}, {"Illegal.option.option", "Op\u00E7\u00E3o inv\u00E1lida: {0}"}, - {"Usage.policytool.options.", "Uso: policytool [options]"}, + {"Usage.policytool.options.", "Uso: policytool [op\u00E7\u00F5es]"}, {".file.file.policy.file.location", - " [-file <file>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"}, + " [-file <arquivo>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"}, {"New", "Novo"}, {"Open", "Abrir"}, {"Save", "Salvar"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_sv.java --- a/jdk/src/share/classes/sun/security/util/Resources_sv.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_sv.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Alternativ]..."}, {"Options.", "Alternativ:"}, {"Use.keytool.help.for.all.available.commands", "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg\" f\u00F6r alla tillg\u00E4ngliga kommandon"}, @@ -67,6 +68,7 @@ "Exporterar certifikat"}, //-exportcert {"Generates.a.key.pair", "Genererar nyckelpar"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Genererar hemlig nyckel"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "L\u00E4ngd p\u00E5 certifikatskedja: "}, {"Certificate.i.1.", "Certifikat[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Certifikatets fingeravtryck (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Posttyp: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Nyckellagertyp: "}, {"Keystore.provider.", "Nyckellagerleverant\u00F6r: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "Vill du fortfarande l\u00E4gga till det i ditt eget nyckellagret? [nej]: "}, {"Trust.this.certificate.no.", "Litar du p\u00E5 det h\u00E4r certifikatet? [nej]: "}, - {"YES", "JA"}, + {"YES", "Ja"}, {"New.prompt.", "Nytt {0}: "}, {"Passwords.must.differ", "L\u00F6senorden m\u00E5ste vara olika"}, {"Re.enter.new.prompt.", "Ange nytt {0} igen: "}, @@ -368,7 +368,7 @@ "Aliaset <{0}> refererar till en posttyp som inte \u00E4r n\u00E5gon privat nyckelpost. Kommandot -keyclone har endast st\u00F6d f\u00F6r kloning av privata nyckelposter"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Varning Varning Varning *****************"}, {"Signer.d.", "Signerare #%d:"}, {"Timestamp.", "Tidsst\u00E4mpel:"}, {"Signature.", "Underskrift:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Inget certifikat fr\u00E5n SSL-servern"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *"}, + "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r nyckellagret. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* Integriteten f\u00F6r informationen som lagras i srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* har INTE verifierats! Om du vill verifiera dess integritet, *"}, - {".you.must.provide.your.keystore.password.", - "* m\u00E5ste du ange nyckellagerl\u00F6senord. *"}, - {".you.must.provide.the.srckeystore.password.", - "* du m\u00E5ste ange l\u00F6senordet f\u00F6r srckeystore. *"}, - + "* Integriteten f\u00F6r den information som lagras i srckeystore*\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "Certifikatsvaret inneh\u00E5ller inte n\u00E5gon offentlig nyckel f\u00F6r <{0}>"}, @@ -403,7 +393,7 @@ "Toppniv\u00E5certifikatet i svaret:\n"}, {".is.not.trusted.", "... \u00E4r inte betrott. "}, {"Install.reply.anyway.no.", "Vill du installera svaret \u00E4nd\u00E5? [nej]: "}, - {"NO", "NEJ"}, + {"NO", "Nej"}, {"Public.keys.in.reply.and.keystore.don.t.match", "De offentliga nycklarna i svaret och nyckellagret matchar inte varandra"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", @@ -639,9 +629,9 @@ {"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"}, {"number.", "antal "}, {"expected.expect.read.end.of.file.", - "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [end of file]"}, + "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"}, {"expected.read.end.of.file.", - "f\u00F6rv\u00E4ntade [;], l\u00E4ste [end of file]"}, + "f\u00F6rv\u00E4ntade [;], l\u00E4ste [filslut]"}, {"line.number.msg", "rad {0}: {1}"}, {"line.number.expected.expect.found.actual.", "rad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_zh_CN.java --- a/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\u9009\u9879]..."}, {"Options.", "\u9009\u9879:"}, {"Use.keytool.help.for.all.available.commands", "\u4F7F\u7528 \"keytool -help\" \u83B7\u53D6\u6240\u6709\u53EF\u7528\u547D\u4EE4"}, @@ -67,8 +68,9 @@ "\u5BFC\u51FA\u8BC1\u4E66"}, //-exportcert {"Generates.a.key.pair", "\u751F\u6210\u5BC6\u94A5\u5BF9"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", - "\u751F\u6210\u5BC6\u94A5"}, //-genseckey + "\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, //-genseckey {"Generates.certificate.from.a.certificate.request", "\u6839\u636E\u8BC1\u4E66\u8BF7\u6C42\u751F\u6210\u8BC1\u4E66"}, //-gencert {"Generates.CRL", "\u751F\u6210 CRL"}, //-gencrl @@ -187,7 +189,7 @@ {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "}, {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"}, {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.", - "\u8B66\u544A: PKCS12 KeyStores \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"}, + "\u8B66\u544A: PKCS12 KeyStore \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"}, {".keystore.must.be.NONE.if.storetype.is.{0}", "\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"}, {"Too.many.retries.program.terminated", @@ -208,13 +210,13 @@ "\u5982\u679C\u6E90\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"}, {"Illegal.startdate.value", "\u975E\u6CD5\u5F00\u59CB\u65E5\u671F\u503C"}, {"Validity.must.be.greater.than.zero", - "\u6709\u6548\u6027\u5FC5\u987B\u5927\u4E8E\u96F6"}, + "\u6709\u6548\u671F\u5FC5\u987B\u5927\u4E8E\u96F6"}, {"provName.not.a.provider", "{0}\u4E0D\u662F\u63D0\u4F9B\u65B9"}, {"Usage.error.no.command.provided", "\u7528\u6CD5\u9519\u8BEF: \u6CA1\u6709\u63D0\u4F9B\u547D\u4EE4"}, {"Source.keystore.file.exists.but.is.empty.", "\u6E90\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "}, {"Please.specify.srckeystore", "\u8BF7\u6307\u5B9A -srckeystore"}, {"Must.not.specify.both.v.and.rfc.with.list.command", - "\u4E0D\u80FD\u4F7F\u7528 'list' \u547D\u4EE4\u6765\u6307\u5B9A -v \u53CA -rfc"}, + "'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A -v \u53CA -rfc"}, {"Key.password.must.be.at.least.6.characters", "\u5BC6\u94A5\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"}, {"New.password.must.be.at.least.6.characters", @@ -244,7 +246,7 @@ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore", "\u8B66\u544A: \u6B63\u5728\u8986\u76D6\u76EE\u6807\u5BC6\u94A5\u5E93\u4E2D\u7684\u73B0\u6709\u522B\u540D {0}"}, {"Existing.entry.alias.alias.exists.overwrite.no.", - "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [\u5426]: "}, + "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [no]: "}, {"Too.many.failures.try.later", "\u6545\u969C\u592A\u591A - \u8BF7\u7A0D\u540E\u518D\u8BD5"}, {"Certification.request.stored.in.file.filename.", "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BA4\u8BC1\u8BF7\u6C42"}, @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\u8BC1\u4E66\u94FE\u957F\u5EA6: "}, {"Certificate.i.1.", "\u8BC1\u4E66[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\u8BC1\u4E66\u6307\u7EB9 (SHA1): "}, - {"Entry.type.trustedCertEntry.", "\u6761\u76EE\u7C7B\u578B: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\u5BC6\u94A5\u5E93\u7C7B\u578B: "}, {"Keystore.provider.", "\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -325,13 +325,13 @@ {"Certificate.already.exists.in.keystore.under.alias.trustalias.", "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u5BC6\u94A5\u5E93\u4E2D"}, {"Do.you.still.want.to.add.it.no.", - "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [\u5426]: "}, + "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [no]: "}, {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.", "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u7CFB\u7EDF\u8303\u56F4\u7684 CA \u5BC6\u94A5\u5E93\u4E2D"}, {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", - "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [\u5426]: "}, - {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [\u5426]: "}, - {"YES", "YES"}, + "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [no]: "}, + {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [no]: "}, + {"YES", "\u662F"}, {"New.prompt.", "\u65B0{0}: "}, {"Passwords.must.differ", "\u53E3\u4EE4\u4E0D\u80FD\u76F8\u540C"}, {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F93\u5165\u65B0{0}: "}, @@ -339,7 +339,7 @@ {"They.don.t.match.Try.again", "\u5B83\u4EEC\u4E0D\u5339\u914D\u3002\u8BF7\u91CD\u8BD5"}, {"Enter.prompt.alias.name.", "\u8F93\u5165{0}\u522B\u540D: "}, {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.", - "\u5BFC\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "}, + "\u8F93\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "}, {"Enter.alias.name.", "\u8F93\u5165\u522B\u540D: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"}, @@ -368,7 +368,7 @@ "\u522B\u540D <{0}> \u5F15\u7528\u4E86\u4E0D\u5C5E\u4E8E\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u6761\u76EE\u7C7B\u578B\u3002-keyclone \u547D\u4EE4\u4EC5\u652F\u6301\u5BF9\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u514B\u9686"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"}, {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"}, {"Timestamp.", "\u65F6\u95F4\u6233:"}, {"Signature.", "\u7B7E\u540D:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "\u6CA1\u6709\u6765\u81EA SSL \u670D\u52A1\u5668\u7684\u8BC1\u4E66"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *"}, + "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *"}, - {".you.must.provide.your.keystore.password.", - "* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, - + "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027*\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\u8BC1\u4E66\u56DE\u590D\u4E2D\u4E0D\u5305\u542B <{0}> \u7684\u516C\u5171\u5BC6\u94A5"}, @@ -402,8 +392,8 @@ {"Top.level.certificate.in.reply.", "\u56DE\u590D\u4E2D\u7684\u9876\u7EA7\u8BC1\u4E66:\n"}, {".is.not.trusted.", "... \u662F\u4E0D\u53EF\u4FE1\u7684\u3002"}, - {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [\u5426]: "}, - {"NO", "NO"}, + {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [no]: "}, + {"NO", "\u5426"}, {"Public.keys.in.reply.and.keystore.don.t.match", "\u56DE\u590D\u4E2D\u7684\u516C\u5171\u5BC6\u94A5\u4E0E\u5BC6\u94A5\u5E93\u4E0D\u5339\u914D"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", @@ -415,7 +405,7 @@ {"Secret.key.not.generated.alias.alias.already.exists", "\u6CA1\u6709\u751F\u6210\u5BC6\u94A5, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"}, {"Please.provide.keysize.for.secret.key.generation", - "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BC6\u94A5"}, + "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, {"Extensions.", "\u6269\u5C55: "}, {".Empty.value.", "(\u7A7A\u503C)"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_zh_TW.java --- a/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\u9078\u9805]..."}, {"Options.", "\u9078\u9805:"}, {"Use.keytool.help.for.all.available.commands", "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"}, @@ -67,6 +68,7 @@ "\u532F\u51FA\u6191\u8B49"}, //-exportcert {"Generates.a.key.pair", "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "}, {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "}, - {"Entry.type.trustedCertEntry.", "\u8F38\u5165\u985E\u578B: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "}, {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"}, {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"}, {"Timestamp.", "\u6642\u6233:"}, {"Signature.", "\u7C3D\u7AE0:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \u8CC7\u8A0A\u7684\u5B8C\u6574\u6027\u5DF2\u5132\u5B58\u5728\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D *"}, + "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002 *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* \u8CC7\u8A0A\u7684\u5B8C\u6574\u6027\u5DF2\u5132\u5B58\u5728 srckeystore \u4E2D *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \u5C1A\u672A\u88AB\u9A57\u8B49\uFF01\u70BA\u4E86\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*"}, - {".you.must.provide.your.keystore.password.", - "* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5BC6\u78BC\u3002 *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u60A8\u5FC5\u9808\u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"}, - + "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/SignatureFileManifest.java --- a/jdk/src/share/classes/sun/security/util/SignatureFileManifest.java Wed May 11 16:12:01 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,251 +0,0 @@ -/* - * Copyright (c) 2011, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.security.util; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.jar.Attributes; -import java.util.jar.Manifest; - -/** - * This class provides streaming mode reading of manifest files. - * Used by {@link SignatureFileVerifier}. - */ -class SignatureFileManifest extends Manifest { - - /* - * Reading a manifest into this object by calling update(byte[]) on chunks. - * During the reading, the bytes are saved in (@code current} until a line - * is complete and the key-value pair is saved in {@code currentAttr}. When - * a section is complete, {@code consumeAttr} is called to merge - * {@code currentAttr} into main attributes or a named entry. - */ - - // Internal state during update() style reading - // 0. not in update mode - // 1, in update mode but main attributes not completed yet - // 2. main attributes completed, still reading the entries - private int state = 0; - - // The partial line read - private byte[] current; - - // Number of bytes in current - private int currentPos = 0; - - // The current Attribute - private Attributes currentAttr; - - /** - * Reads a manifest in chunks. - * - * This method must be called in a row, reading chunks from a single - * manifest file by order. After all chunks are read, caller must call - * {@code update(null)} to fully consume the manifest. - * - * The entry names and attributes read will be merged in with the current - * manifest entries. The {@link #read} method cannot be called inside a - * row of update calls. - * - * Along with the calls, caller can call {@link #getMainAttributes()}, - * {@link #getAttributes(java.lang.String)} or {@link #getEntries()} - * to get already available contents. However, in order not to return - * partial result, when the main attributes in the new manifest is not - * consumed completely, {@link #getMainAttributes()} throws an - * {@code IllegalStateException}. When a certain named entry is not - * consumed completely, {@link #getAttributes(java.lang.String)} - * returns the old {@code Attributes} for the name (if it exists). - * - * @param data null for last call, otherwise, feeding chunks - * @param offset offset into data to begin read - * @param length length of data after offset to read - * @exception IOException if an I/O error has occurred - * @exception IllegalStateException if {@code update(null)} is called - * without any previous {@code update(non-null)} call - */ - public void update(byte[] data, int offset, int length) throws IOException { - - // The last call - if (data == null) { - if (state == 0) { - throw new IllegalStateException("No data to update"); - } - // We accept manifest not ended with \n or \n\n - if (hasLastByte()) { - consumeCurrent(); - } - // We accept empty lines at the end - if (!currentAttr.isEmpty()) { - consumeAttr(); - } - state = 0; // back to non-update state - current = null; - currentAttr = null; - return; - } - - // The first call - if (state == 0) { - current = new byte[1024]; - currentAttr = super.getMainAttributes(); // the main attribute - state = 1; - } - - int end = offset + length; - - while (offset < end) { - switch (data[offset]) { - case '\r': - break; // always skip - case '\n': - if (hasLastByte() && lastByte() == '\n') { // new section - consumeCurrent(); - consumeAttr(); - if (state == 1) { - state = 2; - } - currentAttr = new Attributes(2); - } else { - if (hasLastByte()) { - // save \n into current but do not parse, - // there might be a continuation later - ensureCapacity(); - current[currentPos++] = data[offset]; - } else if (state == 1) { - // there can be multiple empty lines between - // sections, but cannot be at the beginning - throw new IOException("invalid manifest format"); - } - } - break; - case ' ': - if (!hasLastByte()) { - throw new IOException("invalid manifest format"); - } else if (lastByte() == '\n') { - currentPos--; // continuation, remove last \n - } else { // a very normal ' ' - ensureCapacity(); - current[currentPos++] = data[offset]; - } - break; - default: - if (hasLastByte() && lastByte() == '\n') { - // The start of a new pair, not continuation - consumeCurrent(); // the last line read - } - ensureCapacity(); - current[currentPos++] = data[offset]; - break; - } - offset++; - } - } - - /** - * Returns the main Attributes for the Manifest. - * @exception IllegalStateException the main attributes is being read - * @return the main Attributes for the Manifest - */ - public Attributes getMainAttributes() { - if (state == 1) { - throw new IllegalStateException(); - } - return super.getMainAttributes(); - } - - /** - * Reads the Manifest from the specified InputStream. The entry - * names and attributes read will be merged in with the current - * manifest entries. - * - * @param is the input stream - * @exception IOException if an I/O error has occurred - * @exception IllegalStateException if called between two {@link #update} - * calls - */ - public void read(InputStream is) throws IOException { - if (state != 0) { - throw new IllegalStateException("Cannot call read between updates"); - } - super.read(is); - } - - /* - * ---------- Helper methods ----------------- - */ - - private void ensureCapacity() { - if (currentPos >= current.length-1) { - current = Arrays.copyOf(current, current.length*2); - } - } - - private boolean hasLastByte() { - return currentPos > 0; - } - - private byte lastByte() { - return current[currentPos-1]; - } - - // Parse current as key:value and save into currentAttr. - // There MUST be something inside current. - private void consumeCurrent() throws IOException { - // current normally has a \n end, except for the last line - if (current[currentPos-1] == '\n') currentPos--; - for (int i=0; i<currentPos; i++) { - if (current[i] == ':') { - String key = new String(current, 0, 0, i); - i++; - while (i < currentPos && current[i] == ' ') { i++; } - String value = new String(current, i, currentPos-i, "UTF-8"); - currentAttr.putValue(key, value); - currentPos = 0; - return; - } - } - throw new IOException("invalid header field"); - } - - // Merge currentAttr into Manifest - private void consumeAttr() throws IOException { - // Only needed for named entries. For the main attribute, key/value - // is added into attr directly, but since getMainAttributes() throws - // an exception, the partial data is not leaked. - if (state != 1) { - String name = currentAttr.getValue("Name"); - if (name != null) { - currentAttr.remove(new Attributes.Name("Name")); - Attributes old = getAttributes(name); - if (old != null) old.putAll(currentAttr); - else getEntries().put(name, currentAttr); - } else { - throw new IOException("invalid manifest format"); - } - } - } -} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java --- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Sat May 14 11:52:15 2011 -0700 @@ -55,8 +55,8 @@ /** the PKCS7 block for this .DSA/.RSA/.EC file */ private PKCS7 block; - // the content of the raw .SF file as an InputStream - private InputStream sfStream; + /** the raw bytes of the .SF file */ + private byte sfBytes[]; /** the name of the signature block file, uppercased and without * the extension (.DSA/.RSA/.EC) @@ -66,9 +66,6 @@ /** the ManifestDigester */ private ManifestDigester md; - /** The MANIFEST.MF */ - private Manifest man; - /** cache of created MessageDigest objects */ private HashMap<String, MessageDigest> createdDigests; @@ -86,7 +83,6 @@ * @param rawBytes the raw bytes of the signature block file */ public SignatureFileVerifier(ArrayList<CodeSigner[]> signerCache, - Manifest man, ManifestDigester md, String name, byte rawBytes[]) @@ -98,18 +94,13 @@ try { obj = Providers.startJarVerification(); block = new PKCS7(rawBytes); - byte[] contentData = block.getContentInfo().getData(); - if (contentData != null) { - sfStream = new ByteArrayInputStream(contentData); - } + sfBytes = block.getContentInfo().getData(); certificateFactory = CertificateFactory.getInstance("X509"); } finally { Providers.stopJarVerification(obj); } this.name = name.substring(0, name.lastIndexOf(".")) .toUpperCase(Locale.ENGLISH); - - this.man = man; this.md = md; this.signerCache = signerCache; } @@ -117,13 +108,31 @@ /** * returns true if we need the .SF file */ - public boolean needSignatureFile() + public boolean needSignatureFileBytes() { - return sfStream == null; + + return sfBytes == null; } - public void setSignatureFile(InputStream ins) { - this.sfStream = ins; + + /** + * returns true if we need this .SF file. + * + * @param name the name of the .SF file without the extension + * + */ + public boolean needSignatureFile(String name) + { + return this.name.equalsIgnoreCase(name); + } + + /** + * used to set the raw bytes of the .SF file when it + * is external to the signature block file. + */ + public void setSignatureFile(byte sfBytes[]) + { + this.sfBytes = sfBytes; } /** @@ -136,18 +145,12 @@ * Signature File or PKCS7 block file name */ public static boolean isBlockOrSF(String s) { - return s.endsWith(".SF") || isBlock(s); - } - - /** - * Utility method used by JarVerifier to determine PKCS7 block - * files names that are supported - * - * @param s file name - * @return true if the input file name is a PKCS7 block file name - */ - public static boolean isBlock(String s) { - return s.endsWith(".DSA") || s.endsWith(".RSA") || s.endsWith(".EC"); + // we currently only support DSA and RSA PKCS7 blocks + if (s.endsWith(".SF") || s.endsWith(".DSA") || + s.endsWith(".RSA") || s.endsWith(".EC")) { + return true; + } + return false; } /** get digest from cache */ @@ -177,7 +180,7 @@ * * */ - public void process(Map<String, CodeSigner[]> signers, + public void process(Hashtable<String, CodeSigner[]> signers, List manifestDigests) throws IOException, SignatureException, NoSuchAlgorithmException, JarException, CertificateException @@ -194,86 +197,31 @@ } - private void processImpl(Map<String, CodeSigner[]> signers, + private void processImpl(Hashtable<String, CodeSigner[]> signers, List manifestDigests) throws IOException, SignatureException, NoSuchAlgorithmException, JarException, CertificateException { - SignatureFileManifest sf = new SignatureFileManifest(); - InputStream ins = sfStream; + Manifest sf = new Manifest(); + sf.read(new ByteArrayInputStream(sfBytes)); - byte[] buffer = new byte[4096]; - int sLen = block.getSignerInfos().length; - boolean mainOK = false; // main attributes of SF is available... - boolean manifestSigned = false; // and it matches MANIFEST.MF - BASE64Decoder decoder = new BASE64Decoder(); + String version = + sf.getMainAttributes().getValue(Attributes.Name.SIGNATURE_VERSION); - PKCS7.PKCS7Verifier[] pvs = new PKCS7.PKCS7Verifier[sLen]; - for (int i=0; i<sLen; i++) { - pvs[i] = PKCS7.PKCS7Verifier.from(block, block.getSignerInfos()[i]); + if ((version == null) || !(version.equalsIgnoreCase("1.0"))) { + // XXX: should this be an exception? + // for now we just ignore this signature file + return; } - /* - * Verify SF in streaming mode. The chunks of the file are fed into - * the Manifest object sf and all PKCS7Verifiers. As soon as the main - * attributes is available, we'll check if manifestSigned is true. If - * yes, there is no need to fill in sf's entries field, since it should - * be identical to entries in man. - */ - while (true) { - int len = ins.read(buffer); - if (len < 0) { - if (!manifestSigned) { - sf.update(null, 0, 0); - } - break; - } else { - for (int i=0; i<sLen; i++) { - if (pvs[i] != null) pvs[i].update(buffer, 0, len); - } - // Continue reading if verifyManifestHash fails (or, the - // main attributes is not available yet) - if (!manifestSigned) { - sf.update(buffer, 0, len); - if (!mainOK) { - try { - Attributes attr = sf.getMainAttributes(); - String version = attr.getValue( - Attributes.Name.SIGNATURE_VERSION); + SignerInfo[] infos = block.verify(sfBytes); - if ((version == null) || - !(version.equalsIgnoreCase("1.0"))) { - // XXX: should this be an exception? - // for now we just ignore this signature file - return; - } - - mainOK = true; - manifestSigned = verifyManifestHash( - sf, md, decoder, manifestDigests); - } catch (IllegalStateException ise) { - // main attributes not available yet - } - } - } - } - } - List<SignerInfo> intResult = new ArrayList<>(sLen); - for (int i = 0; i < sLen; i++) { - if (pvs[i] != null) { - SignerInfo signerInfo = pvs[i].verify(); - if (signerInfo != null) { - intResult.add(signerInfo); - } - } - } - if (intResult.isEmpty()) { + if (infos == null) { throw new SecurityException("cannot verify signature block file " + name); } - SignerInfo[] infos = - intResult.toArray(new SignerInfo[intResult.size()]); + BASE64Decoder decoder = new BASE64Decoder(); CodeSigner[] newSigners = getSigners(infos, block); @@ -281,37 +229,26 @@ if (newSigners == null) return; + Iterator<Map.Entry<String,Attributes>> entries = + sf.getEntries().entrySet().iterator(); + + // see if we can verify the whole manifest first + boolean manifestSigned = verifyManifestHash(sf, md, decoder, manifestDigests); + // verify manifest main attributes if (!manifestSigned && !verifyManifestMainAttrs(sf, md, decoder)) { throw new SecurityException ("Invalid signature file digest for Manifest main attributes"); } - Iterator<Map.Entry<String,Attributes>> entries; - - if (manifestSigned) { - if (debug != null) { - debug.println("full manifest signature match, " - + "update signer info from MANIFEST.MF"); - } - entries = man.getEntries().entrySet().iterator(); - } else { - if (debug != null) { - debug.println("full manifest signature unmatch, " - + "update signer info from SF file"); - } - entries = sf.getEntries().entrySet().iterator(); - } - - // go through each section - + // go through each section in the signature file while(entries.hasNext()) { Map.Entry<String,Attributes> e = entries.next(); String name = e.getKey(); if (manifestSigned || - (verifySection(e.getValue(), name, md, decoder))) { + (verifySection(e.getValue(), name, md, decoder))) { if (name.startsWith("./")) name = name.substring(2); @@ -656,6 +593,7 @@ if (set == subset) return true; + boolean match; for (int i = 0; i < subset.length; i++) { if (!contains(set, subset[i])) return false; @@ -675,6 +613,8 @@ if ((oldSigners == null) && (signers == newSigners)) return true; + boolean match; + // make sure all oldSigners are in signers if ((oldSigners != null) && !isSubSet(oldSigners, signers)) return false; @@ -698,7 +638,7 @@ } void updateSigners(CodeSigner[] newSigners, - Map<String, CodeSigner[]> signers, String name) { + Hashtable<String, CodeSigner[]> signers, String name) { CodeSigner[] oldSigners = signers.get(name); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/swing/FilePane.java --- a/jdk/src/share/classes/sun/swing/FilePane.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/swing/FilePane.java Sat May 14 11:52:15 2011 -0700 @@ -763,7 +763,7 @@ public void setValueAt(Object value, int row, int col) { if (col == COLUMN_FILENAME) { - JFileChooser chooser = getFileChooser(); + final JFileChooser chooser = getFileChooser(); File f = (File)getValueAt(row, col); if (f != null) { String oldDisplayName = chooser.getName(f); @@ -782,18 +782,25 @@ // rename FileSystemView fsv = chooser.getFileSystemView(); - File f2 = fsv.createFileObject(f.getParentFile(), newFileName); + final File f2 = fsv.createFileObject(f.getParentFile(), newFileName); if (f2.exists()) { JOptionPane.showMessageDialog(chooser, MessageFormat.format(renameErrorFileExistsText, oldFileName), renameErrorTitleText, JOptionPane.ERROR_MESSAGE); } else { if (FilePane.this.getModel().renameFile(f, f2)) { if (fsv.isParent(chooser.getCurrentDirectory(), f2)) { - if (chooser.isMultiSelectionEnabled()) { - chooser.setSelectedFiles(new File[]{f2}); - } else { - chooser.setSelectedFile(f2); - } + // The setSelectedFile method produces a new setValueAt invocation while the JTable + // is editing. Postpone file selection to be sure that edit mode of the JTable + // is completed + SwingUtilities.invokeLater(new Runnable() { + public void run() { + if (chooser.isMultiSelectionEnabled()) { + chooser.setSelectedFiles(new File[]{f2}); + } else { + chooser.setSelectedFile(f2); + } + } + }); } else { // Could be because of delay in updating Desktop folder // chooser.setSelectedFile(null); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/swing/WindowsPlacesBar.java --- a/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Sat May 14 11:52:15 2011 -0700 @@ -29,6 +29,8 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.*; +import java.security.AccessController; +import java.security.PrivilegedAction; import javax.swing.*; import javax.swing.border.*; @@ -79,7 +81,12 @@ setBackground(bgColor); FileSystemView fsv = fc.getFileSystemView(); - files = (File[])ShellFolder.get("fileChooserShortcutPanelFolders"); + files = AccessController.doPrivileged(new PrivilegedAction<File[]>() { + public File[] run() { + return (File[]) ShellFolder.get("fileChooserShortcutPanelFolders"); + } + }); + buttons = new JToggleButton[files.length]; buttonGroup = new ButtonGroup(); for (int i = 0; i < files.length; i++) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java --- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -197,7 +197,7 @@ {"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"}, {"HelpMenu.About.title", "JConsole\u306B\u3064\u3044\u3066(A)"}, {"HelpMenu.About.title.mnemonic", 'A'}, - {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(U)"}, + {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9"}, {"HelpMenu.UserGuide.title.mnemonic", 'U'}, {"HelpMenu.title", "\u30D8\u30EB\u30D7(H)"}, {"HelpMenu.title.mnemonic", 'H'}, @@ -308,7 +308,7 @@ {"Password: .mnemonic", 'P'}, {"Password.accessibleName", "\u30D1\u30B9\u30EF\u30FC\u30C9"}, {"Peak","\u30D4\u30FC\u30AF"}, - {"Perform GC", "GC\u306E\u5B9F\u884C(G)"}, + {"Perform GC", "GC\u306E\u5B9F\u884C"}, {"Perform GC.mnemonic", 'G'}, {"Perform GC.toolTip", "\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"}, {"Plotter.accessibleName", "\u30C1\u30E3\u30FC\u30C8"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java --- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -197,7 +197,7 @@ {"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"}, {"HelpMenu.About.title", "\u5173\u4E8E JConsole(A)"}, {"HelpMenu.About.title.mnemonic", 'A'}, - {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357(U)"}, + {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357"}, {"HelpMenu.UserGuide.title.mnemonic", 'U'}, {"HelpMenu.title", "\u5E2E\u52A9(H)"}, {"HelpMenu.title.mnemonic", 'H'}, @@ -308,7 +308,7 @@ {"Password: .mnemonic", 'P'}, {"Password.accessibleName", "\u53E3\u4EE4"}, {"Peak","\u5CF0\u503C"}, - {"Perform GC", "\u6267\u884C GC(G)"}, + {"Perform GC", "\u6267\u884C GC"}, {"Perform GC.mnemonic", 'G'}, {"Perform GC.toolTip", "\u8BF7\u6C42\u5783\u573E\u6536\u96C6"}, {"Plotter.accessibleName", "\u56FE\u8868"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_de.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Alle # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Schwerwiegend # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Warnung # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Information # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Konfiguration # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Fein # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Feiner # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Am feinsten # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Deaktiviert diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_es.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Todo # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Advertencia # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Informaci\u00F3n # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Configurar # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Detallado # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Muy Detallado # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=M\u00E1s Detallado # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Desactivado diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Tout # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Avertissement # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Infos # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Config # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Pr\u00E9cis # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Plus pr\u00E9cis # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Le plus pr\u00E9cis # The following ALL CAPS words should be translated. -OFF=OFF +OFF=D\u00E9sactiv\u00E9 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_it.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Tutto # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Avvertenza # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Informazioni # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Configurazione # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Buono # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Migliore # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Ottimale # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Non attivo diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -29,18 +29,18 @@ # The following ALL CAPS words should be translated. ALL=\u3059\u3079\u3066 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\u91CD\u5927 # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\u8B66\u544A # The following ALL CAPS words should be translated. INFO=\u60C5\u5831 # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \u69CB\u6210 # The following ALL CAPS words should be translated. -FINE=\u8A73\u7D30\u30EC\u30D9\u30EB(\u4F4E) +FINE=\u666E\u901A # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\u8A73\u7D30 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\u6700\u3082\u8A73\u7D30 # The following ALL CAPS words should be translated. OFF=\u30AA\u30D5 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=\uBAA8\uB450 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\uC2EC\uAC01 # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\uACBD\uACE0 # The following ALL CAPS words should be translated. -INFO=INFO +INFO=\uC815\uBCF4 # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \uAD6C\uC131 # The following ALL CAPS words should be translated. -FINE=FINE +FINE=\uBBF8\uC138 # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\uBCF4\uB2E4 \uBBF8\uC138 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\uAC00\uC7A5 \uBBF8\uC138 # The following ALL CAPS words should be translated. -OFF=OFF +OFF=\uD574\uC81C diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Tudo # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Advert\u00EAncia # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Informa\u00E7\u00F5es # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Configura\u00E7\u00E3o # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Detalhado # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Mais Detalhado # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=O Mais Detalhado # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Desativado diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Alla # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Allvarlig # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Varning # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Info # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Konfig # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Fin # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Finare # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Finaste # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Av diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=\u5168\u90E8 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\u4E25\u91CD # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\u8B66\u544A # The following ALL CAPS words should be translated. -INFO=INFO +INFO=\u4FE1\u606F # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \u914D\u7F6E # The following ALL CAPS words should be translated. -FINE=FINE +FINE=\u8BE6\u7EC6 # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\u8F83\u8BE6\u7EC6 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\u975E\u5E38\u8BE6\u7EC6 # The following ALL CAPS words should be translated. -OFF=OFF +OFF=\u7981\u7528 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=\u6240\u6709 +ALL=\u5168\u90E8 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\u56B4\u91CD # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\u8B66\u544A # The following ALL CAPS words should be translated. INFO=\u8CC7\u8A0A # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \u7D44\u614B # The following ALL CAPS words should be translated. -FINE=\u7D30\u7DFB +FINE=\u8A73\u7D30 # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\u8F03\u8A73\u7D30 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\u6700\u8A73\u7D30 # The following ALL CAPS words should be translated. OFF=\u95DC\u9589 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=Chinesisch zu=Zulu +# key is ISO 639.2 language code +aar=Afar +abk=Abchasisch +ace=Aceh-Sprache +ach=Acholi-Sprache +ada=Adangme +ady=Adygeisch +afa=Afro-Asiatisch +afh=Afrihili +afr=Afrikaans +ain=Ainu-Sprache +aka=Akan +akk=Akkadisch +alb=Albanisch +ale=Aleutisch +alg=Algonkin-Sprache +alt=S\u00FCd-Altaisch +amh=Amharisch +ang=Altenglisch +anp=Angika +apa=Apache-Sprache +ara=Arabisch +arc=Aram\u00E4isch +arg=Aragonisch +arm=Armenisch +arn=Araukanisch +arp=Arapaho +art=Kunstsprache +arw=Arawak-Sprache +asm=Assamesisch +ast=Asturianisch +ath=Athapaskisch +aus=Australisch +ava=Avarisch +ave=Avestisch +awa=Awadhi +aym=Aymara +aze=Aserbaidschanisch +bad=Banda +bai=Bamileke-Sprache +bak=Baschkirisch +bal=Belutschisch +bam=Bambara +ban=Balinesisch +baq=Baskisch +bas=Basaa-Sprache +bat=Baltisch +bej=Bedauye +bel=Belorussisch +bem=Bemba-Sprache +ben=Bengalisch +ber=Berber-Sprache +bho=Bodschpuri +bih=Biharisch +bik=Bikol-Sprache +bin=Bini-Sprache +bis=Bislamisch +bla=Blackfoot-Sprache +bnt=Bantu-Sprache +bos=Bosnisch +bra=Braj-Bhakha +bre=Bretonisch +btk=Battakisch +bua=Burjatisch +bug=Buginesisch +bul=Bulgarisch +bur=Burmesisch +byn=Blin +cad=Caddo +cai=Zentralamerikanische Indianersprache +car=Karibisch +cat=Katalanisch +cau=Kaukasisch +ceb=Cebuano +cel=Keltisch +cha=Chamorro +chb=Chibcha-Sprache +che=Tschetschenisch +chg=Tschagataisch +chi=Chinesisch +chk=Trukesisch +chm=Tscheremissisch +chn=Chinook +cho=Choctaw +chp=Chipewyan +chr=Cherokee +chu=Kirchenslawisch +chv=Chuvash +chy=Cheyenne +cmc=Cham-Sprache +cop=Koptisch +cor=Cornish +cos=Korsisch +cpe=Kreolisch-Englische Sprache +cpf=Kreolisch-Franz\u00F6sische Sprache +cpp=Kreolisch-Portugiesische Sprache +cre=Cree +crh=Krimtatarisch +crp=Kreolische Sprache +csb=Kaschubisch +cus=Kuschitisch +cze=Tschechisch +dak=Dakota-Sprache +dan=D\u00E4nisch +dar=Darginisch +day=Dajak +del=Delaware-Sprache +den=Slave +dgr=Dogrib +din=Dinka-Sprache +div=Divehi +doi=Dogri +dra=Drawidisch +dsb=Niedersorbisch +dua=Duala +dum=Mittelniederl\u00E4ndisch +dut=Niederl\u00E4ndisch +dyu=Dyula-Sprache +dzo=Bhutani +efi=Efik +egy=\u00C4gyptisch +eka=Ekajuk +elx=Elamisch +eng=Englisch +enm=Mittelenglisch +epo=Esperanto +est=Estnisch +ewe=Ewe +ewo=Ewondo +fan=Pangwe-Sprache +fao=F\u00E4r\u00F6isch +fat=Fanti-Sprache +fij=Fidschi +fil=Philippinisch +fin=Finnisch +fiu=Finnougrisch +fon=Fon-Sprache +fre=Franz\u00F6sisch +frm=Mittelfranz\u00F6sisch +fro=Altfranz\u00F6sisch +frr=Nordfriesisch +frs=Ostfriesisch +fry=Westfriesisch +ful=Fulah +fur=Friulisch +gaa=Ga-Sprache +gay=Gayo +gba=Gbaya-Sprache +gem=Germanisch +geo=Georgisch +ger=Deutsch +gez=Geez +gil=Gilbertesisch +gla=G\u00E4lisch +gle=Irisch +glg=Galizisch +glv=Manx +gmh=Mittelhochdeutsch +goh=Althochdeutsch +gon=Gondi-Sprache +gor=Mongondou +got=Gotisch +grb=Grebo-Sprache +grc=Altgriechisch +gre=Modernes Griechisch (1453-) +grn=Guarani +gsw=Schweizerdeutsch +guj=Gujaratisch +gwi=Kutchin-Sprache +hai=Haida-Sprache +hat=Haitisch +hau=Haussa +haw=Hawaiisch +heb=Hebr\u00E4isch +her=Herero +hil=Hiligaynon-Sprache +him=Himachali +hin=Hindi +hit=Hethitisch +hmn=Miao-Sprache +hmo=Hiri Motu +hrv=Kroatisch +hsb=Obersorbisch +hun=Ungarisch +hup=Hupa +iba=Iban +ibo=Igbo +ice=Isl\u00E4ndisch +ido=Ido +iii=Sichuan Yi +ijo=Ijo-Sprache +iku=Inuktitut +ile=Interlingue +ilo=Ilokano-Sprache +ina=Interlingua (Internationale Hilfssprache, Vereinigung) +inc=Indoarisch +ind=Indonesisch +ine=Indogermanisch +inh=Inguschisch +ipk=Inupiak +ira=Iranische Sprache +iro=Irokesische Sprache +ita=Italienisch +jav=Javanesisch +jbo=Lojban +jpn=Japanisch +jpr=J\u00FCdisch-Persisch +jrb=J\u00FCdisch-Arabisch +kaa=Karakalpakisch +kab=Kabylisch +kac=Kachin-Sprache +kal=Kalaallisut (Gr\u00F6nl\u00E4ndisch) +kam=Kamba +kan=Kannada +kar=Karenisch +kas=Kaschmirisch +kau=Kanuri +kaw=Kawi +kaz=Kasachisch +kbd=Kabardinisch +kha=Khasi-Sprache +khi=Khoisan-Sprache +khm=Khmerisch, Zentral +kho=Sakisch +kik=Kikuyu +kin=Kinyarwanda +kir=Kirgisisch +kmb=Kimbundu-Sprache +kok=Konkani +kom=Komi +kon=Kongo +kor=Koreanisch +kos=Kosraeanisch +kpe=Kpelle-Sprache +krc=Karatschaiisch-Balkarisch +krl=Karelisch +kro=Kru-Sprache +kru=Oraon-Sprache +kua=Kuanyama +kum=Kumykisch +kur=Kurdisch +kut=Kutenai-Sprache +lad=Ladino +lah=Lahnda +lam=Lamba-Sprache +lao=Laotisch +lat=Lateinisch +lav=Lettisch +lez=Lesgisch +lim=Limburgisch +lin=Lingalisch +lit=Litauisch +lol=Mongo +loz=Rotse-Sprache +ltz=Luxemburgisch +lua=Luba-Lulua +lub=Luba-Katanga +lug=Ganda +lui=Luiseno-Sprache +lun=Lunda-Sprache +luo=Luo-Sprache +lus=Lushai-Sprache +mac=Mazedonisch +mad=Maduresisch +mag=Khotta +mah=Marshall +mai=Maithili +mak=Makassarisch +mal=Malaysisch +man=Manding-Sprache +mao=Maorisch +map=Austronesisch +mar=Marathi +mas=Massai-Sprache +may=Malay +mdf=Moksha +mdr=Mandaresisch +men=Mende-Sprache +mga=Mittelirisch (900-1200) +mic=Micmac-Sprache +min=Minangkabau-Sprache +mis=(andere Sprache) +mkh=Mon-Khmer-Sprache +mlg=Malagasisch +mlt=Maltesisch +mnc=Mandschurisch +mni=Meithei-Sprache +mno=Manobo-Sprache +moh=Mohawk-Sprache +mon=Mongolisch +mos=Mossi-Sprache +mul=Mehrsprachig +mun=Munda-Sprache +mus=Muskogee-Sprache +mwl=Mirandesisch +mwr=Marwari +myn=Maya-Sprache +myv=Ersja-Mordwinisch +nah=Nahuatl +nai=Nordamerikanische Indianersprache +nap=Neapolitanisch +nau=Nauru +nav=Navajo +nbl=Ndebele, S\u00FCd +nde=Ndebele, Nord +ndo=Ndonga +nds=Niederdeutsch +nep=Nepalesisch +new=Newan +nia=Nias-Sprache +nic=Cordoba +niu=Niue-Sprache +nno=Norwegisch, Nynorsk +nob=Bokmal, Norwegisch +nog=Nogai +non=Altnordisch +nor=Norwegisch +nqo=N'Ko +nso=Nord-Sotho-Sprache +nub=Nubisch +nwc=Alt-Newari +nya=Chichewa +nym=Nyamwezi-Sprache +nyn=Nyankole +nyo=Nyoro +nzi=Nzima +oci=Okzitanisch (nach 1500) +oji=Ojibwa +ori=Orija +orm=Oromo (Afan) +osa=Osage-Sprache +oss=Ossetisch +ota=Osmanisch +oto=Otomangue-Sprache +paa=Papuasprache +pag=Pangasinan-Sprache +pal=Mittelpersisch +pam=Pampanggan-Sprache +pan=Pundjabisch +pap=Papiamento +pau=Palau +peo=Altpersisch +per=Persisch +phi=Philippinisch +phn=Ph\u00F6nikisch +pli=Pali +pol=Polnisch +pon=Ponapeanisch +por=Portugiesisch +pra=Prakrit +pro=Altprovenzalisch +pus=Paschtunisch +que=Quechua +raj=Rajasthani +rap=Osterinsel-Sprache +rar=Rarotonganisch +roa=Romanische Sprache +roh=Romantsch +rom=Romani +rum=Rum\u00E4nisch +run=Kirundisch +rup=Aromunisch +rus=Russisch +sad=Sandawe-Sprache +sag=Sango +sah=Jakutisch +sai=S\u00FCdamerikanische Indianersprache +sal=Salish-Sprache +sam=Samaritanisch +san=Sanskrit +sas=Sasak +sat=Santali +scn=Sizilianisch +sco=Schottisch +sel=Selkupisch +sem=Semitisch +sga=Altirisch +sgn=Geb\u00E4rdensprache +shn=Schan-Sprache +sid=Sidamo +sin=Singhalesisch +sio=Sioux-Sprache +sit=Tolar +sla=Slawisch +slo=Slowakisch +slv=Slowenisch +sma=S\u00FCd-Samisch +sme=Nord-Samisch +smi=Lappisch +smj=Lule-Lappisch +smn=Inari-Lappisch +smo=Samoanisch +sms=Skolt-Lappisch +sna=Schonisch +snd=Zinti-Sprache +snk=Soninke-Sprache +sog=Sogdisch +som=Somalisch +son=Songhai-Sprache +sot=S\u00FCd-Sotho +spa=Spanisch +srd=Sardisch +srn=Srananisch +srp=Serbisch +srr=Serer-Sprache +ssa=Nilosaharanisch +ssw=Swasil\u00E4ndisch +suk=Sukuma-Sprache +sun=Sundanesisch +sus=Susu +sux=Sumerisch +swa=Suaheli +swe=Schwedisch +syc=Altsyrisch +syr=Syrisch +tah=Tahitisch +tai=Tai-Sprache +tam=Tsongaisch +tat=Tatarisch +tel=Telugu +tem=Temne +ter=Tereno-Sprache +tet=Tetum-Sprache +tgk=Tadschikisch +tgl=Tagalog +tha=Thai +tib=Tibetanisch +tig=Tigre +tir=Tigrinja +tiv=Tiv-Sprache +tkl=Tokelauanisch +tlh=Klingonisch +tli=Tlingit-Sprache +tmh=Tamaseq +tog=Tsonga-Sprache +ton=Tonga (Tonga-Inseln) +tpi=Neumelanesisch +tsi=Tsimshian-Sprache +tsn=Sezuan +tso=Tsonga +tuk=Turkmenisch +tum=Tumbuka-Sprache +tup=Tupi-Sprache +tur=T\u00FCrkisch +tut=Altaisch +tvl=Elliceanisch +twi=Twi +tyv=Tuwinisch +udm=Udmurtisch +uga=Ugaritisch +uig=Uigurisch +ukr=Ukrainisch +umb=Mbundu-Sprache +und=Unbestimmte Sprache +urd=Urdu +uzb=Usbekisch +vai=Vai-Sprache +ven=Venda +vie=Vietnamesisch +vol=Volap\u00FCk +vot=Wotisch +wak=Wakashanisch +wal=Walamo-Sprache +war=Waray +was=Washo-Sprache +wel=Walisisch +wen=Sorbisch +wln=Wallonisch +wol=Wolof +xal=Kalm\u00FCckisch +xho=Xhosa +yao=Yao-Sprache +yap=Yapesisch +yid=Jiddish +yor=Joruba +ypk=Yupik-Sprache +zap=Zapotekisch +zbl=Bliss-Symbole +zen=Zenaga +zha=Zhuang +znd=Zande-Sprache +zul=Zulu +zun=Zuni-Sprache +zxx=Keine Sprachinhalte +zza=Zaza + +# script names +# key is ISO 15924 script code + +Arab=Arabisch +Armi=Armi +Armn=Armenisch +Avst=Avestisch +Bali=Balinesisch +Bamu=Bamum +Bass=Bassa VHA +Batk=Battakisch +Beng=Bengalisch +Blis=Bliss-Symbole +Bopo=Bopomofo +Brah=Brahmi +Brai=Blindenschrift +Bugi=Buginesisch +Buhd=Buhid +Cakm=Cakm +Cans=UCAS +Cari=Karisch +Cham=Cham +Cher=Cherokee +Cirt=Cirth +Copt=Koptisch +Cprt=Zypriotisch +Cyrl=Kyrillisch +Cyrs=Altkirchenslawisch +Deva=Devanagari +Dsrt=Deseret +Dupl=Duployan Shorthand +Egyd=\u00C4gyptisch - Demotisch +Egyh=\u00C4gyptisch - Hieratisch +Egyp=\u00C4gyptische Hieroglyphen +Elba=Elbasan +Ethi=\u00C4thiopisch +Geok=Khutsuri +Geor=Georgisch +Glag=Glagolitisch +Goth=Gotisch +Gran=Grantha +Grek=Griechisch +Gujr=Gujaratisch +Guru=Gurmukhi +Hang=Hangul +Hani=Chinesisch +Hano=Hanunoo +Hans=Vereinfachte Chinesische Schrift +Hant=Traditionelle Chinesische Schrift +Hebr=Hebr\u00E4isch +Hira=Hiragana +Hmng=Pahawh Hmong +Hrkt=Katakana oder Hiragana +Hung=Altungarisch +Inds=Indus-Schrift +Ital=Altitalienisch +Java=Javanesisch +Jpan=Japanisch +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Kambodschanisch +Knda=Kannada +Kore=Koreanisch +Kpel=Kpelle-Sprache +Kthi=Kthi +Lana=Lanna +Laoo=Laotisch +Latf=Lateinisch - Fraktur-Variante +Latg=Lateinisch - G\u00E4lische Variante +Latn=Lateinisch +Lepc=Lepcha +Limb=Limbu +Lina=Linear A +Linb=Linear B +Lisu=Lisu +Loma=Loma +Lyci=Lykisch +Lydi=Lydisch +Mand=Mand\u00E4isch +Mani=Manich\u00E4nisch +Maya=Maya-Hieroglyphen +Mend=Mende-Sprache +Merc=Meroitisch, kursiv +Mero=Meroitisch +Mlym=Malaysisch +Mong=Mongolisch +Moon=Moon +Mtei=Meitei Mayek +Mymr=Birmanisch +Narb=Altes Nordarabisch +Nbat=Nabat\u00E4isch +Nkgb=Nakhi Geba +Nkoo=N'Ko +Ogam=Ogham +Olck=Ol Chiki +Orkh=Orchon-Runen +Orya=Orija +Osma=Osmanisch +Palm=Palmyrenisch +Perm=Altpermisch +Phag=Phags-pa +Phli=Phli +Phlp=Phlp +Phlv=Pahlavi +Phnx=Ph\u00F6nizisch +Plrd=Pollard Phonetisch +Prti=Prti +Rjng=Rejang +Roro=Rongorongo +Runr=Runenschrift +Samr=Samaritanisch +Sara=Sarati +Sarb=Alts\u00FCdarabisch +Saur=Saurashtra +Sgnw=Geb\u00E4rdensprache +Shaw=Shaw-Alphabet +Sind=Zinti-Sprache +Sinh=Sinhala +Sund=Sundanesisch +Sylo=Syloti Nagri +Syrc=Syrisch +Syre=Syrisch - Estrangelo-Variante +Syrj=Westsyrisch +Syrn=Ostsyrisch +Tagb=Tagbanwa +Tale=Tai Le +Talu=Tai Lue +Taml=Tsongaisch +Tavt=Tavt +Telu=Telugu +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Thaana +Thai=Thai +Tibt=Tibetanisch +Ugar=Ugaritisch +Vaii=Vai-Sprache +Visp=Sichtbare Sprache +Wara=Warang Citi +Xpeo=Altpersisch +Xsux=Sumerisch-akkadische Keilschrift +Yiii=Yi +Zinh=Geerbter Schriftwert +Zmth=Zmth +Zsym=Zsym +Zxxx=Schriftlos +Zyyy=Unbestimmt +Zzzz=Uncodierte Schrift + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=S\u00fcdafrika ZM=Sambia ZW=Simbabwe + +# territory names +# key is UN M.49 country and area code + +001=Welt +002=Afrika +003=Nordamerika +005=S\u00FCdamerika +009=Ozeanien +011=Westafrika +013=Mittelamerika +014=Ostafrika +015=Nordafrika +017=Zentralafrika +018=S\u00FCdafrika +019=Amerika +021=N\u00F6rdliches Amerika +029=Karibik +030=Ostasien +034=S\u00FCdasien +035=S\u00FCdostasien +039=S\u00FCdeuropa +053=Australien und Neuseeland +054=Melanesien +057=Mikronesisches Inselgebiet +061=Polynesien +142=Asien +143=Zentralasien +145=Westasien +150=Europa +151=Osteuropa +154=Nordeuropa +155=Westeuropa +419=Lateinamerika und Karibik diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=chino zu=zul\u00fa +# key is ISO 639.2 language code +aar=afar +abk=Abjasio +ace=acehn\u00E9s +ach=acoli +ada=adangme +ady=adigeo +afa=afgani (1927-2002) +afh=afrihili +afr=Afrikaans +ain=ainu +aka=Acano +akk=acadio +alb=Alban\u00E9s +ale=aleutiano +alg=lenguas algonquinas +alt=alt\u00E1i meridional +amh=Am\u00E1rico +ang=florines de las Antillas Neerlandesas +anp=angika +apa=lenguas apache +ara=australes argentinos +arc=arameo +arg=Aragon\u00E9s +arm=Armenio +arn=araucano +arp=pesos argentinos (ARP) +art=lengua artificial +arw=arahuaco +asm=Asam\u00E9s +ast=asturiano +ath=lenguas atabascas +aus=lenguas australianas +ava=\u00C1varo +ave=Av\u00E9stico +awa=avadhi +aym=Aimara +aze=Azerbaiyano +bad=dinares bosnios +bai=lenguas bamileke +bak=Bashkir +bal=baluchi +bam=marcos convertibles de Bosnia-Herzegovina +ban=balin\u00E9s +baq=Vasco +bas=basa +bat=lengua b\u00E1ltica +bej=beja +bel=francos belgas (financieros) +bem=bemba +ben=Bengal\u00ED +ber=bereber +bho=bhojpuri +bih=Bihar\u00ED +bik=bicol +bin=bini +bis=Bislama +bla=siksika +bnt=bant\u00FA +bos=Bosnio +bra=braj +bre=cruceiros brasile\u00F1os (BRE) +btk=batak +bua=buriat +bug=Buguin\u00E9s +bul=B\u00FAlgaro +bur=Birmano +byn=blin +cad=d\u00F3lares canadienses +cai=lengua india centroamericana +car=caribe +cat=Catal\u00E1n +cau=lengua cauc\u00E1sica +ceb=cebuano +cel=lengua celta +cha=Chamorro +chb=chibcha +che=euros WIR +chg=chagat\u00E1i +chi=Chino +chk=truk\u00E9s +chm=mar\u00ED +chn=jerga chinuk +cho=choctaw +chp=chipewyan +chr=cherokee +chu=Eslavo Eclesi\u00E1stico +chv=Chuvacho +chy=cheyene +cmc=lenguas ch\u00E1micas +cop=pesos colombianos +cor=C\u00F3rnico +cos=corso +cpe=lengua criolla o pidgin basada en el ingl\u00E9s +cpf=lengua criolla o pidgin basada en el franc\u00E9s +cpp=lengua criolla o pidgin basada en el portugu\u00E9s +cre=cree +crh=t\u00E1rtaro de Crimea +crp=lengua criolla o pidgin +csb=casubio +cus=lengua cusita +cze=checo +dak=dakota +dan=dan\u00E9s +dar=dargva +day=dayak +del=delaware +den=slave +dgr=dogrib +din=dinka +div=Dhivehi +doi=dogri +dra=lengua drav\u00EDdica +dsb=sorbio inferior +dua=duala +dum=neerland\u00E9s medieval +dut=Holand\u00E9s +dyu=diula +dzo=Dzongkha +efi=efik +egy=egipcio antiguo +eka=ekajuk +elx=elamita +eng=Ingl\u00E9s +enm=ingl\u00E9s medieval +epo=Esperanto +est=Estonio +ewe=Ef\u00E9 +ewo=ewondo +fan=fang +fao=Faro\u00E9s +fat=fanti +fij=fidjiano +fil=filipino +fin=Finland\u00E9s +fiu=lengua fino\u00FAgria +fon=fon +fre=franc\u00E9s +frm=franc\u00E9s medieval +fro=franc\u00E9s antiguo +frr=fris\u00F3n septentrional +frs=fris\u00F3n oriental +fry=Frisio del Oeste +ful=Fula +fur=friulano +gaa=ga +gay=gayo +gba=gbaya +gem=lengua germ\u00E1nica +geo=Georgiano +ger=Alem\u00E1n +gez=geez +gil=gilbert\u00E9s +gla=Ga\u00E9lico +gle=Irland\u00E9s +glg=Gallego +glv=Man\u00E9s +gmh=alem\u00E1n de la alta edad media +goh=alem\u00E1n de la alta edad antigua +gon=gondi +gor=gorontalo +got=g\u00F3tico +grb=grebo +grc=griego antiguo +gre=Griego moderno (1453-) +grn=Guaran\u00ED +gsw=alem\u00E1n suizo +guj=Gujarati +gwi=kutchin +hai=haida +hat=Haitiano +hau=Hausa +haw=hawaiano +heb=hebreo +her=herero +hil=hiligaynon +him=himachali +hin=hindi +hit=hitita +hmn=hmong +hmo=Hiri motu +hrv=Croata +hsb=sorbio superior +hun=h\u00FAngaro +hup=hupa +iba=iban +ibo=Ibo +ice=Island\u00E9s +ido=Ido +iii=Yi de Sichu\u00E1n +ijo=ijo +iku=Inuktitut +ile=Interling\u00FCe +ilo=ilocano +ina=Interlingua (IALA, del ingl\u00E9s International Auxiliary Language Association) +inc=lengua \u00EDndica +ind=Indonesio +ine=lengua indoeuropea +inh=ingush +ipk=I\u00F1upiaq +ira=lengua irania +iro=lenguas iroquesas +ita=Italiano +jav=Javan\u00E9s +jbo=lojban +jpn=Japon\u00E9s +jpr=judeo-persa +jrb=judeo-\u00E1rabe +kaa=karakalpako +kab=cabila +kac=kachin +kal=Kalaallisut +kam=kamba +kan=Canar\u00E9s +kar=karen +kas=Cachemir\u00ED +kau=Kanuri +kaw=kawi +kaz=Kazajo +kbd=kabardiano +kha=khasi +khi=lengua joisana +khm=Jemer Central +kho=kotan\u00E9s +kik=Kikuyu +kin=Ruand\u00E9s +kir=kirghiz +kmb=kimbundu +kok=konkani +kom=Komi +kon=Congo +kor=Coreano +kos=kosraeano +kpe=kpelle +krc=karachay-balkar +krl=carelio +kro=kru +kru=kurukh +kua=Kuanyama +kum=kumyk +kur=Curdo +kut=kutenai +lad=ladino +lah=lahnda +lam=lamba +lao=Laosiano +lat=lat\u00EDn +lav=Let\u00F3n +lez=lezgiano +lim=Limburgu\u00E9s +lin=Lingala +lit=Lituano +lol=mongo +loz=lozi +ltz=Luxemburgu\u00E9s +lua=luba-lulua +lub=Luba-katanga +lug=Luganda +lui=luise\u00F1o +lun=lunda +luo=luo +lus=lushai +mac=Macedonio +mad=dirhams marroqu\u00EDes +mag=magahi +mah=marshal\u00E9s +mai=maithili +mak=macasar +mal=Malayalam +man=mandingo +mao=Maor\u00ED +map=lengua austronesia +mar=Marathi +mas=masai +may=malayo +mdf=moksha +mdr=mandar +men=mende +mga=ariary malgache +mic=micmac +min=minangkabau +mis=lenguas varias +mkh=lengua mon-jemer +mlg=Malgache +mlt=Malt\u00E9s +mnc=manch\u00FA +mni=manipuri +mno=lenguas manobo +moh=mohawk +mon=Mongol +mos=mossi +mul=lenguas m\u00FAltiples +mun=lenguas munda +mus=creek +mwl=mirand\u00E9s +mwr=marwari +myn=maya +myv=erzya +nah=n\u00E1huatl +nai=lengua india norteamericana +nap=napolitano +nau=Nauruano +nav=Navajo +nbl=Ndebele del Sur +nde=ndebele septentrional +ndo=Ndonga +nds=bajo alem\u00E1n +nep=Nepal\u00ED +new=newari +nia=nias +nic=c\u00F3rdobas nicarag\u00FCenses +niu=niueano +nno=Noruego Nynorsk +nob=Noruego Bokmal +nog=nogai +non=n\u00F3rdico antiguo +nor=Noruego +nqo=n'ko +nso=sotho septentrional +nub=lenguas nubias +nwc=newari cl\u00E1sico +nya=Chichewa +nym=nyamwezi +nyn=nyankole +nyo=nyoro +nzi=nzima +oci=Occitano (posterior a 1500) +oji=Ojibwa +ori=oriya +orm=Oromo +osa=osage +oss=Os\u00E9tico +ota=turco otomano +oto=lenguas otomanas +paa=lengua pap\u00FA +pag=pangasin\u00E1n +pal=pahlavi +pam=pampanga +pan=Penyab\u00ED +pap=papiamento +pau=palauano +peo=persa antiguo +per=Persa +phi=lengua filipina +phn=fenicio +pli=Pali +pol=Polaco +pon=pohnpeiano +por=Portugu\u00E9s +pra=lenguas pr\u00E1critas +pro=provenzal antiguo +pus=Pushto; Pashto +que=Quechua +raj=rajasthani +rap=rapanui +rar=rarotongano +roa=lengua romance +roh=Romansh +rom=roman\u00ED +rum=rumano +run=Rund\u00ED +rup=arrumano +rus=Ruso +sad=sandawe +sag=Sango +sah=yakut +sai=lengua india sudamericana +sal=lenguas salish +sam=arameo samaritano +san=S\u00E1nscrito +sas=sasak +sat=santali +scn=siciliano +sco=escoc\u00E9s +sel=selkup +sem=lengua sem\u00EDtica +sga=irland\u00E9s antiguo +sgn=lenguajes de signos +shn=shan +sid=sidamo +sin=Cingal\u00E9s +sio=lenguas sioux +sit=t\u00F3lares eslovenos +sla=lengua eslava +slo=Eslovaco +slv=Esloveno +sma=sami meridional +sme=Sami del Norte +smi=lengua sami +smj=sami lule +smn=sami inari +smo=Samoano +sms=sami skolt +sna=shona +snd=Sindhi +snk=sonink\u00E9 +sog=sogdiano +som=Somal\u00ED +son=songhai +sot=Sotho del Sur +spa=Espa\u00F1ol +srd=d\u00F3lar surinam\u00E9s +srn=sranan tongo +srp=serbio +srr=serer +ssa=lengua nilo-sahariana +ssw=Suazi +suk=sukuma +sun=sudan\u00E9s +sus=sus\u00FA +sux=sumerio +swa=Swahili +swe=Sueco +syc=sir\u00EDaco cl\u00E1sico +syr=siriaco +tah=tahitiano +tai=lengua tai +tam=Tamil +tat=Tatar +tel=Telugu +tem=temne +ter=tereno +tet=tet\u00FAn +tgk=Tajik +tgl=Tagalo +tha=Tailand\u00E9s +tib=Tibetano +tig=tigr\u00E9 +tir=Tigrinya +tiv=tiv +tkl=tokelauano +tlh=klingon +tli=tlingit +tmh=tamashek +tog=tonga del Nyasa +ton=Tongano (Islas Tonga) +tpi=tok pisin +tsi=tsimshiano +tsn=Tswana +tso=Tsonga +tuk=Turcomano +tum=tumbuka +tup=lenguas tup\u00ED +tur=Turco +tut=lengua altaica +tvl=tuvaluano +twi=Tui +tyv=tuviniano +udm=udmurt +uga=ugar\u00EDtico +uig=Uiguro +ukr=Ucraniano +umb=umbundu +und=indeterminada +urd=Urdu +uzb=Uzbeco +vai=vai +ven=Venda +vie=vietnamita +vol=Volapuk +vot=v\u00F3tico +wak=lenguas wakasha +wal=walamo +war=waray +was=washo +wel=Gal\u00E9s +wen=lenguas sorbias +wln=val\u00F3n +wol=Uolof +xal=kalmyk +xho=Xhosa +yao=yao +yap=yap\u00E9s +yid=Y\u00EDdish +yor=Yoruba +ypk=lenguas yupik +zap=zapoteco +zbl=s\u00EDmbolos bliss +zen=zenaga +zha=Zhuang +znd=zande +zul=Zul\u00FA +zun=zun\u00ED +zxx=sin contenido ling\u00FC\u00EDstico +zza=zazaki + +# script names +# key is ISO 15924 script code + +Arab=\u00E1rabe +Armi=Arameo Imperial +Armn=armenio +Avst=av\u00E9stico +Bali=balin\u00E9s +Bamu=Bamum +Bass=Bassa Vah +Batk=batak +Beng=bengal\u00ED +Blis=s\u00EDmbolos bliss +Bopo=bopomofo +Brah=brahm\u00ED +Brai=braille +Bugi=bugin\u00E9s +Buhd=buhid +Cakm=Chakma +Cans=s\u00EDmbolos abor\u00EDgenes canadienses unificados +Cari=cario +Cham=cham +Cher=cherokee +Cirt=cirth +Copt=copto +Cprt=chipriota +Cyrl=cir\u00EDlico +Cyrs=cir\u00EDlico del antiguo eslavo eclesi\u00E1stico +Deva=devanagari +Dsrt=deseret +Dupl=Taquigraf\u00EDa Duploy\u00E9 +Egyd=egipcio dem\u00F3tico +Egyh=egipcio hier\u00E1tico +Egyp=jerogl\u00EDficos egipcios +Elba=Elbasan +Ethi=eti\u00F3pico +Geok=georgiano eclesi\u00E1stico +Geor=georgiano +Glag=glagol\u00EDtico +Goth=g\u00F3tico +Gran=Grantha +Grek=griego +Gujr=gujarati +Guru=gurmuji +Hang=hangul +Hani=han +Hano=hanunoo +Hans=han simplificado +Hant=han tradicional +Hebr=hebreo +Hira=hiragana +Hmng=pahawh hmong +Hrkt=katakana o hiragana +Hung=h\u00FAngaro antiguo +Inds=Indio (harappan) +Ital=antigua bastardilla +Java=javan\u00E9s +Jpan=japon\u00E9s +Kali=kayah li +Kana=katakana +Khar=kharoshthi +Khmr=jemer +Knda=canar\u00E9s +Kore=coreano +Kpel=Kpelle +Kthi=Kaithi +Lana=lanna +Laoo=lao +Latf=latino fraktur +Latg=latino ga\u00E9lico +Latn=lat\u00EDn +Lepc=lepcha +Limb=limbu +Lina=lineal A +Linb=lineal B +Lisu=Lisu +Loma=Loma +Lyci=licio +Lydi=lidio +Mand=mandeo +Mani=Manique\u00EDsmo +Maya=jerogl\u00EDficos mayas +Mend=Mend\u00E9 +Merc=Mero\u00EDtico Cursivo +Mero=mero\u00EDtico +Mlym=malay\u00E1lam +Mong=mongol +Moon=Luna +Mtei=manipuri +Mymr=birmano +Narb=\u00C1rabe del Norte Antiguo +Nbat=Nabateo +Nkgb=Nakhi Geba +Nkoo=n'Ko +Ogam=ogham +Olck=ol chiki +Orkh=orkhon +Orya=oriya +Osma=osmaniya +Palm=Palmire\u00F1o +Perm=permiano antiguo +Phag=phags-pa +Phli=Pahlavi, Inscripciones +Phlp=Pahlavi, Salterio +Phlv=Pahlavi, Libros +Phnx=fenicio +Plrd=Pollard Miao +Prti=Parto, Inscripciones +Rjng=Rejang +Roro=Rongorongo +Runr=r\u00FAnico +Samr=Samaritano +Sara=Sarati +Sarb=\u00C1rabe del Sur Antiguo +Saur=Saurashtra +Sgnw=Escritura de Signos +Shaw=shaviano +Sind=Sindhi +Sinh=binhala +Sund=sudan\u00E9s +Sylo=Syloti Nagri +Syrc=siriaco +Syre=siriaco estrangelo +Syrj=siriaco occidental +Syrn=siriaco oriental +Tagb=tagban\u00FAa +Tale=tai le +Talu=Nuevo Tai Lue +Taml=tamil +Tavt=Tai Viet +Telu=telugu +Teng=tengwar +Tfng=Tifinagh +Tglg=tagalo +Thaa=thaana +Thai=tailand\u00E9s +Tibt=tibetano +Ugar=ugar\u00EDtico +Vaii=Vai +Visp=lenguaje visible +Wara=Warang Citi +Xpeo=persa antiguo +Xsux=Sumerio-Acadio Cuneiforme +Yiii=yi +Zinh=heredado +Zmth=Notaci\u00F3n Matem\u00E1tica +Zsym=s\u00EDmbolos +Zxxx=no escrito +Zyyy=com\u00FAn +Zzzz=escritura desconocida o no v\u00E1lida + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Sud\u00e1frica ZM=Zambia ZW=Zimbabue + +# territory names +# key is UN M.49 country and area code + +001=Mundo +002=\u00C1frica +003=Am\u00E9rica del Norte +005=Suram\u00E9rica +009=Ocean\u00EDa +011=\u00C1frica occidental +013=Centroam\u00E9rica +014=\u00C1frica oriental +015=\u00C1frica septentrional +017=\u00C1frica central +018=\u00C1frica meridional +019=Am\u00E9ricas +021=Norteam\u00E9rica +029=Caribe +030=Asia oriental +034=Asia meridional +035=Sudeste asi\u00E1tico +039=Europa meridional +053=Australia y Nueva Zelanda +054=Melanesia +057=Micronesia [057] +061=Polinesia +142=Asia +143=Asia central +145=Asia occidental +150=Europa +151=Europa oriental +154=Europa septentrional +155=Europa occidental +419=Latinoam\u00E9rica y el Caribe diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=chinois zu=zoulou +# key is ISO 639.2 language code +aar=Afar +abk=Abkhaze +ace=Achinais +ach=Acoli +ada=Adangme +ady=Adygh\u00E9en +afa=Afro-asiatique +afh=Afrihili +afr=Afrikaans +ain=A\u00EFnou +aka=Akan +akk=Akkadien +alb=Albanais +ale=Al\u00E9oute +alg=Langue algonquienne +alt=Alta\u00EF du Sud +amh=Amharique +ang=Vieil anglais (environ 450-1100) +anp=Angika +apa=Langue apache +ara=Arabe +arc=Aram\u00E9en officiel (700-300 av. J.-C.) +arg=Aragonais +arm=Arm\u00E9nien +arn=Mapudungun +arp=Arapaho +art=Langue artificielle +arw=Arawak +asm=Assamais +ast=Asturien +ath=Langue athapascane +aus=Langue australienne +ava=Avar +ave=Avestique +awa=Awadhi +aym=Aymara +aze=Az\u00E9ri +bad=Banda +bai=Langue bamil\u00E9k\u00E9e +bak=Bachkir +bal=Baloutchi +bam=Bambara +ban=Balinais +baq=Basque +bas=Bassa +bat=Langue balte +bej=Bedja +bel=Bi\u00E9lorusse +bem=Bemba +ben=Bengali +ber=Berb\u00E8re +bho=Bhojpuri +bih=Bihari +bik=Bikol +bin=Bini +bis=Bichlamar +bla=Siksika +bnt=Bantou +bos=Bosniaque +bra=Braj +bre=Breton +btk=Batak +bua=Bouriate +bug=Bouguinais +bul=Bulgare +bur=Birman +byn=Blin +cad=Caddo +cai=Langue am\u00E9rindienne centrale +car=Galibi Caribe +cat=Catalan +cau=Langue caucasienne +ceb=Cebuano +cel=Langue celtique +cha=Chamorro +chb=Chibcha +che=Tch\u00E9tch\u00E8ne +chg=Tchaghata\u00EF +chi=Chinois +chk=Chuuk +chm=Mari +chn=Jargon chinook +cho=Choctaw +chp=Chipewyan +chr=Cherokee +chu=Slavon liturgique +chv=Tchouvache +chy=Cheyenne +cmc=Langue chame +cop=Copte +cor=Cornouaillais +cos=Corse +cpe=Cr\u00E9ole ou pidgin anglais +cpf=Cr\u00E9ole ou pidgin fran\u00E7ais +cpp=Cr\u00E9ole ou pidgin portugais +cre=Cri +crh=Turc de Crim\u00E9e +crp=Cr\u00E9ole ou pidgin +csb=Kachoube +cus=Langue couchitique +cze=Tch\u00E8que +dak=Dakota +dan=Danois +dar=Dargwa +day=Dayak +del=Delaware +den=Slave (Athapascan) +dgr=Dogrib +din=Dinka +div=Divehi +doi=Dogri +dra=Langue dravidienne +dsb=Bas-sorabe +dua=Douala +dum=Moyen n\u00E9erlandais +dut=N\u00E9erlandais +dyu=Dioula +dzo=Dzongkha +efi=Efik +egy=Egyptien ancien +eka=Ekajuk +elx=Elamite +eng=Anglais +enm=Moyen anglais +epo=Esp\u00E9ranto +est=Estonien +ewe=Ewe +ewo=Ewondo +fan=Fang +fao=F\u00E9ro\u00EFen +fat=Fanti +fij=Fidjien +fil=Filipino +fin=Finnois +fiu=Langue finno-ougrienne +fon=Fon +fre=Fran\u00E7ais +frm=Moyen fran\u00E7ais +fro=Ancien fran\u00E7ais +frr=Frison du Nord +frs=Frison oriental +fry=Frison occidental +ful=Peul +fur=Frioulan +gaa=Ga +gay=Gayo +gba=Gbaya +gem=Langue germanique +geo=G\u00E9orgien +ger=Allemand +gez=Gu\u00E8ze +gil=Gilbertais +gla=Gallois +gle=Irlandais +glg=Galicien +glv=Mannois +gmh=Moyen haut-allemand +goh=Ancien haut-allemand +gon=Gondi +gor=Gorontalo +got=Gothique +grb=Grebo +grc=Grec ancien +gre=Grec, moderne (1453 -) +grn=Guarani +gsw=Al\u00E9manique +guj=Goudjarati +gwi=Gwich'in +hai=Haida +hat=Ha\u00EFtien +hau=Haoussa +haw=Hawa\u00EFen +heb=H\u00E9breu +her=Herero +hil=Hiligaynon +him=Himachali +hin=Hindi +hit=Hittite +hmn=Hmong +hmo=Hiri Motu +hrv=Croate +hsb=Haut-sorabe +hun=Hongrois +hup=Hupa +iba=Iban +ibo=Igbo +ice=Islandais +ido=Ido +iii=Yi de Sichuan +ijo=Ijo +iku=Inuktitut +ile=Interlingue +ilo=Ilokano +ina=Interlingua (International Auxiliary Language Association) +inc=Langue indo-aryenne +ind=Indon\u00E9sien +ine=Langue indo-europ\u00E9enne +inh=Ingouche +ipk=Inupiaq +ira=Langue iranienne +iro=Langue iroquoienne +ita=Italien +jav=Javanais +jbo=Lojban +jpn=Japonais +jpr=Jud\u00E9o-persan +jrb=Jud\u00E9o-arabe +kaa=Karakalpak +kab=Kabyle +kac=Kachin +kal=Groenlandais +kam=Kamba +kan=Kannada +kar=Karen +kas=Kashmiri +kau=Kanuri +kaw=Kawi +kaz=Kazakh +kbd=Kabardin +kha=Khasi +khi=Langue kho\u00EFsan +khm=Khmer central +kho=Khotanais +kik=Kikuyu +kin=Kinyarwanda +kir=Kirghize +kmb=Kimbundu +kok=Konkani +kom=Komi +kon=Kikongo +kor=Cor\u00E9en +kos=Kosrae +kpe=Kpell\u00E9 +krc=Karatcha\u00EF balkar +krl=Car\u00E9lien +kro=Krou +kru=Kurukh +kua=Kwanyama +kum=Koumyk +kur=Kurde +kut=Kutenai +lad=Ladino +lah=Lahnda +lam=Lamba +lao=Laotien +lat=Latin +lav=Letton +lez=Lezghien +lim=Limburgan +lin=Lingala +lit=Lituanien +lol=Mongo +loz=Lozi +ltz=Luxembourgeois +lua=Luba-Lulua +lub=Luba-Katanga +lug=Ganda +lui=Luiseno +lun=Lunda +luo=Luo +lus=Lushai +mac=Mac\u00E9donien +mad=Madurais +mag=Magahi +mah=Marshallais +mai=Maithili +mak=Makassar +mal=Malayalam +man=Mandingue +mao=Maori +map=Malayo-polyn\u00E9sien +mar=Marathi +mas=Masai +may=Malais +mdf=Moksa +mdr=Mandar +men=Mend\u00E9 +mga=Irlandais, moyen (900 - 1200) +mic=Micmac +min=Minangkabau +mis=Non cod\u00E9 +mkh=Langue mon-khm\u00E8re +mlg=Malgache +mlt=Maltais +mnc=Mandchou +mni=Manipuri +mno=Langue manobo +moh=Mohawk +mon=Mongol +mos=Mor\u00E9 +mul=Multilingue +mun=Langue mounda +mus=Creek +mwl=Mirandais +mwr=Marwari +myn=Langue maya +myv=Erzya +nah=Nahuatl +nai=Langue am\u00E9rindienne du Nord +nap=Napolitain +nau=Nauruan +nav=Navajo +nbl=Ndebele, Sud +nde=Ndebele, nord +ndo=Ndonga +nds=Bas-allemand +nep=N\u00E9palais +new=Newari +nia=Nias +nic=Niger-kordofanian +niu=Niue +nno=Norv\u00E9gien nynorsk +nob=Bokmal, Norv\u00E9gien +nog=Noga\u00EF +non=Vieux norrois +nor=Norv\u00E9gien +nqo=N'Ko +nso=Pedi +nub=Langue nubienne +nwc=Newari classique +nya=Chichewa +nym=Nyamwezi +nyn=Nyankole +nyo=Nyoro +nzi=Nzema +oci=Occitan (apr\u00E8s 1500) +oji=Ojibwa +ori=Oriya +orm=Oromo +osa=Osage +oss=Oss\u00E8te +ota=Turc ottoman +oto=Langue otomangue +paa=Langue papoue +pag=Pangasinan +pal=Pahlavi +pam=Pampangan +pan=Panjabi +pap=Papiamento +pau=Palau +peo=Persan ancien +per=Persan +phi=Langue philippine +phn=Ph\u00E9nicien +pli=Pali +pol=Polonais +pon=Pohnpei +por=Portugais +pra=Langues pr\u00E2krit +pro=Proven\u00E7al ancien +pus=Pushto ; Pashto +que=Quechua +raj=Rajasthani +rap=Rapanui +rar=Rarotongien +roa=Langue romane +roh=Romanche +rom=Romani +rum=Roumain +run=Rundi +rup=Aroumain +rus=Russe +sad=Sandawe +sag=Sango +sah=Yakoute +sai=Langue am\u00E9rindienne du Sud +sal=Langue salishenne +sam=Aram\u00E9en samaritain +san=Sanscrit +sas=Sasak +sat=Santal +scn=Sicilien +sco=Ecossais +sel=Selkoupe +sem=Langue s\u00E9mitique +sga=Ancien irlandais +sgn=Langue des signes +shn=Shan +sid=Sidamo +sin=Sinhala +sio=Langue sioux +sit=Sino-tib\u00E9tain +sla=Langue slave +slo=Slovaque +slv=Slov\u00E8ne +sma=Sami du sud +sme=Sami du Nord +smi=Langue samie +smj=Sami de Lule +smn=Sami d'Inari +smo=Samoan +sms=Sami skolt +sna=Shona +snd=Sindhi +snk=Sonink\u00E9 +sog=Sogdien +som=Somali +son=Songhai +sot=Sotho, sud +spa=Espagnol +srd=Sarde +srn=Sranan Tongo +srp=Serbe +srr=S\u00E9r\u00E8re +ssa=Langue nilo-saharienne +ssw=Swati +suk=Sukuma +sun=Soundanais +sus=Soussou +sux=Sum\u00E9rien +swa=Souah\u00E9li +swe=Su\u00E9dois +syc=Syriaque classique +syr=Syriaque +tah=Tahitien +tai=Langue ta\u00EF +tam=Tamoul +tat=Tatar +tel=T\u00E9lougou +tem=Temne +ter=Tereno +tet=Tetum +tgk=Tadjik +tgl=Tagalog +tha=Tha\u00EF +tib=Tib\u00E9tain +tig=Tigre +tir=Tigrigna +tiv=Tiv +tkl=Tokelau +tlh=Klingon +tli=Tlingit +tmh=Tamacheq +tog=Tonga nyasa +ton=Tonga (Iles Tonga) +tpi=Tok Pisin +tsi=Tsimshian +tsn=Tswana +tso=Tsonga +tuk=Turkm\u00E8ne +tum=Tumbuka +tup=Langue tupi +tur=Turc +tut=Langue alta\u00EFque +tvl=Tuvalu +twi=Twi +tyv=Touva +udm=Oudmourte +uga=Ougaritique +uig=Ou\u00EFgour +ukr=Ukrainien +umb=Umbundu +und=Ind\u00E9termin\u00E9 +urd=Ourdou +uzb=Ouzbek +vai=Va\u00EF +ven=Venda +vie=Vietnamien +vol=Volapuk +vot=Vote +wak=Langues wakashennes +wal=Wolaitta +war=Waray +was=Washo +wel=Gallois +wen=Langue sorabe +wln=Wallon +wol=Wolof +xal=Kalmouk +xho=Xhosa +yao=Yao +yap=Yap +yid=Yiddish +yor=Yoruba +ypk=Langues yupik +zap=Zapot\u00E8que +zbl=Symboles Bliss +zen=Zenaga +zha=Zhuang +znd=Zande +zul=Zoulou +zun=Zuni +zxx=Sans contenu linguistique +zza=Zazaki + +# script names +# key is ISO 15924 script code + +Arab=Arabe +Armi=Aram\u00E9en imp\u00E9rial +Armn=Arm\u00E9nien +Avst=Avestique +Bali=Balinais +Bamu=Bamoun +Bass=Bassa Vah +Batk=Batak +Beng=Bengali +Blis=Symboles Bliss +Bopo=Bopomofo +Brah=Brahmi +Brai=Braille +Bugi=Bouguis +Buhd=Bouhide +Cakm=Chakma +Cans=Syllabaire autochtone canadien unifi\u00E9 +Cari=Carien +Cham=Cham +Cher=Cherokee +Cirt=Cirth +Copt=Copte +Cprt=Syllabaire chypriote +Cyrl=Cyrillique +Cyrs=Cyrillique (variante slavonne) +Deva=Devanagari +Dsrt=Deseret +Dupl=St\u00E9nographie Duploy\u00E9 +Egyd=D\u00E9motique \u00E9gyptien +Egyh=Hi\u00E9ratique \u00E9gyptien +Egyp=Hi\u00E9roglyphes \u00E9gyptiens +Elba=Elbasan +Ethi=Ethiopique +Geok=G\u00E9orgien khoutsouri +Geor=G\u00E9orgien +Glag=Glagolitique +Goth=Gothique +Gran=Grantha +Grek=Grec +Gujr=Goudjarati +Guru=Gourmoukh\u00EE +Hang=Hangul +Hani=Id\u00E9ogrammes han +Hano=Hanunoo +Hans=Id\u00E9ogrammes han simplifi\u00E9s +Hant=Id\u00E9ogrammes han traditionnels +Hebr=H\u00E9breu +Hira=Hiragana +Hmng=Pahawh Hmong +Hrkt=Katakana ou Hiragana +Hung=Ancien hongrois +Inds=Indus +Ital=Ancien italique +Java=Javanais +Jpan=Japonais +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Khmer +Knda=Kannada +Kore=Cor\u00E9en +Kpel=Kpelle +Kthi=Kaithi +Lana=Tai Tham +Laoo=Laotien +Latf=Latin (variante bris\u00E9e) +Latg=Latin (variante ga\u00E9lique) +Latn=Latin +Lepc=Lepcha +Limb=Limbou +Lina=Lin\u00E9aire A +Linb=Lin\u00E9aire B +Lisu=Lisu +Loma=Loma +Lyci=Lycien +Lydi=Lydien +Mand=Mand\u00E9en +Mani=Manich\u00E9en +Maya=Hi\u00E9roglyphes mayas +Mend=Mend\u00E9 +Merc=Cursive m\u00E9ro\u00EFtique +Mero=M\u00E9ro\u00EFtique +Mlym=Malayalam +Mong=Mongol +Moon=Moon +Mtei=Meitei Mayek +Mymr=Myanmar +Narb=Arabe ancien du Nord +Nbat=Nabat\u00E9en +Nkgb=Nakhi Geba +Nkoo=N'Ko +Ogam=Ogam +Olck=Ol tchiki +Orkh=Orkhon +Orya=Oriya +Osma=Osmanais +Palm=Palmyr\u00E9en +Perm=Ancien permien +Phag=Phags pa +Phli=Pehlevi des inscriptions +Phlp=Pehlevi des psautiers +Phlv=Pehlevi des livres +Phnx=Ph\u00E9nicien +Plrd=Miao +Prti=Parthe des inscriptions +Rjng=Rejang +Roro=Rongorongo +Runr=Runique +Samr=Samaritain +Sara=Sarati +Sarb=Arabe ancien du Sud +Saur=Saurashtra +Sgnw=Ecriture des signes +Shaw=Shavian +Sind=Sindhi +Sinh=Singhalais +Sund=Soundanais +Sylo=Syloti Nagri +Syrc=Syriaque +Syre=Syriaque estrangh\u00E9lo +Syrj=Syriaque occidental +Syrn=Syriaque oriental +Tagb=Tagbanoua +Tale=Ta\u00EF-le +Talu=Nouveau ta\u00EF-lue +Taml=Tamoul +Tavt=Ta\u00EF Viet +Telu=T\u00E9lougou +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Th\u00E2na +Thai=Tha\u00EF +Tibt=Tib\u00E9tain +Ugar=Ougaritique +Vaii=Va\u00EF +Visp=Langage visuel +Wara=Warang Citi +Xpeo=Cun\u00E9iforme pers\u00E9politain +Xsux=Cun\u00E9iforme sum\u00E9ro-akkadien +Yiii=Yi +Zinh=H\u00E9rit\u00E9 +Zmth=Notation math\u00E9matique +Zsym=Symboles +Zxxx=Non \u00E9crit +Zyyy=Script non d\u00E9termin\u00E9 +Zzzz=Ecriture inconnue ou non valide + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Afrique du Sud ZM=Zambie ZW=Zimbabwe + +# territory names +# key is UN M.49 country and area code + +001=Monde +002=Afrique +003=Am\u00E9rique du Nord +005=Am\u00E9rique du Sud +009=Oc\u00E9anie +011=Afrique occidentale +013=Am\u00E9rique centrale +014=Afrique orientale +015=Afrique septentrionale +017=Afrique centrale +018=Afrique australe +019=Am\u00E9riques +021=Am\u00E9rique septentrionale +029=Cara\u00EFbes +030=Asie orientale +034=Asie du Sud +035=Asie du Sud-Est +039=Europe m\u00E9ridionale +053=Australie et Nouvelle-Z\u00E9lande +054=M\u00E9lan\u00E9sie +057=R\u00E9gion micron\u00E9sienne +061=Polyn\u00E9sie +142=Asie +143=Asie centrale +145=Asie occidentale +150=Europe +151=Europe orientale +154=Europe septentrionale +155=Europe occidentale +419=Am\u00E9rique latine et Cara\u00EFbes diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=cinese zu=zulu +# key is ISO 639.2 language code +aar=Afar +abk=Abkhaso +ace=Accinese +ach=Acioli +ada=Adangme +ady=Adyghe +afa=Lingua afroasiatica +afh=Afrihili +afr=Afrikaans +ain=Ainu +aka=Akan +akk=Accado +alb=Albanese +ale=Aleuto +alg=Lingue algonchine +alt=Altai del sud +amh=Amarico +ang=Inglese antico (dal 450 al 1100 c.a.) +anp=Angika +apa=Lingue apache +ara=Arabo +arc=Aramaico ufficiale (dal 700 al 300 AC) +arg=Aragonese +arm=Armeno +arn=Mapudungun +arp=Arapaho +art=Lingua artificiale +arw=Aruaco +asm=Assamese +ast=Asturiano +ath=Lingue Athapascan +aus=Australiano +ava=Avaro +ave=Avestano +awa=Awadhi +aym=Aymara +aze=Azero +bad=Banda +bai=Lingue bamileke +bak=Baschiro +bal=Beluci +bam=Bambara +ban=Balinese +baq=Basco +bas=Basa +bat=Lingua baltica +bej=Begia +bel=Bielorusso +bem=Wemba +ben=Bengalese +ber=Berbero +bho=Bhojpuri +bih=Bihari +bik=Bicol +bin=Bini +bis=Bislama +bla=Siksika +bnt=Bantu +bos=Bosniaco +bra=Braj +bre=Bretone +btk=Batak +bua=Buriat +bug=Buginese +bul=Bulgaro +bur=Birmano +byn=Blin +cad=Caddo +cai=Lingua indiana dell'America centrale +car=Caribe (Galibi) +cat=Catalano +cau=Lingua caucasica +ceb=Cebuano +cel=Lingua celtica +cha=Chamorro +chb=Chibcha +che=Ceceno +chg=Chagataico +chi=Cinese +chk=Chuukese +chm=Mari +chn=Gergo chinook +cho=Choctaw +chp=Chipewyan +chr=Cherokee +chu=Slavo ecclesiastico +chv=Chuvash +chy=Cheyenne +cmc=Lingue chamic +cop=Copto +cor=Cornico +cos=Corso +cpe=Creolo e pidgin basato sull'inglese +cpf=Creolo e pidgin basato sul francese +cpp=Creolo e pidgin basato sul portoghese +cre=Cree +crh=Turco crimeo +crp=Creolo e pidgin +csb=Kashubian +cus=Lingua cuscitica +cze=Ceco +dak=Dakota +dan=Danese +dar=Dargwa +day=Land Dayak +del=Delaware +den=Slave (Athapascan) +dgr=Dogrib +din=Dinca +div=Divehi +doi=Dogri +dra=Lingua dravidica +dsb=Basso sorabo +dua=Duala +dum=Olandese medio (dal 1050 al 1350 c.a.) +dut=Olandese +dyu=Diula +dzo=Dzongkha +efi=Efik +egy=Egiziano antico +eka=Ekajuka +elx=Elamitico +eng=Inglese +enm=Inglese medio (dal 1100 al 1500) +epo=Esperanto +est=Estone +ewe=Ewe +ewo=Ewondo +fan=Fang +fao=Faroese +fat=Fanti +fij=Figiano +fil=Filippino +fin=Finlandese +fiu=Lingua ungrofinnica +fon=Fon +fre=Francese +frm=Francese medio (dal 1400 al 1600 c.a.) +fro=Francese antico (dal 842 al 1400 c.a.) +frr=Frisone settentrionale +frs=Frisone orientale +fry=Frisone occidentale +ful=Fulah +fur=Friulano +gaa=Ga +gay=Gayo +gba=Gbaya +gem=Lingua germanica +geo=Georgiano +ger=Tedesco +gez=Geez +gil=Gilbertese +gla=Gaelico +gle=Irlandese +glg=Galiziano +glv=Manx +gmh=Tedesco medio alto (dal 1050 al 1500 c.a.) +goh=Tedesco antico alto (dal 750 al 1050 c.a.) +gon=Gondi +gor=Gorontalo +got=Gotico +grb=Grebo +grc=Greco antico (fino al 1453) +gre=Greco moderno (dal 1453) +grn=Guaran\u00EC +gsw=Tedesco svizzero +guj=Gujarati +gwi=Gwich'in +hai=Haida +hat=Haitiano +hau=Hausa +haw=Hawaiano +heb=Ebraico +her=Herero +hil=Hiligaynon +him=Himachali +hin=Hindi +hit=Hittite +hmn=Hmong +hmo=Hiri Motu +hrv=Croato +hsb=Alto sorabo +hun=Ungherese +hup=Hupa +iba=Iban +ibo=Igbo +ice=Islandese +ido=Ido +iii=Sichuan Yi +ijo=Ijo +iku=Inuktitut +ile=Interlingue +ilo=Ilocano +ina=Interlingua (Associazione internazionale per la lingua ausiliaria) +inc=Lingua indiana +ind=Indonesiano +ine=Lingua indoeuropea +inh=Ingush +ipk=Inupiaq +ira=Iraniano +iro=Lingue irochesi +ita=Italiano +jav=Giavanese +jbo=Lojban +jpn=Giapponese +jpr=Giudeo persiano +jrb=Giudeo arabo +kaa=Kara-Kalpak +kab=Kabyle +kac=Kachin +kal=Kalaallisut +kam=Kamba +kan=Kannada +kar=Karen +kas=Kashmiri +kau=Kanuri +kaw=Kawi +kaz=Kazako +kbd=Kabardia +kha=Khasi +khi=Lingua khoisan +khm=Khmer centrale +kho=Khotanese +kik=Kikuyu +kin=Kinyarwanda +kir=Kirghiso +kmb=Kimbundu +kok=Konkani +kom=Komi +kon=Kongo +kor=Coreano +kos=Kosraean +kpe=Kpelle +krc=Karachay-Balkar +krl=Careliano +kro=Kru +kru=Kurukh +kua=Kuanyama +kum=Kumyk +kur=Curdo +kut=Kutenai +lad=Ladino +lah=Lahnda +lam=Lamba +lao=Lao +lat=Latino +lav=Lettone +lez=Lezghian +lim=Limburgese +lin=Lingala +lit=Lituano +lol=Mongo +loz=Lozi +ltz=Lussemburghese +lua=Luba-Lulua +lub=Luba-Katanga +lug=Ganda +lui=Luiseno +lun=Lunda +luo=Luo (Kenya e Tanzania) +lus=Lushai +mac=Macedone +mad=Madurese +mag=Magahi +mah=Marshallese +mai=Maithili +mak=Makasar +mal=Malayalam +man=Mandingo +mao=Maori +map=Austronesiano +mar=Marathi +mas=Masai +may=Malese +mdf=Moksha +mdr=Mandar +men=Mende +mga=Irlandese medio (dal 900 al 1200) +mic=Mi'kmaq +min=Minangkabau +mis=Lingue non codificate +mkh=Lingua mon-khmer +mlg=Malgascio +mlt=Maltese +mnc=Manchu +mni=Manipuri +mno=Manobo +moh=Mohawk +mon=Mongolo +mos=Mossi +mul=Multilingua +mun=Lingua munda +mus=Creek +mwl=Mirandese +mwr=Marwari +myn=Lingue maya +myv=Erzya +nah=Nahuatl +nai=Lingua indiana del Nord America +nap=Napoletano +nau=Nauruano +nav=Navajo +nbl=Ndebele del sud +nde=Ndebele del nord +ndo=Ndonga +nds=Basso tedesco +nep=Nepalese +new=Nepal Bhasa +nia=Nias +nic=Lingua niger-cordofan +niu=Niue +nno=Norvegese nynorsk +nob=Norvegese bokm\u00E5l +nog=Nogai +non=Norse antico +nor=Norvegese +nqo=N'Ko +nso=Pedi +nub=Nubiano +nwc=Newari classico +nya=Chichewa +nym=Nyamwezi +nyn=Nyankole +nyo=Nyoro +nzi=Nzima +oci=Occitano (dopo il 1500) +oji=Ojibwa +ori=Oriya +orm=Oromo +osa=Osage +oss=Ossetico +ota=Turco, ottomano (1500-1928) +oto=Lingue otomi +paa=Lingua papuana +pag=Pangasinan +pal=Pahlavi +pam=Pampanga +pan=Punjabi +pap=Papiamento +pau=Palau +peo=Persiano antico (dal 600 al 400 AC) +per=Persiano +phi=Lingua filippina +phn=Fenicio +pli=Pali +pol=Polacco +pon=Pohnpeiano +por=Portoghese +pra=Pracrito +pro=Provenzale antico (fino al 1500) +pus=Pushto; Pashto +que=Quechua +raj=Rajasthani +rap=Rapanui +rar=Rarotonga +roa=Lingua romanza +roh=Romancio +rom=Romani +rum=Romeno +run=Kirundi +rup=Aromaniano +rus=Russo +sad=Sandawe +sag=Sango +sah=Yakut +sai=Lingua indiana del Sud America +sal=Lingue salish +sam=Aramaico samaritano +san=Sanscrito +sas=Sasak +sat=Santali +scn=Siciliano +sco=Scozzese +sel=Selkup +sem=Lingua semitica +sga=Irlandese antico (fino al 900) +sgn=Lingua dei segni +shn=Shan +sid=Sidamo +sin=Singalese +sio=Lingue sioux +sit=Lingua sino-tibetana +sla=Lingua slava +slo=Slovacco +slv=Sloveno +sma=Sami del sud +sme=Sami del nord +smi=Sami +smj=Sami lule +smn=Sami inari +smo=Samoano +sms=Sami skolt +sna=Shona +snd=Sindhi +snk=Soninke +sog=Sogdiano +som=Somalo +son=Songhai +sot=Sotho del sud +spa=Spagnolo +srd=Sardo +srn=Sranan Tongo +srp=Serbo +srr=Serer +ssa=Lingua nilo-sahariana +ssw=Swati +suk=Sukuma +sun=Sundanese +sus=Susu +sux=Sumero +swa=Swahili +swe=Svedese +syc=Siriaco classico +syr=Siriaco +tah=Taitiano +tai=Tai +tam=Tamil +tat=Tataro +tel=Telugu +tem=Temne +ter=Tereno +tet=Tetum +tgk=Tagiko +tgl=Tagalog +tha=Tailandese +tib=Tibetano +tig=Tigre +tir=Tigrinya +tiv=Tiv +tkl=Tokelau +tlh=Klingon +tli=Tlingit +tmh=Tamashek +tog=Tonga (Nyasa) +ton=Tonga (Isole Tonga) +tpi=Tok pisin +tsi=Tsimshian +tsn=Tswana +tso=Tsonga +tuk=Turkmeno +tum=Tumbuka +tup=Lingue tupi +tur=Turco +tut=Lingua altaica +tvl=Tuvalu +twi=Twi +tyv=Tuvinian +udm=Udmurt +uga=Ugaritico +uig=Uiguro +ukr=Ucraino +umb=Umbundu +und=Lingua imprecisata +urd=Urdu +uzb=Uzbeko +vai=Vai +ven=Venda +vie=Vietnamita +vol=Volapuk +vot=Voto +wak=Lingue wakash +wal=Walamo +war=Waray +was=Washo +wel=Gallese +wen=Sorabo +wln=Vallone +wol=Wolof +xal=Kalmyk +xho=Xhosa +yao=Yao +yap=Yapese +yid=Yiddish +yor=Yoruba +ypk=Lingue Yupik +zap=Zapotec +zbl=Simboli bliss +zen=Zenaga +zha=Zhuang +znd=Zande +zul=Zulu +zun=Zuni +zxx=Nessun contenuto linguistico +zza=Zazaki + +# script names +# key is ISO 15924 script code + +Arab=Arabo +Armi=Aramaico imperiale +Armn=Armeno +Avst=Avestano +Bali=Balinese +Bamu=Bamum +Bass=Bassa Vah +Batk=Batak +Beng=Bengalese +Blis=Simboli bliss +Bopo=Bopomofo +Brah=Brahmi +Brai=Braille +Bugi=Buginese +Buhd=Buhid +Cakm=Chakma +Cans=Simboli aborigeni canadesi unificati +Cari=Cario +Cham=Cham +Cher=Cherokee +Cirt=Cirth +Copt=Copto +Cprt=Cipriota +Cyrl=Cirillico +Cyrs=Cirillico (antico slavo ecclesiastico) +Deva=Devanagari +Dsrt=Deseret +Dupl=Stenografia duployan +Egyd=Egiziano demotico +Egyh=Ieratico egiziano +Egyp=Geroglifici egiziani +Elba=Elbasan +Ethi=Etiope +Geok=Khutsuri +Geor=Georgiano +Glag=Glagolitico +Goth=Gotico +Gran=Grantha +Grek=Greco +Gujr=Gujarati +Guru=Gurmukhi +Hang=Hangul +Hani=Han +Hano=Hanunoo +Hans=Han semplificato +Hant=Han tradizionale +Hebr=Ebraico +Hira=Hiragana +Hmng=Pahawh Hmong +Hrkt=Katakana o Hiragana +Hung=Ungherese antico +Inds=Ind\u00F9 +Ital=Italico antico +Java=Giavanese +Jpan=Giapponese +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Khmer +Knda=Kannada +Kore=Coreano +Kpel=Kpelle +Kthi=Kaithi +Lana=Tai Tham +Laoo=Lao +Latf=Variante fraktur del latino +Latg=Latino gaelico +Latn=Latino +Lepc=Lepcha +Limb=Limbu +Lina=Lineare A +Linb=Lineare B +Lisu=Lisu +Loma=Loma +Lyci=Licio +Lydi=Lidio +Mand=Mandaico +Mani=Manicheo +Maya=Geroglifici maya +Mend=Mende +Merc=Corsivo meroitico +Mero=Meoitico +Mlym=Malayalam +Mong=Mongolo +Moon=Moon +Mtei=Meitei Mayek +Mymr=Myanmar +Narb=Arabo antico del nord +Nbat=Lingua nabatea +Nkgb=Nakhi Geba +Nkoo=N'Ko +Ogam=Ogamico +Olck=Ol Chiki +Orkh=Orkhon +Orya=Oriya +Osma=Osmanya +Palm=Palmyrene +Perm=Permiano antico +Phag=Phags-pa +Phli=Pahlavi (Inscriptional) +Phlp=Pahlavi (Psalter) +Phlv=Pahlavi (Book) +Phnx=Fenicio +Plrd=Miao +Prti=Partico (iscrizioni) +Rjng=Rejang +Roro=Rongorongo +Runr=Runico +Samr=Samaritano +Sara=Sarati +Sarb=Arabo antico del sud +Saur=Saurashtra +Sgnw=SignWriting +Shaw=Shaviano +Sind=Sindhi +Sinh=Singalese +Sund=Sundanese +Sylo=Syloti Nagri +Syrc=Siriaco +Syre=Siriaco estrangelo +Syrj=Siriaco occidentale +Syrn=Siriaco orientale +Tagb=Tagbanwa +Tale=Tai Le +Talu=Tai Lue semplificato +Taml=Tamil +Tavt=Tai Viet +Telu=Telugu +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Thaana +Thai=Tailandese +Tibt=Tibetano +Ugar=Ugaritico +Vaii=Vai +Visp=Discorso visibile +Wara=Warang Citi +Xpeo=Persiano antico +Xsux=Cuneiforme sumero-accadico +Yiii=Yi +Zinh=Script ereditato +Zmth=Notazione matematica +Zsym=Simboli +Zxxx=Non scritto +Zyyy=Script indeterminato +Zzzz=Script non codificato + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Sudafrica ZM=Zambia ZW=Zimbabwe + +# territory names +# key is UN M.49 country and area code + +001=Mondo +002=Africa +003=America del Nord +005=America del Sud +009=Oceania +011=Africa occidentale +013=America centrale +014=Africa orientale +015=Africa settentrionale +017=Africa centrale +018=Africa meridionale +019=Americhe +021=America settentrionale +029=Caraibi +030=Asia orientale +034=Asia meridionale +035=Asia sudorientale +039=Europa meridionale +053=Australia e Nuova Zelanda +054=Melanesia +057=Regione Micronesiana +061=Polinesia +142=Asia +143=Asia centrale +145=Asia occidentale +150=Europa +151=Europa orientale +154=Europa settentrionale +155=Europa occidentale +419=America Latina e Caraibi diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=\u4e2d\u56fd\u8a9e zu=\u30ba\u30fc\u30eb\u30fc\u8a9e +# key is ISO 639.2 language code +aar=\u30A2\u30D5\u30A1\u30EB\u8A9E +abk=\u30A2\u30D6\u30CF\u30FC\u30BA\u8A9E +ace=\u30A2\u30C1\u30A7\u30FC\u8A9E +ach=\u30A2\u30C1\u30E7\u30EA\u8A9E +ada=\u30A2\u30C0\u30F3\u30B0\u30E1\u8A9E +ady=\u30A2\u30C7\u30A3\u30B2\u8A9E +afa=\u30A2\u30D5\u30AC\u30CB\u30FC (1927-2002) +afh=\u30A2\u30D5\u30EA\u30D2\u30EA\u8A9E +afr=\u30A2\u30D5\u30EA\u30AB\u30FC\u30F3\u30B9\u8A9E +ain=\u30A2\u30A4\u30CC\u8A9E +aka=\u30A2\u30AB\u30F3\u8A9E +akk=\u30A2\u30C3\u30AB\u30C9\u8A9E +alb=\u30A2\u30EB\u30D0\u30CB\u30A2\u8A9E +ale=\u30A2\u30EC\u30A6\u30C8\u8A9E +alg=\u30A2\u30EB\u30B4\u30F3\u30AD\u30A2\u30F3\u8A9E\u65CF +alt=\u5357\u30A2\u30EB\u30BF\u30A4\u8A9E +amh=\u30A2\u30E0\u30CF\u30E9\u8A9E +ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB \u30AE\u30EB\u30C0\u30FC +anp=\u30A2\u30F3\u30AE\u30AB\u8A9E +apa=\u30A2\u30D1\u30C3\u30C1\u8A9E\u65CF +ara=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3 \u30A2\u30A5\u30B9\u30C8\u30E9\u30FC\u30EB +arc=\u30A2\u30E9\u30E0\u8A9E +arg=\u30A2\u30E9\u30B4\u30F3\u8A9E +arm=\u30A2\u30EB\u30E1\u30CB\u30A2\u8A9E +arn=\u30A2\u30E9\u30A6\u30AB\u30F3\u8A9E +arp=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3 \u30DA\u30BD (1983-1985) +art=\u4EBA\u5DE5\u8AF8\u8A9E +arw=\u30A2\u30E9\u30EF\u30AF\u8A9E +asm=\u30A2\u30C3\u30B5\u30E0\u8A9E +ast=\u30A2\u30B9\u30C8\u30A5\u30EA\u30A2\u30B9\u8A9E +ath=\u30A2\u30B5\u30D1\u30B9\u30AB\u30F3\u8A9E\u65CF +aus=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u8A9E\u65CF +ava=\u30A2\u30F4\u30A1\u30EB\u8A9E +ave=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E +awa=\u30A2\u30EF\u30C7\u30A3\u30FC\u8A9E +aym=\u30A2\u30A4\u30DE\u30E9\u8A9E +aze=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u8A9E +bad=\u30DC\u30B9\u30CB\u30A2 \u30C7\u30A3\u30CA\u30FC\u30EB +bai=\u30D0\u30DF\u30EC\u30B1\u8A9E\u65CF +bak=\u30D0\u30B7\u30AD\u30FC\u30EB\u8A9E +bal=\u30D0\u30EB\u30FC\u30C1\u30FC\u8A9E +bam=\u30DC\u30B9\u30CB\u30A2 \u30DE\u30EB\u30AF (BAM) +ban=\u30D0\u30EA\u8A9E +baq=\u30D0\u30B9\u30AF\u8A9E +bas=\u30D0\u30B5\u8A9E +bat=\u30D0\u30EB\u30C8\u8AF8\u8A9E +bej=\u30D9\u30B8\u30E3\u8A9E +bel=\u30D9\u30EB\u30AE\u30FC \u30D5\u30E9\u30F3 (BEL) +bem=\u30D9\u30F3\u30D0\u8A9E +ben=\u30D9\u30F3\u30AC\u30EB\u8A9E +ber=\u30D9\u30EB\u30D9\u30EB\u8AF8\u8A9E +bho=\u30DC\u30FC\u30B8\u30D7\u30EA\u30FC\u8A9E +bih=\u30D3\u30CF\u30FC\u30EB\u8A9E +bik=\u30D3\u30B3\u30EB\u8A9E +bin=\u30D3\u30CB\u8A9E +bis=\u30D3\u30B9\u30E9\u30DE\u8A9E +bla=\u30B7\u30AF\u30B7\u30AB\u8A9E +bnt=\u30D0\u30F3\u30C8\u30A5\u8AF8\u8A9E +bos=\u30DC\u30B9\u30CB\u30A2\u8A9E +bra=\u30D6\u30E9\u30B8\u8A9E +bre=\u30D6\u30E9\u30B8\u30EB \u30AF\u30EB\u30BC\u30A4\u30ED (1990-1993) +btk=\u30D0\u30BF\u30AF\u8A9E +bua=\u30D6\u30EA\u30E4\u30FC\u30C8\u8A9E +bug=\u30D6\u30AE\u8A9E +bul=\u30D6\u30EB\u30AC\u30EA\u30A2\u8A9E +bur=\u30D3\u30EB\u30DE\u8A9E +byn=\u30D3\u30EA\u30F3\u8A9E +cad=\u30AB\u30CA\u30C0 \u30C9\u30EB +cai=\u4E2D\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E +car=\u30AB\u30EA\u30D6\u8A9E +cat=\u30AB\u30BF\u30ED\u30CB\u30A2\u8A9E +cau=\u30B3\u30FC\u30AB\u30B5\u30B9\u8AF8\u8A9E +ceb=\u30BB\u30D6\u30A2\u30CE\u8A9E +cel=\u30B1\u30EB\u30C8\u8AF8\u8A9E +cha=\u30C1\u30E3\u30E2\u30ED\u8A9E +chb=\u30C1\u30D6\u30C1\u30E3\u8A9E +che=\u30C1\u30A7\u30C1\u30A7\u30F3\u8A9E +chg=\u30C1\u30E3\u30AC\u30BF\u30A4\u8A9E +chi=\u4E2D\u56FD\u8A9E +chk=\u30C1\u30E5\u30FC\u30AF\u8A9E +chm=\u30DE\u30EA\u8A9E +chn=\u30D3\u30FC\u30C1\u30FB\u30E9\u30FB\u30DE\u30FC \u7B49 +cho=\u30C1\u30E7\u30AF\u30C8\u30FC\u8A9E +chp=\u30C1\u30DA\u30EF\u30A4\u30A2\u30F3\u8A9E +chr=\u30C1\u30A7\u30ED\u30AD\u30FC\u8A9E +chu=\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E +chv=\u30C1\u30E5\u30F4\u30A1\u30B7\u30E5\u8A9E +chy=\u30B7\u30E3\u30A4\u30A2\u30F3\u8A9E +cmc=\u30C1\u30E3\u30E0\u8A9E\u65CF +cop=\u30B3\u30ED\u30F3\u30D3\u30A2 \u30DA\u30BD +cor=\u30B3\u30FC\u30F3\u30A6\u30A9\u30FC\u30EB\u8A9E +cos=\u30B3\u30EB\u30B7\u30AB\u8A9E +cpe=\u82F1\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +cpf=\u30D5\u30E9\u30F3\u30B9\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +cpp=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +cre=\u30AF\u30EA\u30FC\u8A9E +crh=\u30AF\u30EA\u30DF\u30A2\u30FB\u30BF\u30BF\u30FC\u30EB\u8A9E +crp=\u305D\u306E\u4ED6\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +csb=\u30AB\u30B7\u30E5\u30FC\u30D6\u8A9E +cus=\u30AF\u30B7\u30E5\u8AF8\u8A9E +cze=\u30C1\u30A7\u30B3\u8A9E +dak=\u30C0\u30B3\u30BF\u8A9E +dan=\u30C7\u30F3\u30DE\u30FC\u30AF\u8A9E +dar=\u30C0\u30EB\u30AC\u30F3\u8A9E +day=\u30C0\u30E4\u30AF\u8A9E +del=\u30C7\u30E9\u30A6\u30A7\u30A2\u8A9E +den=\u30B9\u30EC\u30A4\u30D3\u30FC\u8A9E +dgr=\u30C9\u30B0\u30EA\u30D6\u8A9E +din=\u30C7\u30A3\u30F3\u30AB\u8A9E +div=\u30C7\u30A3\u30D9\u30D2\u8A9E +doi=\u30C9\u30B0\u30EA\u8A9E +dra=\u30C9\u30E9\u30F4\u30A3\u30C0\u8AF8\u8A9E +dsb=\u4F4E\u30BD\u30EB\u30D3\u30A2\u8A9E +dua=\u30C9\u30A5\u30A2\u30E9\u8A9E +dum=\u4E2D\u4E16\u30AA\u30E9\u30F3\u30C0\u8A9E +dut=\u30AA\u30E9\u30F3\u30C0\u8A9E +dyu=\u30C7\u30A5\u30A6\u30E9\u8A9E +dzo=\u30BE\u30F3\u30AB\u8A9E +efi=\u30A8\u30D5\u30A3\u30C3\u30AF\u8A9E +egy=\u53E4\u4EE3\u30A8\u30B8\u30D7\u30C8\u8A9E +eka=\u30A8\u30AB\u30B8\u30E5\u30AF\u8A9E +elx=\u30A8\u30E9\u30E0\u8A9E +eng=\u82F1\u8A9E +enm=\u4E2D\u4E16\u82F1\u8A9E +epo=\u30A8\u30B9\u30DA\u30E9\u30F3\u30C8\u8A9E +est=\u30A8\u30B9\u30C8\u30CB\u30A2\u8A9E +ewe=\u30A8\u30A6\u30A7\u8A9E +ewo=\u30A8\u30A6\u30A9\u30F3\u30C9\u8A9E +fan=\u30D5\u30A1\u30F3\u30B0\u8A9E +fao=\u30D5\u30A7\u30ED\u30FC\u8A9E +fat=\u30D5\u30A1\u30F3\u30C6\u30A3\u30FC\u8A9E +fij=\u30D5\u30A3\u30B8\u30FC\u8A9E +fil=\u30D5\u30A3\u30EA\u30D4\u30CE\u8A9E +fin=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u8A9E +fiu=\u30D5\u30A3\u30F3\u30FB\u30A6\u30B4\u30EB\u8AF8\u8A9E +fon=\u30D5\u30A9\u30F3\u8A9E +fre=\u30D5\u30E9\u30F3\u30B9\u8A9E +frm=\u4E2D\u671F\u30D5\u30E9\u30F3\u30B9\u8A9E +fro=\u53E4\u30D5\u30E9\u30F3\u30B9\u8A9E +frr=\u5317\u30D5\u30EA\u30B8\u30A2\u8A9E +frs=\u6771\u30D5\u30EA\u30B8\u30A2\u8A9E +fry=\u897F\u30D5\u30EA\u30B8\u30A2\u8A9E +ful=\u30D5\u30E9\u8A9E +fur=\u30D5\u30EA\u30A6\u30EA\u8A9E +gaa=\u30AC\u8A9E +gay=\u30AC\u30E8\u8A9E +gba=\u30D0\u30E4\u8A9E +gem=\u30B2\u30EB\u30DE\u30F3\u8AF8\u8A9E +geo=\u30B0\u30EB\u30B8\u30A2\u8A9E +ger=\u30C9\u30A4\u30C4\u8A9E +gez=\u30B2\u30A8\u30BA\u8A9E +gil=\u30AD\u30EA\u30D0\u30B9\u8A9E +gla=\u30B2\u30FC\u30EB\u8A9E +gle=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E +glg=\u30AC\u30EA\u30B7\u30A2\u8A9E +glv=\u30DE\u30F3\u5CF6\u8A9E +gmh=\u4E2D\u9AD8\u30C9\u30A4\u30C4\u8A9E +goh=\u53E4\u9AD8\u30C9\u30A4\u30C4\u8A9E +gon=\u30B4\u30FC\u30F3\u30C7\u30A3\u30FC\u8A9E +gor=\u30B4\u30ED\u30F3\u30BF\u30ED\u8A9E +got=\u30B4\u30FC\u30C8\u8A9E +grb=\u30B0\u30EC\u30DC\u8A9E +grc=\u53E4\u4EE3\u30AE\u30EA\u30B7\u30E3\u8A9E +gre=\u73FE\u4EE3\u30AE\u30EA\u30B7\u30E3\u8A9E(1453-) +grn=\u30B0\u30A2\u30E9\u30CB\u30FC\u8A9E +gsw=\u30B9\u30A4\u30B9\u30C9\u30A4\u30C4\u8A9E\uFF08\u30B9\u30A4\u30B9\uFF09 +guj=\u30B0\u30B8\u30E3\u30E9\u30C8\u8A9E +gwi=\u30B0\u30A6\u30A3\u30C3\u30C1\u30F3\u8A9E +hai=\u30CF\u30A4\u30C0\u8A9E +hat=\u30CF\u30A4\u30C1\u8A9E +hau=\u30CF\u30A6\u30B5\u8A9E +haw=\u30CF\u30EF\u30A4\u8A9E +heb=\u30D8\u30D6\u30E9\u30A4\u8A9E +her=\u30D8\u30EC\u30ED\u8A9E +hil=\u30D2\u30EA\u30AC\u30A4\u30CE\u30F3\u8A9E +him=\u30D2\u30DE\u30C1\u30E3\u30EB\u8A9E +hin=\u30D2\u30F3\u30C7\u30A3\u30FC\u8A9E +hit=\u30D2\u30C3\u30BF\u30A4\u30C8\u8A9E +hmn=\u30D5\u30E2\u30F3\u8A9E +hmo=\u30D2\u30EA\u30E2\u30C8\u30A5\u8A9E +hrv=\u30AF\u30ED\u30A2\u30C1\u30A2\u8A9E +hsb=\u4E0A\u30BD\u30EB\u30D3\u30A2\u8A9E +hun=\u30CF\u30F3\u30AC\u30EA\u30FC\u8A9E +hup=\u30A2\u30BF\u30D1\u30B9\u30AB\u8A9E +iba=\u30A4\u30D0\u30F3\u8A9E +ibo=\u30A4\u30DC\u8A9E +ice=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u8A9E +ido=\u30A4\u30C9\u8A9E +iii=\u56DB\u5DDD\u30A4(\u5F5D)\u8A9E +ijo=\u30A4\u30B8\u30E7\u30FC\u8A9E +iku=\u30A4\u30CC\u30AF\u30A6\u30C6\u30A3\u30C8\u30C3\u30C8\u8A9E +ile=\u30A4\u30F3\u30BF\u30FC\u30EA\u30F3\u30B0 +ilo=\u30A4\u30ED\u30AB\u30CE\u8A9E +ina=\u30A4\u30F3\u30BF\u30FC\u30EA\u30F3\u30B0\u30A2\u8A9E(\u56FD\u969B\u88DC\u52A9\u8A9E\u5354\u4F1A) +inc=\u30A4\u30F3\u30C9\u8AF8\u8A9E +ind=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u8A9E +ine=\u5370\u6B27\u8AF8\u8A9E +inh=\u30A4\u30F3\u30B0\u30B7\u8A9E +ipk=\u30A4\u30CC\u30D4\u30A2\u30C3\u30AF\u8A9E +ira=\u30A4\u30E9\u30F3\u8A9E +iro=\u30A4\u30ED\u30B3\u30A4\u8A9E\u65CF +ita=\u30A4\u30BF\u30EA\u30A2\u8A9E +jav=\u30B8\u30E3\u30EF\u8A9E +jbo=\u30ED\u30B8\u30D0\u30F3\u8A9E +jpn=\u65E5\u672C\u8A9E +jpr=\u30E6\u30C0\u30E4\u30FB\u30DA\u30EB\u30B7\u30A2\u8A9E +jrb=\u30E6\u30C0\u30E4\u30FB\u30A2\u30E9\u30D3\u30A2\u8A9E +kaa=\u30AB\u30E9\u30FB\u30AB\u30EB\u30D1\u30AF\u8A9E +kab=\u30AB\u30D3\u30EB\u8A9E +kac=\u30AB\u30C1\u30F3\u8A9E +kal=\u30AB\u30E9\u30A2\u30EA\u30B9\u8A9E +kam=\u30AB\u30F3\u30D0\u8A9E +kan=\u30AB\u30F3\u30CA\u30C0\u8A9E +kar=\u30AB\u30EC\u30F3\u8A9E +kas=\u30AB\u30B7\u30DF\u30FC\u30EB\u8A9E +kau=\u30AB\u30CC\u30EA\u8A9E +kaw=\u30AB\u30A6\u30A3\u8A9E +kaz=\u30AB\u30B6\u30D5\u8A9E +kbd=\u30AB\u30D0\u30EB\u30C9\u8A9E +kha=\u30AB\u30B7\u8A9E +khi=\u30B3\u30A4\u30B5\u30F3\u8AF8\u8A9E +khm=\u4E2D\u592E\u30AF\u30E1\u30FC\u30EB\u8A9E +kho=\u30B3\u30FC\u30BF\u30F3\u8A9E +kik=\u30AD\u30AF\u30E6\u8A9E +kin=\u30AD\u30CB\u30E4\u30EB\u30EF\u30F3\u30C0\u8A9E +kir=\u30AD\u30EB\u30AE\u30B9\u8A9E +kmb=\u30AD\u30F3\u30D6\u30F3\u30C9\u30A5\u8A9E +kok=\u30B3\u30F3\u30AB\u30CB\u8A9E +kom=\u30B3\u30DF\u8A9E +kon=\u30B3\u30F3\u30B4\u8A9E +kor=\u97D3\u56FD\u8A9E +kos=\u30B3\u30B7\u30E3\u30A8\u8A9E +kpe=\u30AF\u30DA\u30EC\u8A9E +krc=\u30AB\u30E9\u30C1\u30E3\u30A4\u8A9E +krl=\u30AB\u30EC\u30EA\u30A2\u8A9E +kro=\u30AF\u30EB\u30FC\u8A9E +kru=\u30AF\u30EB\u30AF\u8A9E +kua=\u30AF\u30A2\u30CB\u30E3\u30DE\u8A9E +kum=\u30AF\u30E0\u30AF\u8A9E +kur=\u30AF\u30EB\u30C9\u8A9E +kut=\u30AF\u30C6\u30CA\u30A4\u8A9E +lad=\u30E9\u30B8\u30CE\u8A9E +lah=\u30E9\u30D5\u30F3\u30C0\u30FC\u8A9E +lam=\u30E9\u30F3\u30D0\u8A9E +lao=\u30E9\u30AA\u8A9E +lat=\u30E9\u30C6\u30F3\u8A9E +lav=\u30E9\u30C8\u30D3\u30A2\u8A9E +lez=\u30EC\u30BA\u30AE\u8A9E +lim=\u30EA\u30F3\u30D6\u30EB\u30D5\u8A9E +lin=\u30EA\u30F3\u30AC\u30E9\u8A9E +lit=\u30EA\u30C8\u30A2\u30CB\u30A2\u8A9E +lol=\u30E2\u30F3\u30B4\u8A9E +loz=\u30ED\u30BA\u30A3\u8A9E +ltz=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30B0\u8A9E +lua=\u30EB\u30D0\u30FB\u30EB\u30EB\u30A2\u8A9E +lub=\u30EB\u30D0\u30FB\u30AB\u30BF\u30F3\u30AC\u8A9E +lug=\u30AC\u30F3\u30C0\u8A9E +lui=\u30EB\u30A4\u30BB\u30FC\u30CB\u30E7\u8A9E +lun=\u30EB\u30F3\u30C0\u8A9E +luo=\u30EB\u30AA\u8A9E +lus=\u30EB\u30B7\u30E3\u30A4\u8A9E +mac=\u30DE\u30B1\u30C9\u30CB\u30A2\u8A9E +mad=\u30E2\u30ED\u30C3\u30B3 \u30C7\u30A3\u30EB\u30CF\u30E0 +mag=\u30DE\u30AC\u30D2\u30FC\u8A9E +mah=\u30DE\u30FC\u30B7\u30E3\u30EB\u8A9E +mai=\u30DE\u30A4\u30C6\u30A3\u30EA\u30FC\u8A9E +mak=\u30DE\u30AB\u30C3\u30B5\u30EB\u8A9E +mal=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u8A9E +man=\u30DE\u30F3\u30C7\u30A3\u30F3\u30B4\u8A9E +mao=\u30DE\u30AA\u30EA\u8A9E +map=\u30AA\u30FC\u30B9\u30C8\u30ED\u30CD\u30B7\u30A2\u8AF8\u8A9E +mar=\u30DE\u30E9\u30C6\u30A3\u30FC\u8A9E +mas=\u30DE\u30B5\u30A4\u8A9E +may=\u30DE\u30EC\u30FC\u8A9E +mdf=\u30E2\u30AF\u30B7\u30E3\u8A9E +mdr=\u30DE\u30F3\u30C0\u30EB\u8A9E +men=\u30E1\u30F3\u30C7\u8A9E +mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB \u30A2\u30EA\u30A2\u30EA +mic=\u30DF\u30AF\u30DE\u30AF\u8A9E +min=\u30DF\u30CA\u30F3\u30AB\u30D0\u30A6\u8A9E +mis=\u305D\u306E\u4ED6\u306E\u8A00\u8A9E +mkh=\u30E2\u30F3\u30FB\u30AF\u30E1\u30FC\u30EB\u8AF8\u8A9E +mlg=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u8A9E +mlt=\u30DE\u30EB\u30BF\u8A9E +mnc=\u6E80\u5DDE\u8A9E +mni=\u30DE\u30CB\u30D7\u30EB\u8A9E +mno=\u30DE\u30CE\u30DC\u8A9E\u65CF +moh=\u30E2\u30FC\u30DB\u30FC\u30AF\u8A9E +mon=\u30E2\u30F3\u30B4\u30EB\u8A9E +mos=\u30E2\u30B7\u8A9E +mul=\u8907\u6570\u8A00\u8A9E +mun=\u30E0\u30F3\u30C0\u8A9E\u65CF +mus=\u30AF\u30EA\u30FC\u30AF\u8A9E +mwl=\u30DF\u30E9\u30F3\u30C0\u8A9E +mwr=\u30DE\u30FC\u30EB\u30EF\u30FC\u30EA\u30FC\u8A9E +myn=\u30DE\u30E4\u8A9E\u65CF +myv=\u30A8\u30EB\u30B8\u30E3\u8A9E +nah=\u30CA\u30EF\u30C8\u30EB\u8A9E +nai=\u5317\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E +nap=\u30CA\u30DD\u30EA\u8A9E +nau=\u30CA\u30A6\u30EB\u8A9E +nav=\u30CA\u30D0\u30DB\u8A9E +nbl=\u5357\u30F3\u30C7\u30D9\u30EC\u8A9E +nde=\u5317\u30F3\u30C7\u30D9\u30EC\u8A9E +ndo=\u30F3\u30C9\u30F3\u30AC\u8A9E +nds=\u4F4E\u5730\u30C9\u30A4\u30C4\u8A9E\u3001\u4F4E\u5730\u30B5\u30AF\u30BD\u30F3\u8A9E +nep=\u30CD\u30D1\u30FC\u30EB\u8A9E +new=\u30CD\u30EF\u30FC\u30EB\u8A9E +nia=\u30CB\u30A2\u30B9\u8A9E +nic=\u30CB\u30AB\u30E9\u30B0\u30A2 \u30B3\u30EB\u30C9\u30D0 +niu=\u30CB\u30A6\u30FC\u30A8\u30A4\u8A9E +nno=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30CB\u30FC\u30CE\u30B7\u30AF) +nob=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB) +nog=\u30CE\u30AC\u30A4\u8A9E +non=\u53E4\u30CE\u30EB\u30C9\u8A9E +nor=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E +nqo=\u30F3\u30B3\u8A9E +nso=\u5317\u90E8\u30BD\u30C8\u8A9E +nub=\u30CC\u30D3\u30A2\u8A9E\u65CF +nwc=\u53E4\u5178\u30CD\u30EF\u30FC\u30EB\u8A9E +nya=\u30C1\u30C1\u30A7\u30EF\u8A9E +nym=\u30CB\u30E3\u30E0\u30A6\u30A7\u30B8\u8A9E +nyn=\u30CB\u30E3\u30F3\u30B3\u30EC\u8A9E +nyo=\u30CB\u30E7\u30ED\u8A9E +nzi=\u30F3\u30BC\u30DE\u8A9E +oci=\u30AA\u30C3\u30AF\u8A9E(1500\u4EE5\u5F8C) +oji=\u30AA\u30B8\u30D6\u30EF\u8A9E +ori=\u30AA\u30EA\u30E4\u30FC\u8A9E +orm=\u30AA\u30ED\u30E2\u8A9E +osa=\u30AA\u30BB\u30FC\u30B8\u8A9E +oss=\u30AA\u30BB\u30C3\u30C8\u8A9E +ota=\u30AA\u30B9\u30DE\u30F3\u30C8\u30EB\u30B3\u8A9E +oto=\u30AA\u30C8\u30DF\u8A9E\u65CF +paa=\u30D1\u30D7\u30A2\u8AF8\u8A9E +pag=\u30D1\u30F3\u30AC\u30B7\u30CA\u30F3\u8A9E +pal=\u30D1\u30D5\u30E9\u30F4\u30A3\u8A9E +pam=\u30D1\u30F3\u30D1\u30F3\u30AC\u8A9E +pan=\u30D1\u30F3\u30B8\u30E3\u30D6\u8A9E +pap=\u30D1\u30D4\u30A2\u30E1\u30F3\u30C8\u8A9E +pau=\u30D1\u30E9\u30AA\u8A9E +peo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u8A9E +per=\u30DA\u30EB\u30B7\u30A2\u8A9E +phi=\u30D5\u30A3\u30EA\u30D4\u30F3\u8AF8\u8A9E +phn=\u30D5\u30A7\u30CB\u30AD\u30A2\u8A9E +pli=\u30D1\u30FC\u30EA\u8A9E +pol=\u30DD\u30FC\u30E9\u30F3\u30C9\u8A9E +pon=\u30DD\u30F3\u30DA\u30A4\u8A9E +por=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E +pra=\u30D7\u30E9\u30FC\u30AF\u30EA\u30C3\u30C8\u8A9E\u65CF +pro=\u53E4\u671F\u30D7\u30ED\u30D0\u30F3\u30B9\u8A9E +pus=\u30D7\u30B7\u30E5\u30C8\u30A5\u30FC\u8A9E\u3001\u30D1\u30B7\u30E5\u30C8\u30A5\u30FC\u8A9E +que=\u30B1\u30C1\u30E5\u30A2\u8A9E +raj=\u30E9\u30FC\u30B8\u30E3\u30B9\u30BF\u30FC\u30F3\u8A9E +rap=\u30E9\u30D1\u30CC\u30A4\u8A9E +rar=\u30E9\u30ED\u30C8\u30AC\u8A9E +roa=\u30ED\u30DE\u30F3\u30B9\u8AF8\u8A9E +roh=\u30ED\u30DE\u30F3\u30B7\u30E5\u8A9E +rom=\u30ED\u30DE\u30FC\u30CB\u30FC\u8A9E +rum=\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E +run=\u30EB\u30F3\u30C7\u30A3\u8A9E +rup=\u30A2\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E +rus=\u30ED\u30B7\u30A2\u8A9E +sad=\u30B5\u30F3\u30C0\u30A6\u30A7\u8A9E +sag=\u30B5\u30F3\u30B4\u8A9E +sah=\u30E4\u30AF\u30FC\u30C8\u8A9E +sai=\u5357\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E +sal=\u30BB\u30A4\u30EA\u30C3\u30B7\u30E5\u8A9E\u65CF +sam=\u30B5\u30DE\u30EA\u30A2\u30FB\u30A2\u30E9\u30E0\u8A9E +san=\u30B5\u30F3\u30B9\u30AF\u30EA\u30C3\u30C8\u8A9E +sas=\u30B5\u30B5\u30AF\u8A9E +sat=\u30B5\u30F3\u30BF\u30FC\u30EA\u30FC\u8A9E +scn=\u30B7\u30C1\u30EA\u30A2\u8A9E +sco=\u30B9\u30B3\u30C3\u30C8\u30E9\u30F3\u30C9\u8A9E +sel=\u30BB\u30EA\u30AF\u30D7\u8A9E +sem=\u30BB\u30E0\u8AF8\u8A9E +sga=\u53E4\u671F\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E +sgn=\u624B\u307E\u306D\u8A00\u8A9E +shn=\u30B7\u30E3\u30F3\u8A9E +sid=\u30B7\u30C0\u30E2\u8A9E +sin=\u30B7\u30F3\u30CF\u30E9\u8A9E +sio=\u30B9\u30FC\u8A9E\u65CF +sit=\u30B9\u30ED\u30D9\u30CB\u30A2 \u30C8\u30E9\u30FC\u30EB +sla=\u30B9\u30E9\u30D6\u8AF8\u8A9E +slo=\u30B9\u30ED\u30D0\u30AD\u30A2\u8A9E +slv=\u30B9\u30ED\u30D9\u30CB\u30A2\u8A9E +sma=\u5357\u30B5\u30FC\u30DF\u8A9E +sme=\u5317\u30B5\u30FC\u30DF\u8A9E +smi=\u30B5\u30FC\u30DF\u8AF8\u8A9E +smj=\u30EB\u30EC\u30FB\u30B5\u30FC\u30DF\u8A9E +smn=\u30A4\u30CA\u30EA\u30FB\u30B5\u30FC\u30DF\u8A9E +smo=\u30B5\u30E2\u30A2\u8A9E +sms=\u30B9\u30B3\u30EB\u30C8\u30FB\u30B5\u30FC\u30DF\u8A9E +sna=\u30B7\u30E7\u30CA\u8A9E +snd=\u30B7\u30F3\u30C9\u8A9E +snk=\u30BD\u30CB\u30F3\u30B1\u8A9E +sog=\u30BD\u30B0\u30C9\u8A9E +som=\u30BD\u30DE\u30EA\u8A9E +son=\u30BD\u30F3\u30AC\u30A4\u8A9E +sot=\u5357\u90E8\u30BD\u30C8\u8A9E +spa=\u30B9\u30DA\u30A4\u30F3\u8A9E +srd=\u30B9\u30EA\u30CA\u30E0 \u30C9\u30EB +srn=\u30B9\u30EA\u30CA\u30E0\u8A9E +srp=\u30BB\u30EB\u30D3\u30A2\u8A9E +srr=\u30BB\u30EC\u30EB\u8A9E +ssa=\u30CA\u30A4\u30EB\u30FB\u30B5\u30CF\u30E9\u8AF8\u8A9E +ssw=\u30B7\u30B9\u30EF\u30C6\u30A3\u8A9E +suk=\u30B9\u30AF\u30DE\u8A9E +sun=\u30B9\u30F3\u30C0\u8A9E +sus=\u30B9\u30B9\u8A9E +sux=\u30B7\u30E5\u30E1\u30FC\u30EB\u8A9E +swa=\u30B9\u30EF\u30D2\u30EA\u8A9E +swe=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u8A9E +syc=\u53E4\u5178\u30B7\u30EA\u30A2\u8A9E +syr=\u30B7\u30EA\u30A2\u8A9E +tah=\u30BF\u30D2\u30C1\u8A9E +tai=\u30BF\u30A4\u8AF8\u8A9E +tam=\u30BF\u30DF\u30EB\u8A9E +tat=\u30BF\u30BF\u30FC\u30EB\u8A9E +tel=\u30C6\u30EB\u30B0\u8A9E +tem=\u30C6\u30E0\u30CD\u8A9E +ter=\u30C6\u30EC\u30FC\u30CE\u8A9E +tet=\u30C6\u30C8\u30A5\u30F3\u8A9E +tgk=\u30BF\u30B8\u30AF\u8A9E +tgl=\u30BF\u30AC\u30ED\u30B0\u8A9E +tha=\u30BF\u30A4\u8A9E +tib=\u30C1\u30D9\u30C3\u30C8\u8A9E +tig=\u30C6\u30A3\u30B0\u30EC\u8A9E +tir=\u30C6\u30A3\u30B0\u30EA\u30CB\u30E3\u8A9E +tiv=\u30C6\u30A3\u30D6\u8A9E +tkl=\u30C8\u30B1\u30E9\u30A6\u8A9E +tlh=\u30AF\u30EA\u30F3\u30B4\u30F3\u8A9E +tli=\u30C8\u30EA\u30F3\u30AE\u30C3\u30C8\u8A9E +tmh=\u30BF\u30DE\u30B7\u30A7\u30AF\u8A9E +tog=\u30C8\u30F3\u30AC\u8A9E (\u30CB\u30A2\u30B5) +ton=\u30C8\u30F3\u30AC\u8A9E(\u30C8\u30F3\u30AC\u8AF8\u5CF6) +tpi=\u30C8\u30AF\u30FB\u30D4\u30B7\u30F3\u8A9E +tsi=\u30C1\u30E0\u30B7\u30E5\u8A9E +tsn=\u30C4\u30EF\u30CA\u8A9E +tso=\u30C4\u30A9\u30F3\u30AC\u8A9E +tuk=\u30C8\u30EB\u30AF\u30E1\u30F3\u8A9E +tum=\u30C8\u30A5\u30F3\u30D6\u30AB\u8A9E +tup=\u30C8\u30A5\u30D4\u8A9E\u65CF +tur=\u30C8\u30EB\u30B3\u8A9E +tut=\u30A2\u30EB\u30BF\u30A4\u8AF8\u8A9E +tvl=\u30C4\u30D0\u30EB\u8A9E +twi=\u30C8\u30A6\u30A3\u8A9E +tyv=\u30C8\u30A5\u30F4\u30A1\u8A9E +udm=\u30A6\u30C9\u30E0\u30EB\u30C8\u8A9E +uga=\u30A6\u30AC\u30EA\u30C8\u8A9E +uig=\u30A6\u30A4\u30B0\u30EB\u8A9E +ukr=\u30A6\u30AF\u30E9\u30A4\u30CA\u8A9E +umb=\u30A6\u30F3\u30D6\u30F3\u30C9\u30A5\u8A9E +und=\u975E\u78BA\u5B9A +urd=\u30A6\u30EB\u30C9\u30A5\u30FC\u8A9E +uzb=\u30A6\u30BA\u30D9\u30AF\u8A9E +vai=\u30F4\u30A1\u30A4\u8A9E +ven=\u30D9\u30F3\u30C0\u8A9E +vie=\u30D9\u30C8\u30CA\u30E0\u8A9E +vol=\u30F4\u30A9\u30E9\u30D4\u30E5\u30FC\u30AF\u8A9E +vot=\u30DC\u30FC\u30C8\u8A9E +wak=\u30EF\u30AB\u30B7\u8A9E\u65CF +wal=\u30EF\u30C3\u30E9\u30E2\u8A9E +war=\u30EF\u30E9\u30A4\u8A9E +was=\u30EF\u30B7\u30E7\u8A9E +wel=\u30A6\u30A7\u30FC\u30EB\u30BA\u8A9E +wen=\u30BD\u30EB\u30D3\u30A2\u8A9E\u65CF +wln=\u30EF\u30ED\u30F3\u8A9E +wol=\u30A6\u30A9\u30ED\u30D5\u8A9E +xal=\u30AB\u30EB\u30E0\u30A4\u30AF\u8A9E +xho=\u30B3\u30FC\u30B5\u8A9E +yao=\u30E4\u30AA\u8A9E +yap=\u30E4\u30C3\u30D7\u8A9E +yid=\u30A4\u30C7\u30A3\u30C3\u30B7\u30E5\u8A9E +yor=\u30E8\u30EB\u30D0\u8A9E +ypk=\u30E6\u30D4\u30C3\u30AF\u8A9E\u65CF +zap=\u30B6\u30DD\u30C6\u30C3\u30AF\u8A9E +zbl=\u30D6\u30EA\u30B9\u30B7\u30F3\u30DC\u30EB +zen=\u30BC\u30CA\u30AC\u8A9E +zha=\u30C1\u30E5\u30EF\u30F3\u8A9E +znd=\u30B6\u30F3\u30C7\u8A9E +zul=\u30BA\u30FC\u30EB\u30FC\u8A9E +zun=\u30BA\u30CB\u8A9E +zxx=\u8A00\u8A9E\u5185\u5BB9\u306A\u3057 +zza=\u30B6\u30B6\u8A9E + +# script names +# key is ISO 15924 script code + +Arab=\u30A2\u30E9\u30D3\u30A2\u6587\u5B57 +Armi=\u5E1D\u56FD\u30A2\u30E9\u30E0\u8A9E +Armn=\u30A2\u30EB\u30E1\u30CB\u30A2\u6587\u5B57 +Avst=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E +Bali=\u30D0\u30EA\u6587\u5B57 +Bamu=\u30D0\u30E0\u30F3\u8A9E +Bass=\u30D0\u30B5\u8A9E(\u30D0\u30FC) +Batk=\u30D0\u30BF\u30AF\u6587\u5B57 +Beng=\u30D9\u30F3\u30AC\u30EB\u6587\u5B57 +Blis=\u30D6\u30EA\u30B9\u30B7\u30F3\u30DC\u30EB +Bopo=\u6CE8\u97F3\u5B57\u6BCD +Brah=\u30D6\u30E9\u30FC\u30D5\u30DF\u30FC\u6587\u5B57 +Brai=\u30D6\u30E9\u30A4\u30E6\u70B9\u5B57 +Bugi=\u30D6\u30AE\u30B9\u6587\u5B57 +Buhd=\u30D6\u30D2\u30C3\u30C9\u6587\u5B57 +Cakm=\u30C1\u30E3\u30AF\u30DE\u8A9E +Cans=\u7D71\u5408\u30AB\u30CA\u30C0\u5148\u4F4F\u6C11\u8A18\u53F7 +Cari=\u30AB\u30EA\u6587\u5B57 +Cham=\u30C1\u30E3\u30E0\u6587\u5B57 +Cher=\u30C1\u30A7\u30ED\u30AD\u30FC\u6587\u5B57 +Cirt=\u30AD\u30A2\u30B9\u6587\u5B57 +Copt=\u30B3\u30D7\u30C8\u6587\u5B57 +Cprt=\u30AD\u30D7\u30ED\u30B9\u6587\u5B57 +Cyrl=\u30AD\u30EA\u30EB\u6587\u5B57 +Cyrs=\u30AD\u30EA\u30EB\u6587\u5B57 (\u53E4\u4EE3\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E\u306E\u6587\u5B57) +Deva=\u30C7\u30FC\u30D0\u30CA\u30FC\u30AC\u30EA\u30FC\u6587\u5B57 +Dsrt=\u30C7\u30BB\u30EC\u30C3\u30C8\u6587\u5B57 +Dupl=\u30C7\u30E5\u30D7\u30ED\u30EF\u30A8\u5F0F\u901F\u8A18 +Egyd=\u30A8\u30B8\u30D7\u30C8\u6C11\u8846\u6587\u5B57 +Egyh=\u30A8\u30B8\u30D7\u30C8\u795E\u5B98\u6587\u5B57 +Egyp=\u30A8\u30B8\u30D7\u30C8\u8056\u523B\u6587\u5B57 +Elba=\u30A8\u30EB\u30D0\u30B5\u30F3\u6587\u5B57 +Ethi=\u30A8\u30C1\u30AA\u30D4\u30A2\u6587\u5B57 +Geok=\u30B0\u30EB\u30B8\u30A2\u6587\u5B57\uFF08\u30D5\u30C4\u30EA\uFF09 +Geor=\u30B0\u30EB\u30B8\u30A2\u6587\u5B57 +Glag=\u30B0\u30E9\u30B4\u30FC\u30EB\u6587\u5B57 +Goth=\u30B4\u30FC\u30C8\u6587\u5B57 +Gran=\u30B0\u30E9\u30F3\u30BF\u6587\u5B57 +Grek=\u30AE\u30EA\u30B7\u30E3\u6587\u5B57 +Gujr=\u30B0\u30B8\u30E3\u30E9\u30FC\u30C8\u6587\u5B57 +Guru=\u30B0\u30EB\u30E0\u30AD\u30FC\u6587\u5B57 +Hang=\u30CF\u30F3\u30B0\u30EB +Hani=\u6F22\u5B57 +Hano=\u30CF\u30CC\u30CE\u30AA\u6587\u5B57 +Hans=\u7C21\u4F53\u5B57 +Hant=\u7E41\u4F53\u5B57 +Hebr=\u30D8\u30D6\u30E9\u30A4\u6587\u5B57 +Hira=\u3072\u3089\u304C\u306A +Hmng=\u30D1\u30CF\u30A6\u30FB\u30D5\u30E2\u30F3\u6587\u5B57 +Hrkt=\u30AB\u30BF\u30AB\u30CA\u3068\u3072\u3089\u304C\u306A +Hung=\u53E4\u4EE3\u30CF\u30F3\u30AC\u30EA\u30FC\u6587\u5B57 +Inds=\u30A4\u30F3\u30C0\u30B9\u6587\u5B57 (\u30CF\u30E9\u30C3\u30D1\u6587\u5B57) +Ital=\u53E4\u4EE3\u30A4\u30BF\u30EA\u30A2\u306E\u6587\u5B57 +Java=\u30B8\u30E3\u30EF\u6587\u5B57 +Jpan=\u65E5\u672C\u8A9E\u306E\u6587\u5B57 +Kali=\u30AB\u30E4\u30FC\u6587\u5B57 +Kana=\u30AB\u30BF\u30AB\u30CA +Khar=\u30AB\u30ED\u30FC\u30B7\u30E5\u30C6\u30A3\u30FC\u6587\u5B57 +Khmr=\u30AF\u30E1\u30FC\u30EB\u6587\u5B57 +Knda=\u30AB\u30F3\u30CA\u30C0\u6587\u5B57 +Kore=\u97D3\u56FD\u8A9E\u306E\u6587\u5B57 +Kpel=\u30AF\u30DA\u30EC\u8A9E +Kthi=\u30AB\u30A4\u30C6\u30A3\u30FC\u6587\u5B57 +Lana=\u30BF\u30A4\u30FB\u30BF\u30E0\u6587\u5B57 +Laoo=\u30E9\u30AA\u6587\u5B57 +Latf=\u30E9\u30C6\u30F3\u6587\u5B57 (\u30C9\u30A4\u30C4\u6587\u5B57) +Latg=\u30E9\u30C6\u30F3\u6587\u5B57(\u30B2\u30FC\u30EB\u8A9E) +Latn=\u30E9\u30C6\u30F3\u6587\u5B57 +Lepc=\u30EC\u30D7\u30C1\u30E3\u6587\u5B57 (\u30ED\u30F3\u6587\u5B57) +Limb=\u30EA\u30F3\u30D6\u6587\u5B57 +Lina=\u7DDA\u6587\u5B57A +Linb=\u7DDA\u6587\u5B57B +Lisu=\u30EA\u30B9\u6587\u5B57 +Loma=\u30ED\u30DE\u6587\u5B57 +Lyci=\u30EA\u30E5\u30AD\u30A2\u6587\u5B57 +Lydi=\u30EA\u30C7\u30A3\u30A2\u6587\u5B57 +Mand=\u30DE\u30F3\u30C0\u6587\u5B57 +Mani=\u30DE\u30CB\u6587\u5B57 +Maya=\u30DE\u30E4\u8C61\u5F62\u6587\u5B57 +Mend=\u30E1\u30F3\u30C7\u8A9E +Merc=\u30E1\u30ED\u30A8\u6587\u5B57\u8349\u66F8\u4F53 +Mero=\u30E1\u30ED\u30A8\u6587\u5B57 +Mlym=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u6587\u5B57 +Mong=\u30E2\u30F3\u30B4\u30EB\u6587\u5B57 +Moon=\u30E0\u30FC\u30F3\u6587\u5B57 +Mtei=\u30E1\u30A4\u30C6\u30A4\u6587\u5B57 +Mymr=\u30DF\u30E3\u30F3\u30DE\u30FC\u6587\u5B57 +Narb=\u53E4\u4EE3\u5317\u30A2\u30E9\u30D3\u30A2\u8A9E +Nbat=\u30CA\u30D0\u30C6\u30A2\u8A9E +Nkgb=Nakhi Geba\u6587\u5B57 +Nkoo=\u30F3\u30B3\u6587\u5B57 +Ogam=\u30AA\u30AC\u30E0\u6587\u5B57 +Olck=\u30AA\u30EB\u30C1\u30AD\u6587\u5B57 +Orkh=\u30AA\u30EB\u30DB\u30F3\u6587\u5B57 +Orya=\u30AA\u30EA\u30E4\u30FC\u6587\u5B57 +Osma=\u30AA\u30B9\u30DE\u30CB\u30A2\u6587\u5B57 +Palm=\u30D1\u30EB\u30DF\u30E9\u6587\u5B57 +Perm=\u53E4\u30DA\u30EB\u30DF\u30C3\u30AF\u6587\u5B57 +Phag=\u30D1\u30B9\u30D1\u6587\u5B57 +Phli=\u7891\u6587\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57 +Phlp=\u8A69\u7BC7\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57 +Phlv=\u66F8\u7C4D\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57 +Phnx=\u30D5\u30A7\u30CB\u30AD\u30A2\u6587\u5B57 +Plrd=\u30DD\u30E9\u30FC\u30C9\u97F3\u58F0\u8A18\u53F7 +Prti=\u7891\u6587\u306E\u30D1\u30EB\u30C6\u30A3\u30A2\u6587\u5B57 +Rjng=\u30EC\u30B8\u30E3\u30F3\u8A9E +Roro=\u30ED\u30F3\u30B4\u30ED\u30F3\u30B4\u6587\u5B57 +Runr=\u30EB\u30FC\u30F3\u6587\u5B57 +Samr=\u30B5\u30DE\u30EA\u30A2\u8A9E +Sara=\u30B5\u30E9\u30C6\u30A3\u6587\u5B57 +Sarb=\u53E4\u4EE3\u5357\u30A2\u30E9\u30D3\u30A2\u8A9E +Saur=\u30B5\u30A4\u30E9\u30B7\u30E5\u30C8\u30E9\u8A9E +Sgnw=\u624B\u8A71\u8A18\u8FF0 +Shaw=\u30B7\u30E7\u30FC\u6587\u5B57 +Sind=\u30B7\u30F3\u30C9\u8A9E +Sinh=\u30B7\u30F3\u30CF\u30E9\u6587\u5B57 +Sund=\u30B9\u30F3\u30C0\u8A9E +Sylo=\u30B7\u30ED\u30C6\u30A3\u30FB\u30CA\u30B0\u30EA\u6587\u5B57 +Syrc=\u30B7\u30EA\u30A2\u6587\u5B57 +Syre=\u30B7\u30EA\u30A2\u6587\u5B57 (\u30A8\u30B9\u30C8\u30E9\u30F3\u30B2\u30ED\u6587\u5B57) +Syrj=\u30B7\u30EA\u30A2\u6587\u5B57 (\u897F\u65B9\u30B7\u30EA\u30A2\u6587\u5B57) +Syrn=\u30B7\u30EA\u30A2\u6587\u5B57 (\u6771\u65B9\u30B7\u30EA\u30A2\u6587\u5B57) +Tagb=\u30BF\u30B0\u30D0\u30F3\u30EF\u6587\u5B57 +Tale=\u30BF\u30A4\u30EC\u6587\u5B57 +Talu=\u65B0\u30BF\u30A4\u30FB\u30EB\u30FC\u6587\u5B57 +Taml=\u30BF\u30DF\u30FC\u30EB\u6587\u5B57 +Tavt=\u30BF\u30A4\u30FB\u30F4\u30A7\u30C8\u6587\u5B57 +Telu=\u30C6\u30EB\u30B0\u6587\u5B57 +Teng=\u30C6\u30F3\u30B0\u30EF\u30FC\u30EB\u6587\u5B57 +Tfng=\u30AF\u30E1\u30FC\u30EB\u8A9E +Tglg=\u30BF\u30AC\u30ED\u30B0\u6587\u5B57 +Thaa=\u30BF\u30FC\u30CA\u6587\u5B57 +Thai=\u30BF\u30A4\u6587\u5B57 +Tibt=\u30C1\u30D9\u30C3\u30C8\u6587\u5B57 +Ugar=\u30A6\u30AC\u30EA\u30C8\u6587\u5B57 +Vaii=\u30F4\u30A1\u30A4\u6587\u5B57 +Visp=\u8996\u8A71\u6CD5 +Wara=\u30EF\u30E9\u30F3\u30B0\u30FB\u30AF\u30B7\u30C6\u30A3\u6587\u5B57 +Xpeo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u6587\u5B57 +Xsux=\u30B7\u30E5\u30E1\u30FC\u30EB\uFF1D\u30A2\u30C3\u30AB\u30C9\u8A9E\u6954\u5F62\u6587\u5B57 +Yiii=\u30A4\u6587\u5B57 +Zinh=\u7D99\u627F\u7528\u5B57 +Zmth=\u6570\u5B66\u8A18\u53F7 +Zsym=\u8A18\u53F7 +Zxxx=\u53E3\u627F\u8A00\u8A9E\u306E\u30B3\u30FC\u30C9 +Zyyy=\u5171\u901A\u30B3\u30FC\u30C9 +Zzzz=\u7528\u5B57\u672A\u30B3\u30FC\u30C9\u5316 + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=\u5357\u30a2\u30d5\u30ea\u30ab ZM=\u30b6\u30f3\u30d3\u30a2 ZW=\u30b8\u30f3\u30d0\u30d6\u30a8 + +# territory names +# key is UN M.49 country and area code + +001=\u4E16\u754C +002=\u30A2\u30D5\u30EA\u30AB +003=\u5317\u7C73 +005=\u5357\u30A2\u30E1\u30EA\u30AB +009=\u30AA\u30BB\u30A2\u30CB\u30A2 +011=\u897F\u30A2\u30D5\u30EA\u30AB +013=\u4E2D\u592E\u30A2\u30E1\u30EA\u30AB +014=\u6771\u30A2\u30D5\u30EA\u30AB +015=\u5317\u30A2\u30D5\u30EA\u30AB +017=\u4E2D\u90E8\u30A2\u30D5\u30EA\u30AB +018=\u5357\u90E8\u30A2\u30D5\u30EA\u30AB +019=\u30A2\u30E1\u30EA\u30AB\u5927\u9678 +021=\u5317\u30A2\u30E1\u30EA\u30AB +029=\u30AB\u30EA\u30D6\u6D77 +030=\u6771\u30A2\u30B8\u30A2 +034=\u5357\u30A2\u30B8\u30A2 +035=\u6771\u5357\u30A2\u30B8\u30A2 +039=\u5357\u30E8\u30FC\u30ED\u30C3\u30D1 +053=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9 +054=\u30E1\u30E9\u30CD\u30B7\u30A2 +057=\u30DF\u30AF\u30ED\u30CD\u30B7\u30A2\u5730\u57DF +061=\u30DD\u30EA\u30CD\u30B7\u30A2 +142=\u30A2\u30B8\u30A2 +143=\u4E2D\u592E\u30A2\u30B8\u30A2 +145=\u897F\u30A2\u30B8\u30A2 +150=\u30E8\u30FC\u30ED\u30C3\u30D1 +151=\u6771\u30E8\u30FC\u30ED\u30C3\u30D1 +154=\u5317\u30E8\u30FC\u30ED\u30C3\u30D1 +155=\u897F\u30E8\u30FC\u30ED\u30C3\u30D1 +419=\u30E9\u30C6\u30F3\u30A2\u30E1\u30EA\u30AB\u30FB\u30AB\u30EA\u30D6\u5730\u57DF diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=\uc911\uad6d\uc5b4 zu=\uc904\ub8e8\uc5b4 +# key is ISO 639.2 language code +aar=\uC544\uD30C\uB974\uC5B4 +abk=\uC544\uBE0C\uD558\uC988\uC5B4 +ace=\uC544\uCCB4\uC5B4 +ach=\uC544\uCF5C\uB9AC\uC5B4 +ada=\uC544\uB2F9\uBA54\uC5B4 +ady=\uC544\uB2E5\uD5E4\uC5B4 +afa=\uC544\uD504\uAC00\uB2C8(1927-2002) +afh=\uC544\uD504\uB9AC\uD788\uB9AC\uC5B4 +afr=\uB0A8\uC544\uACF5 \uACF5\uC6A9\uC5B4 +ain=\uC544\uC774\uB204\uC5B4 +aka=\uC544\uCE78\uC5B4 +akk=\uC544\uCE74\uB4DC\uC5B4 +alb=\uC54C\uBC14\uB2C8\uC544\uC5B4 +ale=\uC54C\uB958\uD2B8\uC5B4 +alg=\uC54C\uACF5\uD0A8\uC5B4\uC871 +alt=\uB0A8\uBD80 \uC54C\uD0C0\uC774\uC81C\uC5B4 +amh=\uC554\uD558\uB77C\uC5B4 +ang=\uB124\uB35C\uB780\uB4DC\uB839 \uC548\uD2F8\uB808\uC2A4 \uAE38\uB354 +anp=\uC559\uAC00\uC5B4 +apa=\uC544\uD30C\uCE58\uC5B4 +ara=\uC544\uB78D\uC5B4 +arc=\uC544\uB78C\uC5B4 +arg=\uC544\uB77C\uACE4\uC5B4 +arm=\uC544\uB974\uBA54\uB2C8\uC544\uC5B4 +arn=\uC544\uB77C\uC6B0\uCE78\uC5B4 +arp=\uC544\uB77C\uD30C\uD638\uC5B4 +art=\uAE30\uACC4\uC5B4(\uAE30\uD0C0) +arw=\uC544\uB77C\uC640\uD06C\uC5B4 +asm=\uC544\uC0D8\uC5B4 +ast=\uC544\uC2A4\uD22C\uB9AC\uC544\uC5B4 +ath=\uC544\uD0C0\uD30C\uC2A4\uCE74\uC5B4\uAD70 +aus=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544\uC5B4\uC871 +ava=\uC544\uBC14\uB974\uC5B4 +ave=\uC544\uBCA0\uC2A4\uD0C0\uC5B4 +awa=\uC544\uC640\uD788\uC5B4 +aym=\uC544\uC774\uB9C8\uB77C\uC5B4 +aze=\uC544\uC81C\uB974\uBC14\uC774\uC794\uC5B4 +bad=\uBCF4\uC2A4\uB2C8\uC544-\uD5E4\uB974\uCCB4\uACE0\uBE44\uB098 \uB514\uB098\uB974 +bai=\uBC14\uBC00\uB808\uCF00\uC5B4\uC871 +bak=\uBC14\uC288\uD0A4\uB974\uC5B4 +bal=\uBC1C\uB8E8\uCE58\uC5B4 +bam=\uBC24\uBC14\uB77C\uC5B4 +ban=\uBC1C\uB9AC\uC5B4 +baq=\uBC14\uC2A4\uD06C\uC5B4 +bas=\uBC14\uC0AC\uC5B4 +bat=\uBC1C\uD2B8\uC5B4(\uAE30\uD0C0) +bej=\uBCA0\uC790\uC5B4 +bel=\uBCA8\uB77C\uB8E8\uC2A4\uC5B4 +bem=\uBCB0\uBC14\uC5B4 +ben=\uBCB5\uACE8\uC5B4 +ber=\uBCA0\uB974\uBCA0\uB974\uC5B4 +bho=\uD638\uC988\uD478\uB9AC\uC5B4 +bih=\uBE44\uD558\uB974\uC5B4 +bik=\uBE44\uCF5C\uC5B4 +bin=\uBE44\uB2C8\uC5B4 +bis=\uBE44\uC2AC\uB77C\uB9C8\uC5B4 +bla=\uC2DD\uC2DC\uCE74\uC5B4 +bnt=\uBC18\uD22C\uC5B4 +bos=\uBCF4\uC2A4\uB2C8\uC544\uC5B4 +bra=\uBE0C\uB77C\uC9C0\uC5B4 +bre=\uBE0C\uB77C\uC9C8 \uD06C\uB8E8\uC81C\uC774\uB8E8 (1990-1993) +btk=\uBC14\uD0C0\uD06C\uC5B4 +bua=\uBD80\uB9AC\uC544\uD0C0 +bug=\uBD80\uAE30\uC5B4 +bul=\uBD88\uAC00\uB9AC\uC544\uC5B4 +bur=\uBC84\uB9C8\uC5B4 +byn=\uBE0C\uB9B0\uC5B4 +cad=\uCE74\uB3C4\uC5B4 +cai=\uC911\uC559 \uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC548\uC5B4(\uAE30\uD0C0) +car=\uCE74\uB9AC\uBE0C\uC5B4 +cat=\uCE74\uD0C8\uB85C\uB2C8\uC544\uC5B4 +cau=\uCE74\uD504\uCE74\uC2A4\uC5B4(\uAE30\uD0C0) +ceb=\uC138\uBD80\uC544\uB178\uC5B4 +cel=\uCF08\uD2B8\uC5B4(\uAE30\uD0C0) +cha=\uCC28\uBAA8\uB85C\uC5B4 +chb=\uCE58\uBE0C\uCC28\uC5B4 +che=\uCCB4\uCCB8\uC5B4 +chg=\uCC28\uAC00\uD0C0\uC774\uC5B4 +chi=\uC911\uAD6D\uC5B4 +chk=\uCD94\uD06C\uC5B4 +chm=\uB9C8\uB9AC\uC5B4 +chn=\uCE58\uB204\uD06C\uC5B4\uC640 \uC601\uC5B4 \uD504\uB791\uC2A4\uC5B4\uC758 \uD63C\uC131\uC5B4 +cho=\uCD09\uD1A0\uC5B4 +chp=\uCE58\uD398\uC6B0\uC580 +chr=\uCCB4\uB85C\uD0A4 \uBB38\uC790 +chu=\uAD50\uD68C \uC2AC\uB77C\uBE0C\uC5B4 +chv=\uCD94\uBC14\uC26C\uC5B4 +chy=\uC0E4\uC774\uC5D4\uC5B4 +cmc=\uCC38\uC5B4\uAD70 +cop=\uCF65\uD2B8 \uBB38\uC790 +cor=\uCF58\uC6D4\uC5B4 +cos=\uCF54\uB974\uC2DC\uCE74\uC5B4 +cpe=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uC601\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0) +cpf=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uD504\uB791\uC2A4\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0) +cpp=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uD3EC\uB974\uD22C\uCE7C\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0) +cre=\uD06C\uB9AC\uC5B4 +crh=\uD06C\uB9AC\uBBFC \uD130\uD0A4\uC5B4; \uD06C\uB9AC\uBBFC \uD0C0\uD0C0\uB974\uC5B4 +crp=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4 (\uAE30\uD0C0) +csb=\uCE74\uC288\uBE44\uC544\uC5B4 +cus=\uCFE0\uC2DC\uC5B4\uC871 +cze=\uCCB4\uCF54\uC5B4 +dak=\uB2E4\uCF54\uD0C0\uC5B4 +dan=\uB374\uB9C8\uD06C\uC5B4 +dar=\uB2E4\uB974\uADF8\uC640\uC5B4 +day=\uB2E4\uC57C\uD06C\uC5B4 +del=\uB378\uB77C\uC6E8\uC5B4\uC5B4 +den=\uC2AC\uB77C\uBE0C\uC5B4 +dgr=\uB3C4\uADF8\uB9AC\uBE0C\uC5B4 +din=\uB529\uCE74\uC5B4 +div=\uB514\uBCA0\uD788\uC5B4 +doi=\uB3C4\uADF8\uB9AC\uC5B4 +dra=\uB4DC\uB77C\uBE44\uB2E4\uC5B4 (\uAE30\uD0C0) +dsb=\uC800\uC9C0 \uC18C\uB974\uBE44\uC544\uC5B4 +dua=\uB4DC\uC640\uB77C\uC5B4 +dum=\uC911\uC138 \uB124\uB35C\uB780\uB4DC\uC5B4 +dut=\uB124\uB35C\uB780\uB4DC\uC5B4 +dyu=\uB4DC\uC728\uB77C\uC5B4 +dzo=\uBD80\uD0C4\uC5B4 +efi=\uC774\uD53D\uC5B4 +egy=\uC774\uC9D1\uD2B8\uC5B4 (\uACE0\uB300) +eka=\uC774\uCE74\uC8FD\uC5B4 +elx=\uC5D8\uB78C\uC5B4 +eng=\uC601\uC5B4 +enm=\uC601\uC5B4, \uC911\uC138(1100 - 1500) +epo=\uC5D0\uC2A4\uD398\uB780\uD1A0\uC5B4 +est=\uC5D0\uC2A4\uD1A0\uB2C8\uC544\uC5B4 +ewe=\uC5D0\uC6E8\uC5B4 +ewo=\uC774\uC6D0\uB3C4\uC5B4 +fan=\uD321\uADF8\uC5B4 +fao=\uD398\uB85C\uC2A4\uC5B4 +fat=\uD310\uD2F0\uC5B4 +fij=\uD53C\uC9C0\uC5B4 +fil=\uD544\uB9AC\uD540\uC5B4 +fin=\uD540\uB780\uB4DC\uC5B4 +fiu=\uD53C\uB178\uC6B0\uADF8\uB9AC\uC544\uC5B4(\uAE30\uD0C0) +fon=\uD3F0\uC5B4 +fre=\uD504\uB791\uC2A4\uC5B4 +frm=\uC911\uC138 \uD504\uB791\uC2A4\uC5B4 +fro=\uACE0\uB300 \uD504\uB791\uC2A4\uC5B4 +frr=\uBD81\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4 +frs=\uB3D9\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4 +fry=\uC11C\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4 +ful=\uD480\uB77C\uB2C8\uC5B4 +fur=\uD504\uB9AC\uC6B0\uB9AC\uC548\uC5B4 +gaa=\uAC00\uC5B4 +gay=\uAC00\uC694\uC5B4 +gba=\uADF8\uBC14\uC57C\uC5B4 +gem=\uB3C5\uC77C\uC5B4(\uAE30\uD0C0) +geo=\uADF8\uB8E8\uC9C0\uC57C\uC5B4 +ger=\uB3C5\uC77C\uC5B4 +gez=\uAC8C\uC774\uC988\uC5B4 +gil=\uD0A4\uB9AC\uBC14\uC2DC\uC5B4 +gla=\uAC8C\uC77C\uC5B4 +gle=\uC544\uC77C\uB79C\uB4DC\uC5B4 +glg=\uAC08\uB9AC\uC2DC\uC544\uC5B4 +glv=\uB9F9\uD06C\uC2A4\uC5B4 +gmh=\uC911\uC138 \uACE0\uC9C0 \uB3C5\uC77C\uC5B4 +goh=\uACE0\uB300 \uACE0\uC9C0 \uB3C5\uC77C\uC5B4 +gon=\uACE4\uB514\uC5B4 +gor=\uACE0\uB860\uD0C8\uB85C\uC5B4 +got=\uACE0\uD2B8\uC5B4 +grb=\uAC8C\uB974\uBCF4\uC5B4 +grc=\uADF8\uB9AC\uC2A4\uC5B4, \uACE0\uB300 (1453\uB144\uAE4C\uC9C0) +gre=\uADF8\uB9AC\uC2A4\uC5B4, \uADFC\uC138(1453\uB144\uBD80\uD130) +grn=\uAD6C\uC544\uB77C\uB2C8\uC5B4 +gsw=\uB3C5\uC77C\uC5B4(\uC2A4\uC704\uC2A4) +guj=\uAD6C\uC790\uB77C\uD2B8\uC5B4 +gwi=\uADF8\uC704\uCE5C\uC5B4 +hai=\uD558\uC774\uB2E4\uC5B4 +hat=\uC544\uC774\uD2F0\uC5B4 +hau=\uD558\uC6B0\uC790\uC5B4 +haw=\uD558\uC640\uC774\uC5B4 +heb=\uD788\uBE0C\uB9AC \uBB38\uC790 +her=\uD5E4\uB808\uB85C\uC5B4 +hil=\uD5E4\uB9AC\uAC00\uB1EC\uC5B4 +him=\uD788\uB9C8\uCC28\uB9AC\uC5B4 +hin=\uD78C\uB514\uC5B4 +hit=\uD558\uD0C0\uC774\uD2B8\uC5B4 +hmn=\uD788\uBAB8\uC5B4 +hmo=\uD788\uB9AC\uBAA8\uD22C\uC5B4 +hrv=\uD06C\uB85C\uC544\uD2F0\uC544\uC5B4 +hsb=\uACE0\uC9C0 \uC18C\uB974\uBE44\uC544\uC5B4 +hun=\uD5DD\uAC00\uB9AC\uC5B4 +hup=\uD6C4\uD30C\uC5B4 +iba=\uC774\uBC18\uC5B4 +ibo=\uC774\uADF8\uBCF4\uC5B4 +ice=\uC544\uC774\uC2AC\uB780\uB4DC\uC5B4 +ido=\uC774\uB3C4\uC5B4 +iii=\uC4F0\uCD28 \uC774\uC5B4 +ijo=\uC774\uC870\uC5B4 +iku=\uC774\uB205\uD2F0\uD22C\uD2B8\uC5B4 +ile=\uC778\uD130\uB9C1\uAC8C\uC5B4 +ilo=\uC774\uB85C\uCF54\uC5B4 +ina=\uC778\uD130\uB9C1\uAC70(\uAD6D\uC81C \uBCF4\uC870 \uC5B8\uC5B4 \uD611\uD68C) +inc=\uC778\uB3C4\uC5B4(\uAE30\uD0C0) +ind=\uC778\uB3C4\uB124\uC2DC\uC544\uC5B4 +ine=\uC778\uB3C4\uC720\uB7FD\uC5B4(\uAE30\uD0C0) +inh=\uC778\uADC0\uC2DC\uC5B4 +ipk=\uC774\uB204\uD53C\uC544\uD06C\uC5B4 +ira=\uC774\uB780\uC5B4 [ira] +iro=\uC774\uB7EC\uCFFC\uC774\uC5B4 +ita=\uC774\uD0C8\uB9AC\uC544\uC5B4 +jav=\uC790\uBC14\uC5B4 +jbo=\uB85C\uBC18\uC5B4 +jpn=\uC77C\uBCF8\uC5B4 +jpr=\uC720\uB300-\uD398\uB974\uC2DC\uC544\uC5B4 +jrb=\uC720\uB300-\uC544\uB77C\uBE44\uC544\uC5B4 +kaa=\uCE74\uB77C\uCE7C\uD30C\uD06C\uC5B4 +kab=\uCEE4\uBC14\uC77C\uC5B4 +kac=\uCE74\uCE5C\uC5B4 +kal=\uCE7C\uB784\uB9AC\uC218\uD2B8 +kam=\uCE84\uBC14\uC5B4 +kan=\uCE78\uB098\uB2E4 \uBB38\uC790 +kar=\uCE74\uB80C\uC5B4 +kas=\uCE74\uC288\uBBF8\uB974\uC5B4 +kau=\uCE74\uB204\uB9AC\uC5B4 +kaw=\uCE74\uC704\uC5B4 +kaz=\uCE74\uC790\uD750\uC5B4 +kbd=\uCE74\uBC14\uB974\uB514\uC5B4 +kha=\uCE74\uC2DC\uC5B4 +khi=\uCF54\uC774\uC0B0\uC5B4 +khm=\uC911\uC559 \uD06C\uBA54\uB974 \uBB38\uC790 +kho=\uD638\uD0C4\uC5B4 +kik=\uD0A4\uCFE0\uC720\uC5B4 +kin=\uBC18\uD22C\uC5B4(\uB8E8\uC644\uB2E4) +kir=\uD0A4\uB974\uAE30\uC2A4\uC5B4 +kmb=\uD0B4\uBD84\uB450\uC5B4 +kok=\uCF54\uCE74\uB2C8\uC5B4 +kom=\uCF54\uBBF8\uC5B4 +kon=\uCF69\uACE0\uC5B4 +kor=\uD55C\uAD6D\uC5B4 +kos=\uCF54\uC2A4\uB77C\uC774\uC5D4\uC5B4 +kpe=\uD06C\uD3A0\uB808\uC5B4 +krc=\uCE74\uB77C\uCC60\uC774-\uBC1C\uCE74\uB974\uC5B4 +krl=\uCE74\uB810\uB9AC\uC57C\uC5B4 +kro=\uD06C\uB8E8\uC5B4 +kru=\uCFE0\uB974\uD06C\uC5B4 +kua=\uCFE0\uC548\uC57C\uB9C8\uC5B4 +kum=\uCFE0\uBBF9\uC5B4 +kur=\uD06C\uB974\uB4DC\uC5B4 +kut=\uCFE0\uD14C\uB124\uC5B4 +lad=\uB77C\uB514\uB178\uC5B4 +lah=\uB77C\uD55C\uB2E4\uC5B4 +lam=\uB78C\uBC14\uC5B4 +lao=\uB77C\uC624\uC5B4 +lat=\uB77C\uD2F4\uC5B4 +lav=\uB77C\uD2B8\uBE44\uC544\uC5B4 +lez=\uB808\uC988\uAE30\uC548\uC5B4 +lim=\uB9BC\uBC84\uADF8\uC5B4 +lin=\uB9C1\uAC08\uB77C\uC5B4 +lit=\uB9AC\uD22C\uC544\uB2C8\uC544\uC5B4 +lol=\uBABD\uAD6C\uC5B4 +loz=\uB85C\uC9C0\uC5B4 +ltz=\uB8E9\uC148\uBD80\uB974\uD06C\uC5B4 +lua=\uB8E8\uBC14-\uB8F0\uB8E8\uC544\uC5B4 +lub=\uB8E8\uBC14\uC5B4(\uCE74\uD0D5\uAC00) +lug=\uAC04\uB2E4\uC5B4 +lui=\uB8E8\uC774\uC138\uB178\uC5B4 +lun=\uB8EC\uB2E4\uC5B4 +luo=\uB8E8\uC624\uC5B4 +lus=\uB8E8\uC0E4\uC774\uC5B4 +mac=\uB9C8\uCF00\uB3C4\uB2C8\uC544\uC5B4 +mad=\uBAA8\uB85C\uCF54 \uB514\uB818 +mag=\uB9C8\uAC00\uD788 +mah=\uB9D0\uC0B4\uB808\uC2A4\uC5B4 +mai=\uB9C8\uC774\uD2F8\uB9AC +mak=\uB9C8\uCE74\uC0AC\uC5B4 +mal=\uB9D0\uB77C\uC584\uB78C\uC5B4 +man=\uB9CC\uB529\uACE0\uC5B4 +mao=\uB9C8\uC624\uB9AC\uC5B4 +map=\uB0A8\uB3C4\uC5B4 +mar=\uB9C8\uB77C\uD2F0\uC5B4 +mas=\uB9C8\uC0AC\uC774\uC5B4 +may=\uB9D0\uB808\uC774\uC5B4 +mdf=\uBAA8\uD06C\uC0E4\uC5B4 +mdr=\uB9CC\uB2E4\uB974\uC5B4 +men=\uBA58\uB370\uC5B4 +mga=\uC544\uC77C\uB79C\uB4DC\uC5B4, \uC911\uC138(900 - 1200\uB144) +mic=\uBBF8\uD06C\uB9E5\uC5B4 +min=\uBBF8\uB0AD\uCE74\uBC14\uC6B0 +mis=\uAE30\uD0C0 \uC5B8\uC5B4 +mkh=\uBAAC\uD06C\uBA54\uB974\uC5B4 (\uAE30\uD0C0) +mlg=\uB9C8\uB2E4\uAC00\uC2A4\uCE74\uB974\uC5B4 +mlt=\uBAB0\uD0C0\uC5B4 +mnc=\uB9CC\uC8FC\uC5B4 +mni=\uB9C8\uB2C8\uD478\uB9AC\uC5B4 +mno=\uB9C8\uB178\uBCF4\uC5B4 +moh=\uBAA8\uD638\uD06C\uC5B4 +mon=\uBABD\uACE8\uC5B4 +mos=\uBAA8\uC2DC\uC5B4 +mul=\uB2E4\uC911 \uC5B8\uC5B4 +mun=\uBB38\uB2E4\uC5B4 +mus=\uD06C\uB9AC\uD06C\uC5B4 +mwl=\uBBF8\uB780\uB370\uC5B4 +mwr=\uB9C8\uB974\uC640\uB9AC\uC5B4 +myn=\uB9C8\uC57C\uC5B4 +myv=\uC5D8\uC988\uC57C\uC5B4 +nah=\uB098\uC6B0\uC544\uD2C0\uC5B4 +nai=\uBD81\uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC5B8\uC5B4 (\uAE30\uD0C0) +nap=\uB098\uD3F4\uB9AC\uC5B4 +nau=\uB098\uC6B0\uB8E8\uC5B4 +nav=\uB098\uBC14\uD638\uC5B4 +nbl=\uB370\uBCA0\uB808\uC5B4, \uB0A8\uBD80 +nde=\uB370\uBCA0\uB808\uC5B4, \uBD81\uBD80 +ndo=\uC740\uB3D9\uAC00\uC5B4 +nds=\uC800\uC9C0 \uB3C5\uC77C\uC5B4 +nep=\uB124\uD314\uC5B4 +new=\uB124\uC640\uB974\uC5B4 +nia=\uB2C8\uC544\uC2A4\uC5B4 +nic=\uB2C8\uCE74\uB77C\uACFC \uCF54\uB974\uB3C4\uBC14 +niu=\uB2C8\uC6E8\uC5B8\uC5B4 +nno=\uB178\uB974\uC6E8\uC774\uC5B4(\uB2C8\uB178\uB974\uC2A4\uD06C) +nob=\uB178\uB974\uC6E8\uC774\uC5B4(\uBD81\uBAB0) +nog=\uB178\uAC00\uC774\uC5B4 +non=\uB178\uB974\uC6E8\uC774, \uACE0\uB300 +nor=\uB178\uB974\uC6E8\uC774\uC5B4 +nqo=\uC751\uCF54\uC5B4 +nso=\uC18C\uD1A0\uC5B4(\uBD81\uBD80) +nub=\uB204\uBE44\uC548\uC5B4 +nwc=\uB124\uC640\uB974\uC5B4 (\uACE0\uC804) +nya=\uCE58\uCCB4\uC640\uC5B4 +nym=\uB2C8\uC554\uC6E8\uC9C0\uC5B4 +nyn=\uB2C8\uC548\uCF5C\uC5B4 +nyo=\uB274\uB85C\uC5B4 +nzi=\uB290\uC9C0\uB9C8\uC5B4 +oci=\uC625\uC2DC\uD2B8\uC5B4(1500\uB144 \uC774\uD6C4) +oji=\uC624\uC9C0\uBE0C\uC640\uC5B4 +ori=\uC624\uB9AC\uC57C\uC5B4 +orm=\uC624\uB85C\uBAA8\uC5B4 +osa=\uC624\uC138\uC774\uC9C0\uC5B4 +oss=\uC624\uC138\uD2F0\uC548\uC5B4 +ota=\uD130\uD0A4\uC5B4, \uC624\uC2A4\uB9CC(1500-1928) +oto=\uC624\uD1A0\uBBF8\uC548\uC5B4 +paa=\uD30C\uD478\uC544\uC5B4(\uAE30\uD0C0) +pag=\uD310\uAC00\uC2DC\uB09C\uC5B4 +pal=\uD314\uB808\uBE44\uC5B4 +pam=\uD31C\uD321\uAC00\uC5B4 +pan=\uD380\uC7A1\uC5B4 +pap=\uD30C\uD53C\uC544\uBA3C\uD1A0\uC5B4 +pau=\uD30C\uB77C\uC6B0\uC548\uC5B4 +peo=\uACE0\uB300 \uD398\uB974\uC2DC\uC544\uC5B4 +per=\uD398\uB974\uC2DC\uC544\uC5B4 +phi=\uD544\uB9AC\uD540\uC5B4(\uAE30\uD0C0) +phn=\uD398\uB2C8\uD0A4\uC544\uC5B4 +pli=\uD314\uB9AC\uC5B4 +pol=\uD3F4\uB780\uB4DC\uC5B4 +pon=\uD3FC\uD398\uC774\uC5B4 +por=\uD3EC\uB974\uD22C\uCE7C\uC5B4 +pra=\uD504\uB77C\uD06C\uB9AC\uD2B8\uC5B4 +pro=\uACE0\uB300 \uD504\uB85C\uBC29\uC2A4\uC5B4 +pus=\uD30C\uC288\uD1A0(\uD30C\uC288\uD1A0\uC5B4) +que=\uCF00\uCD94\uC544\uC5B4 +raj=\uB77C\uC790\uC2A4\uD0C4\uC5B4 +rap=\uB77C\uD30C\uB274\uC774 +rar=\uB77C\uB85C\uD1B5\uAC00\uC5B4 +roa=\uB85C\uB9DD\uC2A4\uC5B4(\uAE30\uD0C0) +roh=\uB85C\uB9DD\uC288\uC5B4 +rom=\uC9D1\uC2DC\uC5B4 +rum=\uB8E8\uB9C8\uB2C8\uC544\uC5B4 +run=\uB8EC\uB514\uC5B4 +rup=\uC544\uB85C\uB9C8\uB2C8\uC544\uC5B4 +rus=\uB7EC\uC2DC\uC544\uC5B4 +sad=\uC0B0\uB2E4\uC6E8\uC5B4 +sag=\uC0B0\uACE0\uC5B4 +sah=\uC57C\uD050\uD2B8\uC5B4 +sai=\uB0A8\uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC5B8\uC5B4 (\uAE30\uD0C0) +sal=\uC0D0\uB9AC\uC2DC\uC5B4\uC5B4 +sam=\uC0AC\uB9C8\uB9AC\uC544 \uC544\uB78D\uC5B4 +san=\uC0B0\uC2A4\uD06C\uB9AC\uD2B8\uC5B4 +sas=\uC0AC\uC0AC\uD06C\uC5B4 +sat=\uC0B0\uD0C8\uB9AC\uC5B4 +scn=\uC2DC\uCE60\uB9AC\uC544\uC5B4 +sco=\uC2A4\uCF54\uD2C0\uB79C\uB4DC\uC5B4 +sel=\uC140\uCFE0\uD504\uC5B4 +sem=\uC148\uC5B4(\uAE30\uD0C0) +sga=\uC544\uC77C\uB79C\uB4DC, \uACE0\uB300 (900\uB144\uAE4C\uC9C0) +sgn=\uC218\uD654 +shn=\uC0E8\uC5B4 +sid=\uC2DC\uB2E4\uBAA8\uC5B4 +sin=\uC2A4\uB9AC\uB791\uCE74\uC5B4 +sio=\uC218\uC871\uC5B4 +sit=\uC2AC\uB85C\uBCA0\uB2C8\uC544 \uD1A8\uB77C\uB974 +sla=\uC2AC\uB77C\uBE0C\uC5B4 +slo=\uC2AC\uB85C\uBC14\uD0A4\uC544\uC5B4 +slv=\uC2AC\uB85C\uBCA0\uB2C8\uC544\uC5B4 +sma=\uB0A8\uBD80 \uC0AC\uBBF8\uC5B4 +sme=\uBD81\uBD80 \uC0AC\uBBF8\uC5B4 +smi=\uC0AC\uBBF8\uC5B4 (\uAE30\uD0C0) +smj=\uB8F0\uB808 \uC0AC\uBBF8\uC5B4 +smn=\uC774\uB098\uB9AC \uC0AC\uBBF8\uC5B4 +smo=\uC0AC\uBAA8\uC544\uC5B4 +sms=\uC2A4\uCF5C\uD2B8 \uC0AC\uBBF8\uC5B4 +sna=\uC1FC\uB098\uC5B4 +snd=\uC2E0\uB514\uC5B4 +snk=\uC18C\uB2CC\uCF00\uC5B4 +sog=\uC18C\uADF8\uB514\uC5D4\uC5B4 +som=\uC18C\uB9D0\uB9AC\uC544\uC5B4 +son=\uC1A1\uAC00\uC774\uC871\uC5B4 +sot=\uC18C\uD1A0\uC5B4, \uB0A8\uBD80 +spa=\uC2A4\uD398\uC778\uC5B4 +srd=\uC0AC\uB974\uB514\uB2C8\uC544\uC5B4 +srn=\uC2A4\uB77C\uB09C \uD1B5\uAC00\uC5B4 +srp=\uC138\uB974\uBE44\uC544\uC5B4 +srr=\uC138\uB808\uB974\uC5B4 +ssa=\uB2C8\uB85C-\uC0AC\uD558\uB78C\uC5B4 (\uAE30\uD0C0) +ssw=\uC2DC\uC2A4\uC640\uD2F0\uC5B4 +suk=\uC218\uCFE0\uB9C8\uC871\uC5B4 +sun=\uC21C\uB2E8\uC5B4 +sus=\uC218\uC218\uC5B4 +sux=\uC218\uBA54\uB974\uC5B4 +swa=\uC2A4\uC640\uD790\uB9AC\uC5B4 +swe=\uC2A4\uC6E8\uB374\uC5B4 +syc=\uC2DC\uB9AC\uC544\uC5B4(\uACE0\uC804) +syr=\uC2DC\uB9AC\uC544\uC5B4 +tah=\uD0C0\uD788\uD2F0\uC548\uC5B4 +tai=\uD0DC\uAD6D\uC5B4(\uAE30\uD0C0) +tam=\uD0C0\uBC00\uC5B4 +tat=\uD0C0\uD0C0\uB974\uC5B4 +tel=\uD154\uB8E8\uAD6C\uC5B4 +tem=\uD300\uB2C8\uC5B4 +ter=\uD14C\uB808\uB178\uC5B4 +tet=\uD14C\uD23C\uC5B4 +tgk=\uD0C0\uC9C0\uD0A4\uC2A4\uD0C4\uC5B4 +tgl=\uD0C0\uAC08\uB85C\uADF8\uC5B4 +tha=\uD0DC\uAD6D\uC5B4 +tib=\uD2F0\uBCA0\uD2B8\uC5B4 +tig=\uD2F0\uADF8\uB808\uC5B4 +tir=\uD2F0\uADF8\uB9AC\uB0D0\uC5B4 +tiv=\uD2F0\uBE44\uC5B4 +tkl=\uD1A0\uCF08\uB77C\uC6B0\uC81C\uB3C4 +tlh=\uD074\uB9C1\uC628\uC5B4 +tli=\uD2C0\uB9C1\uAE43\uC871\uC5B4 +tmh=\uD0C0\uB9C8\uC139\uC5B4 +tog=\uD1B5\uAC00\uC5B4(\uB2C8\uC544\uC0B4\uB79C\uB4DC) +ton=\uD1B5\uAC00\uC5B4(\uD1B5\uAC00 \uC12C) +tpi=\uD1A0\uD06C \uD53C\uC2E0\uC5B4 +tsi=\uD2B8\uC2EC\uC2DC\uC548\uC5B4 +tsn=\uC138\uCE20\uC640\uB098\uC5B4 +tso=\uD1B5\uAC00\uC5B4 +tuk=\uD22C\uB974\uD06C\uBA58\uC5B4 +tum=\uD23C\uBD80\uCE74\uC5B4 +tup=\uD22C\uD53C\uC5B4 +tur=\uD130\uD0A4\uC5B4 +tut=\uC54C\uD0C0\uC774\uC81C\uC5B4 (\uAE30\uD0C0) +tvl=\uD22C\uBC1C\uB8E8\uC5B4 +twi=\uD2B8\uC704\uC5B4 +tyv=\uD22C\uBE44\uB2C8\uC548\uC5B4 +udm=\uC6B0\uB4DC\uB9D0\uD2B8\uC5B4 +uga=\uC6B0\uAC00\uB9AC\uD2B8 \uBB38\uC790 +uig=\uC704\uAD6C\uB974\uC5B4 +ukr=\uC6B0\uD06C\uB77C\uC774\uB098\uC5B4 +umb=\uC724\uBC88\uB450\uC5B4 +und=\uACB0\uC815\uB418\uC9C0\uC54A\uC74C +urd=\uC6B0\uB974\uB450\uC5B4 +uzb=\uC6B0\uC988\uBCA0\uD06C\uC5B4 +vai=\uBC14\uC774 \uBB38\uC790 +ven=\uBCA4\uB2E4\uC5B4 +vie=\uBCA0\uD2B8\uB0A8\uC5B4 +vol=\uBCFC\uB77C\uD4CC\uD06C\uC5B4 +vot=\uBCF4\uD2F1\uC5B4 +wak=\uC640\uCE74\uC0E8\uC5B4 +wal=\uC640\uB77C\uBAA8\uC5B4 +war=\uC640\uB77C\uC774\uC5B4 +was=\uC640\uC1FC\uC5B4 +wel=\uC6E8\uC77C\uC2A4\uC5B4 +wen=\uC18C\uB974\uBE0C\uC5B4 +wln=\uC648\uB8EC\uC5B4 +wol=\uC62C\uB85C\uD504\uC5B4 +xal=\uCE7C\uBBF8\uD06C\uC5B4 +xho=\uBC18\uD22C\uC5B4(\uB0A8\uC544\uD504\uB9AC\uCE74) +yao=\uC57C\uC624\uC871\uC5B4 +yap=\uC58D\uD398\uC138\uC5B4 +yid=\uC774\uB514\uC2DC\uC5B4 +yor=\uC694\uB8E8\uBC14\uC5B4 +ypk=\uC57C\uD53D\uC5B4 +zap=\uC0AC\uD3EC\uD14C\uD06C\uC5B4 +zbl=\uBE14\uB9AC\uC2A4\uAE30\uD638 \uBB38\uC790 +zen=\uC81C\uB098\uAC00\uC5B4 +zha=\uC8FC\uC559\uC5B4 +znd=\uC544\uC794\uB370\uC871\uC5B4 +zul=\uC904\uB8E8\uC5B4 +zun=\uC8FC\uB2C8\uC5B4 +zxx=\uC5B8\uC5B4 \uCF58\uD150\uCE20 \uC5C6\uC74C +zza=\uC790\uC790\uC5B4 + +# script names +# key is ISO 15924 script code + +Arab=\uC544\uB78D \uBB38\uC790 +Armi=\uC81C\uAD6D \uC544\uB78C\uC5B4 +Armn=\uC544\uB974\uBA54\uB2C8\uC544 \uBB38\uC790 +Avst=\uC544\uBCA0\uC2A4\uD0C0\uC5B4 +Bali=\uBC1C\uB9AC \uBB38\uC790 +Bamu=\uBC14\uBB44\uC5B4 +Bass=\uBC14\uC0AC\uC5B4 +Batk=\uBC14\uD0C0\uD06C \uBB38\uC790 +Beng=\uBCB5\uACE8 \uBB38\uC790 +Blis=\uBE14\uB9AC\uC2A4\uAE30\uD638 \uBB38\uC790 +Bopo=\uC8FC\uC74C\uBD80\uD638 +Brah=\uBE0C\uB77C\uBBF8 +Brai=\uBE0C\uB77C\uC720 \uC810\uC790 +Bugi=\uBD80\uAE30 \uBB38\uC790 +Buhd=\uBD80\uD788\uB4DC \uBB38\uC790 +Cakm=\uCC28\uD06C\uB9C8\uC5B4 +Cans=\uD1B5\uD569 \uCE90\uB098\uB2E4 \uD1A0\uCC29\uC5B4 +Cari=\uCE74\uB9AC \uBB38\uC790 +Cham=\uCE78 \uACE0\uC5B4 +Cher=\uCCB4\uB85C\uD0A4 \uBB38\uC790 +Cirt=\uD0A4\uB974\uC4F0 +Copt=\uCF65\uD2B8 \uBB38\uC790 +Cprt=\uD0A4\uD504\uB85C\uC2A4 \uBB38\uC790 +Cyrl=\uD0A4\uB9B4 \uBB38\uC790 +Cyrs=\uACE0\uB300\uAD50\uD68C\uC2AC\uB77C\uBE0C\uC5B4 \uD0A4\uB9B4\uBB38\uC790 +Deva=\uB370\uBC14\uB098\uAC00\uB9AC \uBB38\uC790 +Dsrt=\uB514\uC800\uB81B \uBB38\uC790 +Dupl=\uB4C0\uD50C\uB85C\uC774\uC548 \uC18D\uAE30 +Egyd=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uBBFC\uC911\uBB38\uC790 +Egyh=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uC2E0\uAD00\uBB38\uC790 +Egyp=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uC2E0\uC131\uBB38\uC790 +Elba=\uC5D8\uBC14\uC0B0\uC5B4 +Ethi=\uC5D0\uD2F0\uC624\uD53C\uC544 \uBB38\uC790 +Geok=\uCFE0\uCD94\uB9AC\uC5B4 +Geor=\uADF8\uB8E8\uC9C0\uC57C \uBB38\uC790 +Glag=\uAE00\uB77C\uACE8 \uBB38\uC790 +Goth=\uACE0\uD2B8 \uBB38\uC790 +Gran=\uADF8\uB780\uD0C0\uC5B4 +Grek=\uADF8\uB9AC\uC2A4 \uBB38\uC790 +Gujr=\uAD6C\uC790\uB77C\uD2B8 \uBB38\uC790 +Guru=\uAD6C\uB974\uBB34\uD0A4 \uBB38\uC790 +Hang=\uD55C\uAE00 +Hani=\uD55C\uC790 +Hano=\uD558\uB204\uB204 \uBB38\uC790 +Hans=\uD55C\uC790(\uAC04\uCCB4) +Hant=\uD55C\uC790(\uBC88\uCCB4) +Hebr=\uD788\uBE0C\uB9AC \uBB38\uC790 +Hira=\uD788\uB77C\uAC00\uB098 +Hmng=\uD30C\uD654 \uD750\uBABD +Hrkt=\uAC00\uD0C0\uCE74\uB098/\uD788\uB77C\uAC00\uB098 +Hung=\uACE0\uB300 \uD5DD\uAC00\uB9AC \uBB38\uC790 +Inds=\uC778\uB354\uC2A4 \uBB38\uC790 +Ital=\uACE0\uB300 \uC774\uD0C8\uB9AC\uC544 \uBB38\uC790 +Java=\uC790\uBC14 \uBB38\uC790 +Jpan=\uC77C\uBCF8 \uBB38\uC790 +Kali=\uCE74\uC57C \uB9AC \uBB38\uC790 +Kana=\uAC00\uD0C0\uCE74\uB098 +Khar=\uCE74\uB85C\uC288\uD2F0 \uBB38\uC790 +Khmr=\uD06C\uBA54\uB974 \uBB38\uC790 +Knda=\uCE78\uB098\uB2E4 \uBB38\uC790 +Kore=\uD55C\uAD6D\uC5B4 +Kpel=\uD06C\uD3A0\uB808\uC5B4 +Kthi=\uCE74\uC774\uD2F0\uC5B4 +Lana=\uB780\uB098 \uBB38\uC790 +Laoo=\uB77C\uC624 \uBB38\uC790 +Latf=\uB3C5\uC77C\uC2DD \uB85C\uB9C8\uC790 +Latg=\uC544\uC77C\uB79C\uB4DC\uC2DD \uB85C\uB9C8\uC790 +Latn=\uB85C\uB9C8\uC790 +Lepc=\uB819\uCC28 \uBB38\uC790 +Limb=\uB9BC\uBD80 \uBB38\uC790 +Lina=\uC120\uD615 \uBB38\uC790 A +Linb=\uC120\uD615 \uBB38\uC790 B +Lisu=\uB9AC\uC218\uC5B4 +Loma=\uB85C\uB9C8\uC5B4 +Lyci=\uB9AC\uD0A4\uC544 \uBB38\uC790 +Lydi=\uB9AC\uB514\uC544 \uBB38\uC790 +Mand=\uB9CC\uB2E4\uC774\uC544 \uBB38\uC790 +Mani=\uB9C8\uB2C8\uC5B4 +Maya=\uB9C8\uC57C \uC0C1\uD615 \uBB38\uC790 +Mend=\uBA58\uB370\uC5B4 +Merc=\uBA54\uB85C\uC5D0 \uBB38\uC790 \uD758\uB9BC +Mero=\uBA54\uB85C\uC5D0 \uBB38\uC790 +Mlym=\uB9D0\uB77C\uC584\uB78C \uBB38\uC790 +Mong=\uBABD\uACE8 \uBB38\uC790 +Moon=\uBB38\uC2DD \uC120\uBB38\uC790 +Mtei=\uBA54\uC774\uD14C\uC774\uC5B4 +Mymr=\uBBF8\uC580\uB9C8 \uBB38\uC790 +Narb=\uACE0\uB300 \uBD81\uC544\uB77C\uBE44\uC544\uC5B4 +Nbat=\uB098\uBC14\uD2F0\uC544\uC5B4 +Nkgb=\uB098\uC2DC \uAC8C\uBC14\uC5B4 +Nkoo=\uC751\uCF54\uC5B4 +Ogam=\uC624\uAC80 \uBB38\uC790 +Olck=\uC62C\uCE58\uD0A4\uC5B4 +Orkh=\uC624\uB974\uD63C\uC5B4 +Orya=\uC624\uB9AC\uC57C \uBB38\uC790 +Osma=\uC624\uC2A4\uB9C8\uB2C8\uC544 \uBB38\uC790 +Palm=\uD314\uBBF8\uB77C\uC5B4 +Perm=\uACE0\uB300 \uD398\uB984 \uBB38\uC790 +Phag=\uD30C\uC2A4\uD30C\uC5B4 +Phli=\uCD08\uAE30 \uD314\uB808\uBE44\uC5B4 +Phlp=\uC911\uAE30 \uD314\uB808\uBE44\uC5B4 +Phlv=\uD6C4\uAE30 \uD314\uB808\uBE44\uC5B4 +Phnx=\uD398\uB2C8\uD0A4\uC544\uC5B4 +Plrd=\uBA00\uC624\uC5B4 +Prti=\uD30C\uB974\uD2F0\uC544 \uBB38\uC790 +Rjng=\uB808\uC7A5\uC5B4 +Roro=\uB871\uACE0\uB871\uACE0\uC5B4 +Runr=\uB8EC \uBB38\uC790 +Samr=\uC0AC\uB9C8\uB9AC\uC544\uC5B4 +Sara=\uC0AC\uB77C\uD2F0\uC5B4 +Sarb=\uACE0\uB300 \uB0A8\uC544\uB77C\uBE44\uC544\uC5B4 +Saur=\uC0AC\uC6B0\uB77C\uC288\uD2B8\uB77C\uC5B4 +Sgnw=\uC218\uD654 \uBB38\uC790 +Shaw=\uC0E4\uBE44\uC548 \uBB38\uC790 +Sind=\uC2E0\uB514\uC5B4 +Sinh=\uC2A4\uB9AC\uB791\uCE74\uC5B4 +Sund=\uC21C\uB2E8\uC5B4 +Sylo=\uC2E4\uD5E4\uD2F0 \uB098\uAC00\uB9AC +Syrc=\uC2DC\uB9AC\uC544 \uBB38\uC790 +Syre=\uC5D0\uC2A4\uD2B8\uB791\uAC94\uB85C\uC2DD \uC2DC\uB9AC\uC544 \uBB38\uC790 +Syrj=\uC11C\uBD80 \uC2DC\uB9AC\uC544 \uBB38\uC790 +Syrn=\uB3D9\uBD80 \uC2DC\uB9AC\uC544 \uBB38\uC790 +Tagb=\uD0C0\uADF8\uBC18\uC640 \uBB38\uC790 +Tale=\uD0C0\uC774 \uB808 \uBB38\uC790 +Talu=\uC2E0 \uD0C0\uC774 \uB8E8\uC5D0 +Taml=\uD0C0\uBC00 \uBB38\uC790 +Tavt=\uD0C0\uC774 \uBE44\uC5E3\uC5B4 +Telu=\uD154\uB8E8\uAD6C \uBB38\uC790 +Teng=\uD161\uACFC\uB974 \uBB38\uC790 +Tfng=\uD2F0\uD53C\uB098\uADF8 \uBB38\uC790 +Tglg=\uD0C0\uAC08\uB85C\uADF8 \uBB38\uC790 +Thaa=\uD0C0\uB098 \uBB38\uC790 +Thai=\uD0C0\uC774 \uBB38\uC790 +Tibt=\uD2F0\uBCA0\uD2B8 \uBB38\uC790 +Ugar=\uC6B0\uAC00\uB9AC\uD2B8 \uBB38\uC790 +Vaii=\uBC14\uC774 \uBB38\uC790 +Visp=\uC2DC\uD654 \uBB38\uC790 +Wara=\uC640\uB8FD \uC2DC\uD2F0\uC5B4 +Xpeo=\uACE0\uB300 \uD398\uB974\uC2DC\uC544 \uBB38\uC790 +Xsux=\uC218\uBA54\uB974-\uC544\uCE74\uB4DC \uC124\uD615 \uBB38\uC790 +Yiii=\uC774 \uBB38\uC790 +Zinh=\uC0C1\uC18D \uBB38\uC790 +Zmth=\uC218\uD559 \uD45C\uAE30 +Zsym=\uAE30\uD638 +Zxxx=\uC791\uC131\uB418\uC9C0 \uC54A\uC74C +Zyyy=\uC77C\uBC18 \uBB38\uC790 +Zzzz=\uAE30\uB85D\uB418\uC9C0 \uC54A\uC740 \uBB38\uC790(\uAD6C\uC804) + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=\ub0a8\uc544\ud504\ub9ac\uce74 ZM=\uc7a0\ube44\uc544 ZW=\uc9d0\ubc14\ube0c\uc6e8 + +# territory names +# key is UN M.49 country and area code + +001=\uC138\uACC4 +002=\uC544\uD504\uB9AC\uCE74 +003=\uBD81\uC544\uBA54\uB9AC\uCE74 +005=\uB0A8\uC544\uBA54\uB9AC\uCE74[\uB0A8\uBBF8] +009=\uC624\uC138\uC544\uB2C8\uC544, \uB300\uC591\uC8FC +011=\uC11C\uC544\uD504\uB9AC\uCE74 +013=\uC911\uC559 \uC544\uBA54\uB9AC\uCE74 +014=\uB3D9\uBD80 \uC544\uD504\uB9AC\uCE74 +015=\uBD81\uBD80 \uC544\uD504\uB9AC\uCE74 +017=\uC911\uBD80 \uC544\uD504\uB9AC\uCE74 +018=\uB0A8\uBD80 \uC544\uD504\uB9AC\uCE74 +019=\uC544\uBA54\uB9AC\uCE74 \uB300\uB959 +021=\uBD81\uBD80 \uC544\uBA54\uB9AC\uCE74 +029=\uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4 +030=\uB3D9\uC544\uC2DC\uC544 +034=\uB0A8\uC544\uC2DC\uC544 +035=\uB3D9\uB0A8 \uC544\uC2DC\uC544 +039=\uB0A8\uC720\uB7FD +053=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544\uC640 \uB274\uC9C8\uB79C\uB4DC +054=\uBA5C\uB77C\uB124\uC2DC\uC544 +057=\uB9C8\uC774\uD06C\uB85C\uB124\uC2DC\uC544 \uC9C0\uC5ED +061=\uD3F4\uB9AC\uB124\uC2DC\uC544 +142=\uC544\uC2DC\uC544 +143=\uC911\uC559 \uC544\uC2DC\uC544 +145=\uC11C\uC544\uC2DC\uC544 +150=\uC720\uB7FD +151=\uB3D9\uC720\uB7FD +154=\uBD81\uC720\uB7FD +155=\uC11C\uC720\uB7FD +419=\uB77C\uD2F4 \uC544\uBA54\uB9AC\uCE74 \uBC0F \uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=kinesiska zu=zulu +# key is ISO 639.2 language code +aar=Afar +abk=Abchasiska +ace=Acehnesiska +ach=Acoli +ada=Adangme +ady=Adygeiska +afa=Afroasiatiskt spr\u00E5k +afh=Afrihili +afr=Afrikaans +ain=Ainu +aka=Akan +akk=Akkadiska +alb=Albanska +ale=Aleutiska +alg=Algonkinska +alt=Sydaltaiska +amh=Amhariska +ang=Fornengelska (ca.450-1100) +anp=Angika +apa=Apache +ara=Arabiska +arc=Officiell arameiska (700-300 f.Kr.) +arg=Aragonsk spanska +arm=Armeniska +arn=Mapudungun +arp=Arapaho +art=Artificiellt +arw=Arawakiska +asm=Assamesiska +ast=Asturiska +ath=Athabaskiska +aus=Australiska +ava=Avariskt spr\u00E5k +ave=Avestiska +awa=Awadhi +aym=Aymara +aze=Azerbajdzjanska +bad=Banda +bai=Bamileke +bak=Basjkiriska +bal=Baluchi +bam=Bambara +ban=Balinesiska +baq=Baskiska +bas=Basa +bat=Baltiskt spr\u00E5k +bej=Beyja +bel=Vitryska +bem=Bemba +ben=Bengali +ber=Berberspr\u00E5k +bho=Bhojpuri +bih=Bihari +bik=Bikol +bin=(Edo) Bini +bis=Bislama +bla=Svartfotindianernas spr\u00E5k (Siksika) +bnt=Bantuspr\u00E5k +bos=Bosniska +bra=Braj +bre=Bretonska +btk=Batak +bua=Burjatiska +bug=Buginesiska +bul=Bulgariska +bur=Burmesiska +byn=Blin +cad=Caddo +cai=Centralamerikanskt indianspr\u00E5k +car=Galibi Carib +cat=Katalanska +cau=Kaukasiskt spr\u00E5k +ceb=Cebuano +cel=Keltiskt spr\u00E5k +cha=Chamorro +chb=Chibcha +che=Tjetjenska +chg=Chagatai +chi=Kinesiska +chk=Truk +chm=Mari (Tjeremissiska) +chn=Chinook +cho=Choctaw +chp=Chopi +chr=Cherokesiska +chu=Kyrkoslaviska +chv=Tjuvasjiska +chy=Cheyenne +cmc=Chamic +cop=Koptiska +cor=Korniska +cos=Korsikanska +cpe=Kreol-/Pidginspr\u00E5k, engelskbaserade +cpf=Kreol-/Pidginspr\u00E5k, franskbaserade +cpp=Kreol-/Pidginspr\u00E5k, portugisiskbaserade +cre=Cree +crh=Krimtatariska +crp=Kreol-/Pidginspr\u00E5k +csb=Kashubiska +cus=Kusjitiskt spr\u00E5k +cze=Tjeckiska +dak=Dakota +dan=Danska +dar=Darginska +day=Land Dayak +del=Delaware +den=Slave (Athapaskiska) +dgr=Dogrib +din=Dinka +div=Divehi +doi=Dogri +dra=Dravidiskt spr\u00E5k +dsb=L\u00E5gsorbiska +dua=Duala +dum=Medelnederl\u00E4ndska (ca.1050-1350) +dut=Nederl\u00E4ndska +dyu=Dyula +dzo=Bhutanesiska (Dzongkha) +efi=Efik +egy=Fornegyptiska +eka=Ekajuk +elx=Elamitiska +eng=Engelska +enm=Medelengelska (1100-1500) +epo=Esperanto +est=Estniska +ewe=Ewe +ewo=Ewondo +fan=Fang +fao=F\u00E4r\u00F6iska +fat=Fanti +fij=Fidjianska +fil=Filipino +fin=Finska +fiu=Finsk-ugriskt spr\u00E5k +fon=Fon +fre=Franska +frm=Medelfranska (ca.1400-1600) +fro=Fornfranska (842-ca.1400) +frr=Nordfrisiska +frs=\u00D6stfrisiska +fry=V\u00E4stfrisiska +ful=Fulani +fur=Friuliska +gaa=Ga +gay=Gayo +gba=Gbaya +gem=Germanska +geo=Georgiska +ger=Tyska +gez=Geez +gil=Gilbertesiska +gla=Gaeliska +gle=Iriska +glg=Galiciska +glv=Manx +gmh=Medelh\u00F6gtyska (ca.1050-1500) +goh=Fornh\u00F6gtyska (ca.750-1050) +gon=Gondi +gor=Gorontalo +got=Gotiska +grb=Grebo +grc=Grekiska, klassisk (-1453) +gre=Nygrekiska (1453-) +grn=Guarani +gsw=Schweizertyska +guj=Gujarati +gwi=Gwichin +hai=Haida +hat=Haitiska +hau=Haussa +haw=Hawaiian +heb=Hebreiska +her=Herero +hil=Hiligaynon +him=Pahari (Himachali) +hin=Hindi +hit=Hettitiskt spr\u00E5k +hmn=Hmongspr\u00E5k +hmo=Hirimotu +hrv=Kroatiska +hsb=H\u00F6gsorbiska +hun=Ungerska +hup=Hupa +iba=Iban +ibo=Ibo (Igbo) +ice=Isl\u00E4ndska +ido=Ido +iii=Sichuan Yi +ijo=Ijo +iku=Inuktitut +ile=Interlingue +ilo=Iloko +ina=Interlingua (International Auxiliary Language Association) +inc=Indo-ariskt spr\u00E5k +ind=Indonesiska +ine=Indoeuropeiskt spr\u00E5k +inh=Ingusj +ipk=Inupiaq +ira=Iranska +iro=Irokesiska spr\u00E5k +ita=Italienska +jav=Javanesiska +jbo=Lojban +jpn=Japanska +jpr=Judepersiska +jrb=Judearabiska +kaa=Karakalpakiska +kab=Kabyliska +kac=Kachin +kal=Kalaallisut +kam=Kamba +kan=Kannada +kar=Karen +kas=Kashmiri +kau=Kanuri +kaw=Fornjavanska (Kawi) +kaz=Kazakiska +kbd=Kabardinska (\u00D6sttjerkessiska) +kha=Khasi +khi=Khoisanspr\u00E5k +khm=Central-Khmer +kho=Sakiska (Khotanesiska) +kik=Kikuyu +kin=Rwanda +kir=Kirgisiska +kmb=Mbundu (Kimbundu) +kok=Konkani +kom=Komi +kon=Kikongo +kor=Koreanska +kos=Kusaie +kpe=Kpelle +krc=Karachay-Balkar +krl=Karelska +kro=Kru-spr\u00E5k +kru=Kurukh +kua=Ovambo +kum=Kumyk +kur=Kurdiska +kut=Kutenai +lad=Ladino +lah=Lahnda +lam=Lamba +lao=Laotiska +lat=Latin +lav=Lettiska +lez=Lezginska +lim=Limburgisch +lin=Lingala +lit=Litauiska +lol=Lolo (Mongo) +loz=Lozi +ltz=Luxemburgiska +lua=Luba-Lulua +lub=Luba-Katanga +lug=Luganda +lui=Luiseno +lun=Lunda +luo=Luo (Kenya och Tanzania) +lus=Lushai +mac=Makedonska +mad=Madurese +mag=Magahi +mah=Marshallesiska +mai=Maithili +mak=Makasar +mal=Malayalam +man=Mande +mao=Maori +map=Austronesiskt spr\u00E5k +mar=Marathi +mas=Massajiska +may=Malajiska +mdf=Moksja +mdr=Mandar +men=Mende +mga=Medeliriska (900-1200) +mic=Mi'kmaq +min=Minangkabau +mis=Okodat +mkh=Mon-khmerspr\u00E5k +mlg=Malagassiska +mlt=Maltesiska +mnc=Manchu +mni=Manipuri +mno=Manobo +moh=Mohawk +mon=Mongoliska +mos=Mossi +mul=Flera +mun=Munda +mus=Muskogee +mwl=Mirandesiska +mwr=Marwari +myn=Maya-spr\u00E5k +myv=Erzya +nah=Nahuatl +nai=Nordamerikanskt indianspr\u00E5k +nap=Neapolitansk italienska +nau=Nauru +nav=Navajo +nbl=Ndebele (syd) +nde=Ndebele (nord) +ndo=Ndonga +nds=L\u00E5gtyska +nep=Nepali +new=Newari +nia=Nias +nic=Niger-/Kongospr\u00E5k +niu=Niuiska +nno=Norska (Nynorska) +nob=Bokm\u00E5l, norska +nog=Nogaiska +non=Fornisl\u00E4ndska +nor=Norska +nqo=N'Ko +nso=Pedi +nub=Nubiska +nwc=Klassisk newari +nya=Chichewa +nym=Nyamwezi +nyn=Nyankole +nyo=Nyoro +nzi=Nzima +oci=Occitanska (efter 1500) +oji=Odjibwa (Chippewa) +ori=Oriya +orm=Oromo +osa=Osage +oss=Ossetiska +ota=Ottomanska (1500-1928) +oto=Otomi +paa=Papuanskt spr\u00E5k +pag=Pangasinan +pal=Pahlavi (Medelpersiska) +pam=Pampanga +pan=Panjabi +pap=Papiamento +pau=Palauan +peo=Fornpersiska (ca.600-400 fK) +per=Persiska +phi=Filippinska +phn=Feniciska +pli=Pali +pol=Polska +pon=Pohnpeiska +por=Portugisiska +pra=Prakrit +pro=Fornprovensalska (-1500) +pus=Pashto +que=Quechua +raj=Rajasthani +rap=Rapanui +rar=Rarotongan +roa=Romanska +roh=R\u00E4toromanska +rom=Romani +rum=Rum\u00E4nska +run=Rundi +rup=Arumanska +rus=Ryska +sad=Sandawe +sag=Sango +sah=Jakutiska +sai=Sydamerikanskt indianspr\u00E5k +sal=Saliska +sam=Samaritanska +san=Sanskrit +sas=Sasak +sat=Santali +scn=Sicilianska +sco=Skotsk gaeliska +sel=Selkup +sem=Semitiskt spr\u00E5k +sga=Forniriska (-900) +sgn=Teckenspr\u00E5k +shn=Shan +sid=Sidami +sin=Singalesiska +sio=Sioux-spr\u00E5k +sit=Sino-tibetanskt spr\u00E5k +sla=Slaviskt spr\u00E5k +slo=Slovakiska +slv=Slovenska +sma=Sydsamiska +sme=Nordsamiska +smi=Samiska +smj=Lulesamiska +smn=Enaresamiska +smo=Samoanska +sms=Skoltsamiska +sna=Shona +snd=Sindhi +snk=Soninke +sog=Sogdiska +som=Somaliska +son=Songhai +sot=Sotho, syd- +spa=Spanska +srd=Sardiska +srn=Sranan tongo +srp=Serbiska +srr=Serer +ssa=Nilo-sahariskt spr\u00E5k +ssw=Swazi +suk=Sukuma +sun=Sundanesiska +sus=Susu +sux=Sumeriska +swa=Swahili +swe=Svenska +syc=Klassisk syriska +syr=Syriska +tah=Tahitiska +tai=Thaispr\u00E5k +tam=Tamil +tat=Tatariska +tel=Telugo +tem=Temne +ter=Tereno +tet=Tetum +tgk=Tadzjikiska +tgl=Tagalog +tha=Thail\u00E4ndska +tib=Tibetanska +tig=Tigr\u00E9 +tir=Tigrinja +tiv=Tivi +tkl=Tokelau\u00F6arna +tlh=Klingon +tli=Tlingit +tmh=Tamashek +tog=Tonga (Nyasa) +ton=Tonga (Tonga\u00F6arna) +tpi=Tok Pisin +tsi=Tsimshian +tsn=Tswana +tso=Tsonga +tuk=Turkmeniska +tum=Tumbuka +tup=Tupi +tur=Turkiska +tut=Altaiskt spr\u00E5k +tvl=Tuvalu +twi=Twi +tyv=Tuvinska +udm=Udmurtiska (Votjakiska) +uga=Ugaritiska +uig=Uiguriska +ukr=Ukrainska +umb=Umbundu +und=Obest\u00E4md +urd=Urdu +uzb=Uzbekiska +vai=Vai +ven=Venda +vie=Vietnamesiska +vol=Volap\u00FCk +vot=Votiska +wak=Wakusjiska +wal=Wolaitta +war=Waray +was=Washo +wel=Kymriska +wen=Sorbiska +wln=Vallonska +wol=Wolof +xal=Kalmuckiska +xho=Xhosa +yao=Yao +yap=Yap +yid=Jiddisch +yor=Yoruba +ypk=Yupik +zap=Zapotek +zbl=Blissymboler +zen=Zenaga +zha=Zhuang +znd=Zande +zul=Zulu +zun=Zuni +zxx=Icke-spr\u00E5kligt medium +zza=Zaza + +# script names +# key is ISO 15924 script code + +Arab=Arabiska +Armi=Riksarameiska +Armn=Armeniska +Avst=Avestiska +Bali=Balinesiska +Bamu=Bamum +Bass=Bassa vah +Batk=Batak +Beng=Bengali +Blis=Blissymboler +Bopo=Bopomofo +Brah=Brahmi +Brai=Braille-skrift +Bugi=Buginesiska +Buhd=Buhid +Cakm=Chakma +Cans=Unified Canadian Aboriginal Syllabics +Cari=Kariska +Cham=Cham +Cher=Cherokesiska +Cirt=Cirth +Copt=Koptiska +Cprt=Cypriotiska +Cyrl=Kyrilliska +Cyrs=Fornkyrkoslaviska +Deva=Devanagari +Dsrt=Deseret +Dupl=Duployan-stenografi +Egyd=Egyptisk demotisk +Egyh=Egyptisk hieratisk +Egyp=Egyptiska hieroglyfer +Elba=Elbasiska +Ethi=Etiopiska +Geok=Khutsuri +Geor=Georgiska +Glag=Glagolitiska +Goth=Gotiska +Gran=Grantha +Grek=Grekiska +Gujr=Gujarati +Guru=Gurmukhi +Hang=Hangul +Hani=Han +Hano=Hanunoo +Hans=F\u00F6renklad han +Hant=Traditionell han +Hebr=Hebreiska +Hira=Hiragana +Hmng=Pahawh hmong +Hrkt=Katakana eller hiragana +Hung=Ungerska runor +Inds=Indusskrift +Ital=Etruskiska +Java=Javanesiska +Jpan=Japanska +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Kambodjanska (Khmer) +Knda=Kannada +Kore=Koreanska +Kpel=Kpelle +Kthi=Kaithi +Lana=Tai tham +Laoo=Laotiska +Latf=Frakturlatin +Latg=Gaelisk latin +Latn=Latin +Lepc=Lepcha +Limb=Limbu +Lina=Linear A +Linb=Linear B +Lisu=Lisu +Loma=Loma +Lyci=Lykiska +Lydi=Lydiska +Mand=Mandeiska +Mani=Manikeiska +Maya=Mayaskrift +Mend=Mende +Merc=Meroitisk skrift +Mero=Meroitisk +Mlym=Malayalam +Mong=Mongoliska +Moon=M\u00E5nspr\u00E5k +Mtei=Meitei mayek +Mymr=Myanmar +Narb=Nordlig fornarabiska +Nbat=Nabataeiska +Nkgb=Nakhi geba +Nkoo=N'Ko +Ogam=Ogham +Olck=Ol chiki +Orkh=Orkhon +Orya=Oriya +Osma=Osmanya +Palm=Palmyreniska +Perm=Fornpermiska +Phag=Phags-pa +Phli=Pahlavi (Medelpersiska) +Phlp=Psalter pahlavi +Phlv=Bok-pahlavi +Phnx=Feniciska +Plrd=Miao +Prti=Partiska +Rjng=Rejang +Roro=Rongorongo +Runr=Runor +Samr=Samaritanska +Sara=Sarati +Sarb=Sydlig fornarabiska +Saur=Saurashtra +Sgnw=Teckenskrift +Shaw=Shavian +Sind=Sindhi +Sinh=Singalesiska +Sund=Sundanesiska +Sylo=Syloti nagri +Syrc=Syriska +Syre=Estrangelo-syriska +Syrj=V\u00E4stsyriska +Syrn=\u00D6stsyriska +Tagb=Tagbanwa +Tale=Tai le +Talu=Ny tai l\u00FC +Taml=Tamil +Tavt=Tai viet +Telu=Telugo +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Thaana +Thai=Thail\u00E4ndska +Tibt=Tibetanska +Ugar=Ugaritiska +Vaii=Vai +Visp=Visible speech +Wara=Varang kshiti +Xpeo=Fornpersiska +Xsux=Sumerisk-akkadisk kilskrift +Yiii=Yi +Zinh=\u00C4rvd skrift +Zmth=Matematisk notation +Zsym=Symboler +Zxxx=Oskrivna +Zyyy=Inte fastst\u00E4lld skrift +Zzzz=Okodad skrift + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Sydafrika ZM=Zambia ZW=Zimbabwe + +# territory names +# key is UN M.49 country and area code + +001=V\u00E4rlden +002=Afrika +003=Nordamerika +005=Sydamerika +009=Oceanien +011=V\u00E4stafrika +013=Centralamerika +014=\u00D6stafrika +015=Nordafrika +017=Mellanafrika +018=S\u00F6dra Afrika +019=Nord-/Sydamerika +021=Norra Amerika +029=Karibiska \u00F6v\u00E4rlden +030=\u00D6stra Asien +034=S\u00F6dra Asien +035=Syd\u00F6stra Asien +039=S\u00F6dra Europa +053=Australien och Nya Zeeland +054=Melanesien +057=Mikronesiska regionen +061=Polynesien +142=Asien +143=Centralasien +145=V\u00E4stra Asien +150=Europa +151=\u00D6stra Europa +154=Norra Europa +155=V\u00E4stra Europa +419=Latinamerika och Karibien diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,11 +227,642 @@ zh=\u4e2d\u6587 zu=\u7956\u9c81\u6587 +# key is ISO 639.2 language code +aar=\u963F\u6CD5\u5C14\u6587 +abk=\u963F\u5E03\u54C8\u897F\u4E9A\u6587 +ace=\u4E9A\u9F50\u6587 +ach=\u963F\u4E54\u5229\u6587 +ada=\u963F\u5F53\u6885\u6587 +ady=\u963F\u8FEA\u4F55\u6587 +afa=\u4E9A\u975E\u8BF8\u8BED\u8A00 +afh=\u963F\u5F17\u91CC\u5E0C\u5229\u6587 +afr=\u5357\u975E\u8377\u5170\u6587 +ain=\u963F\u4F0A\u52AA\u6587 +aka=\u5E93\u963F\u6587 +akk=\u963F\u5361\u5FB7\u6587 +alb=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u6587 +ale=\u963F\u7559\u7533\u6587 +alg=\u5176\u4ED6\u963F\u5C14\u8D21\u8BED\u7CFB +alt=\u5357\u963F\u5C14\u6CF0\u6587 +amh=\u963F\u59C6\u54C8\u62C9\u6587 +ang=\u53E4\u82F1\u6587 +anp=\u6602\u52A0\u8BED +apa=\u963F\u5E15\u5207\u6587 +ara=\u963F\u62C9\u4F2F\u6587 +arc=\u963F\u62C9\u7C73\u6587 +arg=\u963F\u62C9\u8D21\u6587 +arm=\u4E9A\u7F8E\u5C3C\u4E9A\u6587 +arn=\u9A6C\u666E\u5207\u6587 +arp=\u963F\u62C9\u5E15\u970D\u6587 +art=\u5176\u4ED6\u4EBA\u5DE5\u8BED\u7CFB +arw=\u963F\u62C9\u74E6\u514B\u6587 +asm=\u963F\u8428\u59C6\u6587 +ast=\u963F\u65AF\u56FE\u91CC\u4E9A\u601D\u7279\u6587 +ath=\u963F\u8428\u5E15\u65AF\u574E\u8BED\u7CFB +aus=\u6FB3\u5927\u5229\u4E9A\u8BED\u7CFB +ava=\u963F\u74E6\u5C14\u6587 +ave=\u963F\u7EF4\u65AF\u9640\u6587 +awa=\u963F\u74E6\u4E54\u6587 +aym=\u827E\u9A6C\u62C9\u6587 +aze=\u963F\u585E\u62DC\u7586\u6587 +bad=\u73ED\u8FBE\u6587 +bai=\u5DF4\u7C73\u7D2F\u514B\u8BED\u7CFB +bak=\u5DF4\u4EC0\u5BA2\u5C14\u6587 +bal=\u4FFE\u8DEF\u652F\u6587 +bam=\u73ED\u5DF4\u62C9\u6587 +ban=\u5DF4\u5398\u8BED +baq=\u5DF4\u65AF\u514B\u6587 +bas=\u5DF4\u8428\u6587 +bat=\u5176\u4ED6\u6CE2\u7F57\u7684\u8BED\u7CFB +bej=\u522B\u672D\u6587 +bel=\u767D\u4FC4\u7F57\u65AF\u6587 +bem=\u522B\u59C6\u5DF4\u6587 +ben=\u5B5F\u52A0\u62C9\u6587 +ber=\u67CF\u67CF\u5C14\u6587 +bho=\u535A\u6770\u666E\u5C14\u6587 +bih=\u6BD4\u54C8\u5C14\u6587 +bik=\u6BD5\u5E93\u5C14\u6587 +bin=\u6BD4\u5C3C\u6587 +bis=\u6BD4\u65AF\u62C9\u9A6C\u6587 +bla=\u53F8\u514B\u53F8\u5361\u6587 +bnt=\u73ED\u56FE\u6587 +bos=\u6CE2\u65AF\u5C3C\u4E9A\u6587 +bra=\u5E03\u62C9\u6770\u6587 +bre=\u5E03\u91CC\u591A\u5C3C\u6587 +btk=\u5DF4\u5854\u514B\u8BED +bua=\u5E03\u91CC\u4E9A\u7279\u6587 +bug=\u5E03\u5409\u8BED +bul=\u4FDD\u52A0\u5229\u4E9A\u6587 +bur=\u7F05\u7538\u6587 +byn=\u5E03\u6797\u6587 +cad=\u5361\u591A\u6587 +cai=\u5176\u4ED6\u4E2D\u7F8E\u5370\u7B2C\u5B89\u8BED\u7CFB +car=\u5DF4\u52D2\u6BD4\u6587 +cat=\u52A0\u6CF0\u7F57\u5C3C\u4E9A\u6587 +cau=\u5176\u4ED6\u9AD8\u52A0\u7D22\u8BED\u7CFB +ceb=\u5BBF\u52A1\u6587 +cel=\u5176\u4ED6\u51EF\u5C14\u7279\u8BED\u7CFB +cha=\u67E5\u83AB\u7F57\u6587 +chb=\u5951\u5E03\u5361\u6587 +che=\u8F66\u81E3\u6587 +chg=\u67E5\u52A0\u6587 +chi=\u4E2D\u6587 +chk=\u695A\u543E\u514B\u6587 +chm=\u9A6C\u91CC\u6587 +chn=\u5951\u52AA\u514B\u6587 +cho=\u4E54\u514B\u6258\u6587 +chp=\u4F69\u74E6\u626C\u6587 +chr=\u5F7B\u7F57\u57FA\u6587 +chu=\u6559\u4F1A\u65AF\u62C9\u592B\u6587 +chv=\u695A\u74E6\u4EC0\u6587 +chy=\u590F\u5EF6\u6587 +cmc=\u67E5\u7C73\u514B\u6587 +cop=\u79D1\u666E\u7279\u6587 +cor=\u5EB7\u6C83\u5C14\u6587 +cos=\u79D1\u897F\u5609\u6587 +cpe=\u5176\u4ED6\u4EE5\u82F1\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +cpf=\u5176\u4ED6\u4EE5\u6CD5\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +cpp=\u5176\u4ED6\u4EE5\u8461\u8404\u7259\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +cre=\u514B\u91CC\u6587 +crh=\u514B\u91CC\u7C73\u4E9A\u5854\u5854\u6587 +crp=\u5176\u4ED6\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +csb=\u5361\u8212\u6587 +cus=\u5176\u4ED6\u5E93\u65BD\u7279\u8BED\u7CFB +cze=\u6377\u514B\u6587 +dak=\u8FBE\u79D1\u4ED6\u6587 +dan=\u4E39\u9EA6\u6587 +dar=\u8FBE\u5C14\u683C\u74E6\u6587 +day=\u8FBE\u96C5\u514B\u6587 +del=\u7279\u62C9\u534E\u6587 +den=\u53F8\u96F7\u592B\u6587 (\u963F\u8428\u5E15\u65AF\u574E\u8BF8\u8BED\u8A00) +dgr=\u591A\u683C\u91CC\u5E03\u6587 +din=\u4E01\u5361\u6587 +div=\u8FEA\u7EF4\u5E0C\u6587 +doi=\u591A\u683C\u62C9\u6587 +dra=\u5176\u4ED6\u5FB7\u62C9\u7EF4\u8BED\u7CFB +dsb=\u4E0B\u7D22\u5E03\u6587 +dua=\u90FD\u963F\u62C9\u6587 +dum=\u4E2D\u53E4\u8377\u5170\u6587 +dut=\u8377\u5170\u6587 +dyu=\u8FEA\u5C24\u62C9\u6587 +dzo=\u4E0D\u4E39\u6587 +efi=\u57C3\u83F2\u514B\u6587 +egy=\u53E4\u57C3\u53CA\u6587 +eka=\u57C3\u514B\u4E18\u514B\u6587 +elx=\u827E\u62C9\u7C73\u7279\u6587 +eng=\u82F1\u6587 +enm=\u4E2D\u53E4\u82F1\u6587 +epo=\u4E16\u754C\u6587 +est=\u7231\u6C99\u5C3C\u4E9A\u6587 +ewe=\u57C3\u7EF4\u6587 +ewo=\u65FA\u675C\u6587 +fan=\u82B3\u683C\u6587 +fao=\u6CD5\u7F57\u6587 +fat=\u82B3\u8482\u6587 +fij=\u6590\u6D4E\u6587 +fil=\u83F2\u5F8B\u5BBE\u6587 +fin=\u82AC\u5170\u6587 +fiu=\u5176\u4ED6\u82AC\u5170\u4E4C\u6208\u5C14\u8BED\u7CFB +fon=\u4E30\u6587 +fre=\u6CD5\u6587 +frm=\u4E2D\u53E4\u6CD5\u6587 +fro=\u53E4\u6CD5\u6587 +frr=\u5317\u5F17\u91CC\u897F\u4E9A\u8BED +frs=\u4E1C\u5F17\u91CC\u897F\u4E9A\u6587 +fry=\u897F\u5F17\u91CC\u65AF\u5170\u8BED +ful=\u5BCC\u62C9\u6587 +fur=\u5F17\u7559\u5229\u6587 +gaa=\u52A0\u6587 +gay=\u8FE6\u7EA6\u6587 +gba=\u845B\u5DF4\u4E9A\u6587 +gem=\u5176\u4ED6\u65E5\u5C14\u66FC\u8BED\u7CFB +geo=\u683C\u9C81\u5409\u4E9A\u6587 +ger=\u5FB7\u6587 +gez=\u5409\u5179\u6587 +gil=\u5409\u5C14\u4F2F\u7279\u65AF\u6587 +gla=\u76D6\u5C14\u8BED +gle=\u7231\u5C14\u5170\u6587 +glg=\u52A0\u5229\u897F\u4E9A\u6587 +glv=\u9A6C\u6069\u6587 +gmh=\u4E2D\u53E4\u9AD8\u5730\u5FB7\u6587 +goh=\u53E4\u9AD8\u5730\u5FB7\u6587 +gon=\u5C97\u5FB7\u6587 +gor=\u79D1\u6D1B\u6D85\u8FBE\u7F57\u6587 +got=\u54E5\u7279\u6587 +grb=\u683C\u5217\u535A\u6587 +grc=\u53E4\u5E0C\u814A\u6587 +gre=\u5E0C\u814A\u8BED, \u73B0\u4EE3 (1453-) +grn=\u74DC\u62C9\u5C3C\u6587 +gsw=\u745E\u58EB\u5FB7\u6587 +guj=\u53E4\u52A0\u62C9\u63D0\u6587 +gwi=\u5409\u7EF4\u514B\u7434\u6587 +hai=\u6D77\u8FBE\u6587 +hat=\u6D77\u5730\u6587 +hau=\u8C6A\u6492\u6587 +haw=\u590F\u5A01\u5937\u6587 +heb=\u5E0C\u4F2F\u6765\u6587 +her=\u8D6B\u96F7\u7F57\u6587 +hil=\u5E0C\u5229\u76D6\u519C\u6587 +him=\u8D6B\u9A6C\u67E5\u5229\u6587 +hin=\u5370\u5730\u6587 +hit=\u8D6B\u68AF\u6587 +hmn=\u8D6B\u8499\u6587 +hmo=\u65B0\u91CC\u6728\u6258\u6587 +hrv=\u514B\u7F57\u5730\u4E9A\u6587 +hsb=\u4E0A\u7D22\u5E03\u6587 +hun=\u5308\u7259\u5229\u6587 +hup=\u80E1\u5E15\u6587 +iba=\u4F0A\u73ED\u6587 +ibo=\u4F0A\u535A\u6587 +ice=\u51B0\u5C9B\u6587 +ido=\u4F0A\u591A\u6587 +iii=\u56DB\u5DDD\u5F5D\u6587 +ijo=\u4F0A\u4E54\u6587 +iku=\u7231\u65AF\u57FA\u6469\u6587 +ile=\u62C9\u4E01\u56FD\u9645\u6587 +ilo=\u4F0A\u6D1B\u5E72\u8BFA\u6587 +ina=\u62C9\u4E01\u56FD\u9645\u8BED (\u56FD\u9645\u8F85\u52A9\u8BED\u8054\u76DF) +inc=\u5176\u4ED6\u5370\u5EA6\u8BED\u7CFB +ind=\u5370\u5EA6\u5C3C\u897F\u4E9A\u6587 +ine=\u5176\u4ED6\u5370\u6B27\u8BED\u7CFB +inh=\u5370\u53E4\u4EC0\u6587 +ipk=\u4F9D\u5974\u76AE\u7EF4\u514B\u6587 +ira=\u4F0A\u6717\u6587 +iro=\u4F0A\u6D1B\u9B41\u8BED\u7CFB +ita=\u610F\u5927\u5229\u6587 +jav=\u722A\u54C7\u6587 +jbo=\u903B\u8F91\u6587 +jpn=\u65E5\u6587 +jpr=\u72B9\u592A\u6CE2\u65AF\u6587 +jrb=\u72B9\u592A\u963F\u62C9\u4F2F\u6587 +kaa=\u5361\u62C9\u5361\u5C14\u5E15\u514B\u6587 +kab=\u5361\u6BD4\u5C14\u6587 +kac=\u5361\u7434\u6587 +kal=\u683C\u9675\u5170\u6587 +kam=\u5361\u59C6\u5DF4\u6587 +kan=\u5361\u7EB3\u5854\u514B\u8BED +kar=\u5580\u4F26\u6587 +kas=\u514B\u4EC0\u7C73\u5C14\u6587 +kau=\u5361\u52AA\u91CC\u6587 +kaw=\u5361\u5A01\u6587 +kaz=\u54C8\u8428\u514B\u6587 +kbd=\u5361\u5DF4\u5C14\u8FBE\u6587 +kha=\u5361\u897F\u6587 +khi=\u5176\u4ED6\u79D1\u4F0A\u6851\u8BED\u7CFB +khm=\u4E2D\u9AD8\u68C9\u8BED +kho=\u548C\u7530\u6587 +kik=\u5409\u5E93\u5C24\u6587 +kin=\u5362\u65FA\u8FBE\u6587 +kir=\u5409\u5C14\u5409\u65AF\u6587 +kmb=\u91D1\u90A6\u675C\u6587 +kok=\u521A\u5361\u5C3C\u6587 +kom=\u79D1\u7C73\u6587 +kon=\u521A\u679C\u6587 +kor=\u671D\u9C9C\u6587 +kos=\u79D1\u65AF\u62C9\u4F0A\u6587 +kpe=\u514B\u4F69\u52D2\u8BED +krc=\u5361\u62C9\u6070\u4F0A\u5DF4\u5C14\u5361\u5C14\u6587 +krl=\u5361\u7D2F\u5229\u963F\u6587 +kro=\u514B\u9C81\u6587 +kru=\u5E93\u9C81\u514B\u6587 +kua=\u5BBD\u4E9A\u739B\u8BED +kum=\u5E93\u6885\u514B\u6587 +kur=\u5E93\u5C14\u5FB7\u6587 +kut=\u5E93\u7279\u5185\u6587 +lad=\u62C9\u8FEA\u8BFA\u6587 +lah=\u62C9\u4EA8\u8FBE\u6587 +lam=\u5170\u5DF4\u6587 +lao=\u8001\u631D\u6587 +lat=\u62C9\u4E01\u6587 +lav=\u62C9\u6258\u7EF4\u4E9A\u6587 (\u5217\u6258) +lez=\u83B1\u5179\u4F9D\u6602\u6587 +lim=\u6797\u5821\u6587 +lin=\u6797\u52A0\u62C9\u6587 +lit=\u7ACB\u9676\u5B9B\u6587 +lol=\u8292\u6208\u6587 +loz=\u6D1B\u5179\u6587 +ltz=\u5362\u68EE\u5821\u6587 +lua=\u9C81\u5DF4\u9C81\u74E6\u6587 +lub=\u5362\u5DF4-\u52A0\u4E39\u52A0\u6587 +lug=\u5E72\u8FBE\u6587 +lui=\u8DEF\u6613\u585E\u8BFA\u6587 +lun=\u9686\u8FBE\u6587 +luo=\u5362\u5965\u6587 +lus=\u5362\u6652\u6587 +mac=\u9A6C\u5176\u987F\u6587 +mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6 +mag=\u9A6C\u52A0\u4F0A\u6587 +mah=\u9A6C\u7ECD\u5C14\u6587 +mai=\u8FC8\u8482\u5229\u6587 +mak=\u671B\u52A0\u9521\u6587 +mal=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587 +man=\u66FC\u4E01\u54E5\u6587 +mao=\u6BDB\u5229\u6587 +map=\u6FB3\u65AF\u7279\u7F57\u5C3C\u897F\u4E9A\u8BED\u7CFB +mar=\u9A6C\u62C9\u5730\u6587 +mas=\u8428\u4F0A\u8BED +may=\u9A6C\u6765\u6587 +mdf=\u83AB\u514B\u6C99\u6587 +mdr=\u66FC\u8FBE\u5C14 +men=\u95E8\u8FEA\u6587 +mga=\u4E2D\u53E4\u7231\u5C14\u5170\u6587 +mic=\u7C73\u514B\u9A6C\u514B\u6587 +min=\u7C73\u5357\u5361\u4FDD\u6587 +mis=\u5404\u79CD\u4E0D\u540C\u8BED\u7CFB +mkh=\u5176\u4ED6\u5B5F\u9AD8\u68C9\u8BED\u7CFB +mlg=\u9A6C\u5C14\u52A0\u4EC0\u6587 +mlt=\u9A6C\u8033\u4ED6\u6587 +mnc=\u6EE1\u6587 +mni=\u66FC\u5C3C\u666E\u91CC\u6587 +mno=\u9A6C\u8BFA\u535A\u8BED\u7CFB +moh=\u6469\u970D\u514B\u6587 +mon=\u8499\u53E4\u6587 +mos=\u83AB\u897F\u6587 +mul=\u591A\u79CD\u8BED\u7CFB +mun=\u8499\u8FBE\u8BED\u7CFB +mus=\u514B\u91CC\u514B\u6587 +mwl=\u7C73\u5170\u5FB7\u65AF\u6587 +mwr=\u9A6C\u5C14\u74E6\u5229\u6587 +myn=\u739B\u96C5\u8BED\u7CFB +myv=\u4FC4\u65E5\u4E9A\u6587 +nah=\u7EB3\u74E6\u7279\u5C14\u6587 +nai=\u5176\u4ED6\u5317\u7F8E\u5370\u7B2C\u5B89\u8BED\u7CFB +nap=\u62FF\u6CE2\u91CC\u6587 +nau=\u7459\u9C81\u6587 +nav=\u7EB3\u74E6\u970D\u6587 +nbl=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5357\u90E8 +nde=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5317\u90E8 +ndo=\u6069\u4E1C\u52A0\u6587 +nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u900A\u6587 +nep=\u5C3C\u6CCA\u5C14\u6587 +new=\u5C3C\u74E6\u5C14\u6587 +nia=\u5C3C\u4E9A\u65AF\u6587 +nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4 +niu=\u7EBD\u57C3\u6587 +nno=\u632A\u5A01\u5C3C\u8BFA\u65AF\u514B\u6587 +nob=\u632A\u5A01\u535A\u514B\u9A6C\u5C14\u8BED +nog=\u8BFA\u76D6\u6587 +non=\u53E4\u8BFA\u5C14\u65AF\u6587 +nor=\u632A\u5A01\u6587 +nqo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00) +nso=\u5317\u7D22\u6258\u6587 +nub=\u52AA\u6BD4\u4E9A\u8BED\u7CFB +nwc=\u5C3C\u74E6\u5C14\u6587 +nya=\u9F50\u5207\u74E6\u8BED +nym=\u5C3C\u4E9A\u59C6\u97E6\u9F50\u6587 +nyn=\u5C3C\u6602\u79D1\u52D2\u6587 +nyo=\u5C3C\u7EA6\u7F57\u6587 +nzi=\u6069\u6D4E\u9A6C\u6587 +oci=\u5965\u897F\u5766\u6587 (1500 \u540E) +oji=\u5965\u5409\u5E03\u74E6\u6587 +ori=\u6B27\u91CC\u4E9A\u6587 +orm=\u963F\u66FC\u6587 +osa=\u5965\u8428\u683C\u8BED +oss=\u5965\u585E\u68AF\u6587 +ota=\u5965\u6258\u66FC\u571F\u8033\u5176\u6587 +oto=\u5965\u6258\u7C73\u8BED\u7CFB +paa=\u5176\u4ED6\u5DF4\u5E03\u4E9A\u6587 +pag=\u90A6\u963F\u897F\u6960\u8BED +pal=\u5E15\u62C9\u7EF4\u6587 +pam=\u90A6\u677F\u7259\u6587 +pan=\u65C1\u906E\u666E\u6587 +pap=\u5E15\u76AE\u4E9A\u95E8\u6258\u6587 +pau=\u5E15\u52B3\u6587 +peo=\u53E4\u8001\u6CE2\u65AF\u8BED +per=\u6CE2\u65AF\u6587 +phi=\u5176\u4ED6\u83F2\u5F8B\u5BBE\u8BED\u7CFB +phn=\u8153\u5C3C\u57FA\u6587 +pli=\u5DF4\u5229\u6587 +pol=\u6CE2\u5170\u6587 +pon=\u6CE2\u7EB3\u4F69\u6587 +por=\u8461\u8404\u7259\u6587 +pra=\u666E\u62C9\u514B\u91CC\u7279\u8BF8\u8BED\u8A00 +pro=\u666E\u7F57\u6587\u65AF\u6587 +pus=\u666E\u4EC0\u56FE\u6587 +que=\u76D6\u4E18\u4E9A\u6587 +raj=\u62C9\u8D3E\u65AF\u5766\u6587 +rap=\u62C9\u5E15\u52AA\u4F0A\u6587 +rar=\u62C9\u7F57\u6C64\u52A0\u6587 +roa=\u5176\u4ED6\u62C9\u4E01\u8BED\u7CFB +roh=\u7F57\u66FC\u4EC0\u8BED +rom=\u5409\u666E\u8D5B\u6587 +rum=\u7F57\u9A6C\u5C3C\u4E9A\u6587 +run=\u57FA\u9686\u8FEA\u6587 +rup=\u4E9A\u7F8E\u5C3C\u4E9A\u6587 +rus=\u4FC4\u6587 +sad=\u6563\u8FBE\u7EF4\u6587 +sag=\u6851\u6208\u6587 +sah=\u96C5\u5E93\u7279\u6587 +sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587 +sal=\u8428\u5229\u4EC0\u6587 +sam=\u8428\u739B\u5229\u4E9A\u6587 +san=\u68B5\u6587 +sas=\u8428\u8428\u514B\u6587 +sat=\u6851\u5854\u5229\u6587 +scn=\u897F\u897F\u91CC\u6587 +sco=\u82CF\u683C\u5170\u6587 +sel=\u585E\u5C14\u5E93\u666E\u6587 +sem=\u5176\u4ED6\u95EA\u65CF\u8BED\u7CFB +sga=\u53E4\u7231\u5C14\u5170\u6587 +sgn=\u624B\u8BED +shn=\u63B8\u6587 +sid=\u6089\u8FBE\u6469\u6587 +sin=\u8F9B\u54C8\u62C9\u8BED +sio=\u82CF\u8BED\u8BF8\u8BED\u8A00 +sit=\u6C49\u85CF\u8BF8\u8BED\u8A00 +sla=\u5176\u4ED6\u65AF\u62C9\u592B\u8BED\u7CFB +slo=\u65AF\u6D1B\u4F10\u514B\u6587 +slv=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6587 +sma=\u5357\u8428\u7C73\u6587 +sme=\u5317\u6C99\u5BC6\u6587 +smi=\u5176\u4ED6\u8428\u7C73\u6587 +smj=\u5F8B\u52D2\u6B27\u8428\u83AB\u65AF\u8BED +smn=\u4F0A\u7EB3\u91CC\u8428\u7C73\u8BED +smo=\u8428\u6469\u4E9A\u6587 +sms=\u65AF\u79D1\u7279\u8428\u7C73\u6587 +sna=\u4FEE\u7EB3\u6587 +snd=\u4FE1\u5FB7\u6587 +snk=\u7D22\u5C3C\u57FA\u6587 +sog=\u53E4\u7C9F\u7279\u8BED +som=\u7D22\u9A6C\u91CC\u6587 +son=\u6851\u6D77\u6587 +sot=\u7D22\u6258\u8BED, \u5357\u90E8 +spa=\u897F\u73ED\u7259\u6587 +srd=\u6492\u4E01\u6587 +srn=Sranan Tongo (\u6E90\u4E8E\u514B\u91CC\u5965\u5C14\u8BED) +srp=\u585E\u5C14\u7EF4\u4E9A\u6587 +srr=\u8C22\u5217\u5C14\u6587 +ssa=\u975E\u6D32\u6492\u54C8\u62C9\u6C99\u6F20\u8FB9\u7F18\u5730\u5E26\u8BED\u8A00 +ssw=\u65AF\u74E6\u7279\u6587 +suk=\u82CF\u5E93\u9A6C\u6587 +sun=\u5DFD\u4ED6\u6587 +sus=\u82CF\u82CF\u6587 +sux=\u82CF\u9A6C\u6587 +swa=\u65AF\u74E6\u5E0C\u91CC\u6587 +swe=\u745E\u5178\u6587 +syc=\u53E4\u5178\u53D9\u5229\u4E9A\u8BED +syr=\u53D9\u5229\u4E9A\u8BED +tah=\u5854\u5E0C\u63D0\u6587 +tai=\u50A3\u8BED\u8BF8\u8BED\u8A00 (\u5176\u4ED6) +tam=\u6CF0\u7C73\u5C14\u6587 +tat=\u9791\u977C\u6587 +tel=\u6CF0\u5362\u56FA\u6587 +tem=\u6ED5\u5185\u8BED +ter=\u7279\u5217\u7EB3\u6587 +tet=\u7279\u5854\u59C6\u6587 +tgk=\u5854\u5409\u514B\u6587 +tgl=\u5854\u52A0\u8DEF\u65CF\u6587 +tha=\u6CF0\u6587 +tib=\u897F\u85CF\u6587 +tig=\u63D0\u683C\u96F7\u6587 +tir=\u63D0\u683C\u91CC\u5C3C\u4E9A\u6587 +tiv=\u8482\u592B\u6587 +tkl=\u6258\u514B\u52B3\u6587 +tlh=\u514B\u6797\u8D21\u6587 +tli=\u7279\u6797\u5409\u7279\u6587 +tmh=\u5854\u9A6C\u5947\u514B\u6587 +tog=\u6C64\u52A0\u6587 (\u5C3C\u4E9A\u8428\u5730\u533A) +ton=\u6C64\u52A0\u8BED (\u6C64\u52A0\u5C9B) +tpi=\u6258\u514B\u76AE\u8F9B\u6587 +tsi=\u8482\u59C6\u897F\u4E9A\u6587 +tsn=\u7A81\u5C3C\u65AF\u6587 +tso=\u7279\u677E\u52A0\u6587 +tuk=\u571F\u5E93\u66FC\u6587 +tum=\u901A\u5E03\u5361\u6587 +tup=\u56FE\u76AE\u8BED\u7CFB +tur=\u571F\u8033\u5176\u6587 +tut=\u963F\u5C14\u6CF0\u8BF8\u8BED\u8A00 (\u5176\u4ED6) +tvl=\u56FE\u74E6\u5362\u6587 +twi=\u5951\u7EF4\u6587 +tyv=\u56FE\u74E6\u6587 +udm=\u4E4C\u5FB7\u7A46\u5C14\u7279\u6587 +uga=\u4E4C\u52A0\u91CC\u7279\u6587 +uig=\u7EF4\u543E\u5C14\u6587 +ukr=\u4E4C\u514B\u5170\u6587 +umb=\u7FC1\u672C\u675C\u6587 +und=\u672A\u5B9A\u8BED\u79CD +urd=\u4E4C\u5C14\u90FD\u6587 +uzb=\u4E4C\u5179\u522B\u514B\u6587 +vai=\u74E6\u4F0A\u6587 +ven=\u6587\u8FBE\u6587 +vie=\u8D8A\u5357\u6587 +vol=\u6C83\u62C9\u666E\u514B\u6587 +vot=\u6C83\u63D0\u514B\u6587 +wak=\u74E6\u5361\u4EC0\u8BF8\u8BED\u8A00 +wal=\u74E6\u62C9\u83AB\u6587 +war=\u74E6\u8D56\u6587 +was=\u74E6\u7ECD\u6587 +wel=\u5A01\u5C14\u58EB\u6587 +wen=\u7D22\u5E03\u8BF8\u8BED\u8A00 +wln=\u74E6\u9F99\u6587 +wol=\u6C83\u5C14\u592B\u6587 +xal=\u5361\u5C14\u6885\u514B\u6587 +xho=\u73ED\u56FE\u6587 +yao=\u7476\u65CF\u6587 +yap=\u96C5\u6D66\u6587 +yid=\u4F9D\u5730\u6587 +yor=\u7EA6\u9C81\u5DF4\u6587 +ypk=\u5C24\u76AE\u514B\u8BF8\u8BED\u8A00 +zap=\u8428\u6CE2\u8482\u514B\u6587 +zbl=\u5E03\u5217\u65AF\u7B26\u53F7 +zen=\u6CFD\u7EB3\u52A0\u6587 +zha=\u58EE\u6587 +znd=\u8D5E\u5FB7\u6587 +zul=\u7956\u9C81\u6587 +zun=\u7956\u5C3C\u8BED +zxx=\u65E0\u8BED\u8A00\u5185\u5BB9 +zza=\u624E\u624E\u8BED + # script names # key is ISO 15924 script code -Hans=\u7b80\u4f53\u4e2d\u6587 -Hant=\u7e41\u4f53\u4e2d\u6587 +Arab=\u963F\u62C9\u4F2F\u6587 +Armi=\u7687\u5BB6\u4E9A\u62C9\u59C6\u8BED +Armn=\u4E9A\u7F8E\u5C3C\u4E9A\u6587 +Avst=\u963F\u7EF4\u65AF\u9640\u8BED +Bali=\u5DF4\u91CC\u6587 +Bamu=\u5DF4\u59C6\u7A46\u8BED +Bass=\u5DF4\u8428\u74E6\u8D6B\u8BED +Batk=\u5DF4\u5854\u514B\u6587 +Beng=\u5B5F\u52A0\u62C9\u6587 +Blis=\u5E03\u5217\u65AF\u7B26\u53F7 +Bopo=\u6C49\u8BED\u62FC\u97F3 +Brah=\u5A46\u7F57\u7C73\u6587\u5B57 +Brai=\u5E03\u83B1\u53F6\u76F2\u6587 +Bugi=\u5E03\u5409\u6587 +Buhd=\u5E03\u5E0C\u5FB7\u8BED +Cakm=\u67E5\u514B\u9A6C\u8BED +Cans=\u52A0\u62FF\u5927\u571F\u8457\u7EDF\u4E00\u7B26\u53F7\u8BED +Cari=\u5361\u91CC\u4E9A\u8BED +Cham=\u5360\u8BED +Cher=\u5F7B\u7F57\u57FA\u6587 +Cirt=\u8272\u65AF\u6587 +Copt=\u514B\u666E\u7279\u8BED +Cprt=\u585E\u6D66\u8DEF\u65AF\u8BED +Cyrl=\u897F\u91CC\u5C14\u8BED +Cyrs=\u897F\u91CC\u5C14\u6587\u5B57 (\u53E4\u6559\u4F1A\u65AF\u62C9\u592B\u8BED\u7684\u53D8\u4F53) +Deva=\u68B5\u6587 +Dsrt=\u5FB7\u585E\u83B1\u7279\u6587 +Dupl=Duployan \u901F\u8BB0 +Egyd=\u540E\u671F\u57C3\u53CA\u8BED +Egyh=\u53E4\u57C3\u53CA\u50E7\u4FA3\u4E66\u5199\u4F53 +Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587 +Elba=\u7231\u5C14\u5DF4\u6851 +Ethi=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u8BED +Geok=\u52AA\u65AF\u514B\u80E1\u91CC\u6587 +Geor=\u683C\u9C81\u5409\u4E9A\u6587 +Glag=\u683C\u62C9\u54E5\u91CC\u8BED +Goth=\u54E5\u7279\u6587 +Gran=\u5404\u5170\u7279\u54C8\u6587\u5B57 +Grek=\u5E0C\u814A\u6587 +Gujr=\u53E4\u52A0\u62C9\u63D0\u6587 +Guru=\u679C\u9C81\u7A46\u5947\u8BED +Hang=\u97E9\u6587 +Hani=\u6C49\u8BED +Hano=\u6C49\u5974\u7F57\u8BED +Hans=\u7B80\u4F53\u4E2D\u6587 +Hant=\u7E41\u4F53\u4E2D\u6587 +Hebr=\u5E0C\u4F2F\u6765\u6587 +Hira=\u5E73\u5047\u540D +Hmng=\u6768\u677E\u5F55\u82D7\u6587 +Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D +Hung=\u53E4\u5308\u7259\u5229\u8BED +Inds=\u5370\u5EA6\u6CB3\u6587\u5B57 +Ital=\u53E4\u610F\u5927\u5229\u8BED +Java=\u722A\u54C7\u6587 +Jpan=\u65E5\u6587 +Kali=\u514B\u8036\u674E\u6587\u5B57 +Kana=\u7247\u5047\u540D +Khar=\u5361\u7F57\u987B\u63D0\u6587 +Khmr=\u67EC\u57D4\u5BE8\u6587 +Knda=\u57C3\u7EB3\u5FB7\u6587 +Kore=\u97E9\u6587 +Kpel=\u514B\u4F69\u5217\u6587 +Kthi=\u5361\u7F57\u987B\u63D0\u8BED +Lana=\u5170\u62FF\u8BED +Laoo=\u8001\u631D\u8BED +Latf=\u62C9\u4E01\u6587 (\u54E5\u7279\u5F0F\u5B57\u4F53\u53D8\u4F53) +Latg=\u62C9\u4E01\u6587 (\u76D6\u5C14\u8BED\u53D8\u4F53) +Latn=\u62C9\u4E01\u6587 +Lepc=\u96F7\u5E03\u67E5\u8BED +Limb=\u6797\u5E03\u8BED +Lina=\u7EBF\u5F62\u6587\u5B57 A +Linb=\u7EBF\u5F62\u6587\u5B57 B +Lisu=\u5088\u50F3\u8BED +Loma=\u6D1B\u9A6C\u8BED +Lyci=\u5229\u897F\u4E9A\u8BED +Lydi=\u5415\u5E95\u4E9A\u8BED +Mand=\u66FC\u8FBE\u6587 +Mani=\u6469\u5C3C\u6559\u6587 +Maya=\u739B\u96C5\u5723\u7B26\u6587 +Mend=\u95E8\u8FEA\u6587 +Merc=\u9EA6\u82E5\u63D0\u514B\u6587\u8349\u4F53 +Mero=\u9EA6\u82E5\u63D0\u514B\u6587 +Mlym=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587 +Mong=\u8499\u53E4\u6587 +Moon=\u6708\u4EAE\u4F53 +Mtei=\u66FC\u5C3C\u666E\u5C14\u8BED +Mymr=\u7F05\u7538 +Narb=\u53E4\u5317\u963F\u62C9\u4F2F\u8BED +Nbat=\u7EB3\u5DF4\u6CF0\u8BED +Nkgb=\u7EB3\u897F\u54E5\u5DF4\u8BED +Nkoo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00) +Ogam=\u6B27\u7518\u8BED +Olck=\u6851\u5854\u5229\u6587 +Orkh=\u9102\u5C14\u6D51\u6587 +Orya=\u5965\u8428\u683C\u6587 +Osma=\u5965\u65AF\u66FC\u4E9A\u8BED +Palm=\u5E15\u5C14\u8FC8\u62C9\u8BED +Perm=\u53E4\u5F7C\u5C14\u59C6\u8BF8\u8BED +Phag=\u516B\u601D\u5DF4\u6587 +Phli=\u7891\u94ED\u4F53\u5DF4\u5217\u7EF4\u8BED +Phlp=\u8BD7\u4F53\u5DF4\u5217\u7EF4\u8BED +Phlv=\u4E66\u4F53\u5DF4\u5217\u7EF4\u8BED +Phnx=\u8153\u5C3C\u57FA\u6587 +Plrd=\u82D7\u6587 +Prti=\u7891\u94ED\u4F53\u5E15\u63D0\u4E9A\u8BED +Rjng=\u62C9\u8BA9\u8BED +Roro=\u6717\u683C\u6717\u683C\u6587 +Runr=\u53E4\u4EE3\u5317\u6B27\u6587 +Samr=\u6492\u739B\u5229\u4E9A\u8BED +Sara=\u6C99\u62C9\u5824\u6587 +Sarb=\u53E4\u5357\u963F\u62C9\u4F2F\u8BED +Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u8BED +Sgnw=\u4E66\u5199\u7B26\u53F7 +Shaw=\u8427\u4F2F\u7EB3\u5F0F\u8BED +Sind=\u4FE1\u5FB7\u6587 +Sinh=\u8F9B\u54C8\u62C9\u8BED +Sund=\u5DFD\u4ED6\u6587 +Sylo=Syloti Nagri \u4E66\u5199\u4F53 +Syrc=\u53D9\u5229\u4E9A\u6587 +Syre=\u798F\u97F3\u4F53\u53D9\u5229\u4E9A\u6587 +Syrj=\u897F\u53D9\u5229\u4E9A\u8BED +Syrn=\u4E1C\u53D9\u5229\u4E9A\u8BED +Tagb=\u5854\u683C\u73ED\u74E6\u8BED +Tale=\u6CF0\u4E50\u8BED +Talu=\u65B0\u50A3\u6587 +Taml=\u6CF0\u7C73\u5C14\u6587 +Tavt=\u8D8A\u5357\u50A3\u8BED +Telu=\u6CF0\u5362\u56FA\u6587 +Teng=\u817E\u683C\u74E6\u6587\u5B57 +Tfng=\u63D0\u975E\u7EB3\u6587 +Tglg=\u5854\u52A0\u8DEF\u65CF\u6587 +Thaa=\u5854\u5B89\u5A1C\u8BED +Thai=\u6CF0\u6587 +Tibt=\u897F\u85CF\u6587 +Ugar=\u4E4C\u52A0\u91CC\u7279\u6587 +Vaii=\u74E6\u4F9D\u8BED +Visp=\u53EF\u89C1\u8BED\u8A00 +Wara=Warang Citi +Xpeo=\u53E4\u6CE2\u65AF\u8BED +Xsux=\u82CF\u7F8E\u5C14-\u963F\u5361\u5FB7\u6954\u5F62\u6587\u5B57 +Yiii=\u5F5D\u8BED +Zinh=\u9057\u4F20\u5B66\u672F\u8BED +Zmth=\u6570\u5B66\u8BB0\u53F7 +Zsym=\u7B26\u53F7 +Zxxx=\u64A4\u9500\u5199\u5165 +Zyyy=\u901A\u7528 +Zzzz=\u811A\u672C\u672A\u77E5\u6216\u8005\u65E0\u6548 # country names # key is ISO 3166 country code @@ -478,3 +1109,37 @@ ZA=\u5357\u975e ZM=\u8d5e\u6bd4\u4e9a ZW=\u6d25\u5df4\u5e03\u97e6 + +# territory names +# key is UN M.49 country and area code + +001=\u4E16\u754C +002=\u975E\u6D32 +003=\u5317\u7F8E\u6D32 +005=\u5357\u7F8E\u6D32 +009=\u5927\u6D0B\u6D32 +011=\u897F\u975E +013=\u4E2D\u7F8E\u6D32 +014=\u4E1C\u975E +015=\u5317\u975E +017=\u4E2D\u975E +018=\u5357\u90E8\u975E\u6D32 +019=\u7F8E\u6D32 +021=\u7F8E\u6D32\u5317\u90E8 +029=\u52A0\u52D2\u6BD4\u6D77 +030=\u4E1C\u4E9A +034=\u5357\u4E9A +035=\u4E1C\u5357\u4E9A +039=\u5357\u6B27 +053=\u6FB3\u5927\u5229\u4E9A\u548C\u65B0\u897F\u5170 +054=\u7F8E\u62C9\u5C3C\u897F\u4E9A +057=\u5BC6\u514B\u7F57\u5C3C\u897F\u4E9A\u5730\u533A +061=\u6CE2\u5229\u5C3C\u897F\u4E9A +142=\u4E9A\u6D32 +143=\u4E2D\u4E9A +145=\u897F\u4E9A +150=\u6B27\u6D32 +151=\u4E1C\u6B27 +154=\u5317\u6B27 +155=\u897F\u6B27 +419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,11 +227,642 @@ zh=\u4e2d\u6587 zu=\u7956\u9b6f\u6587 +# key is ISO 639.2 language code +aar=\u963F\u6CD5\u6587 +abk=\u963F\u5E03\u54C8\u897F\u4E9E\u6587 +ace=\u4E9E\u9F4A\u6587 +ach=\u963F\u50D1\u5229\u6587 +ada=\u963F\u7576\u83AB\u6587 +ady=\u963F\u8FEA\u5404\u6587 +afa=\u4E9E\u975E\u8A9E\u7CFB +afh=\u963F\u5F17\u91CC\u5E0C\u5229\u6587 +afr=\u5357\u975E\u8377\u862D\u6587 +ain=\u963F\u4F0A\u52AA\u6587 +aka=\u963F\u5BD2\u6587 +akk=\u963F\u5361\u5FB7\u6587 +alb=\u963F\u723E\u5DF4\u5C3C\u4E9E\u6587 +ale=\u963F\u7559\u7533\u6587 +alg=\u963F\u723E\u5CA1\u6606\u8AF8\u8A9E\u8A00 +alt=\u5357\u963F\u723E\u6CF0\u6587 +amh=\u8863\u7D22\u6BD4\u4E9E\u6587 +ang=\u53E4\u82F1\u6587 (\u7D04\u897F\u5143 450-1100) +anp=\u6602\u52A0\u6587 +apa=\u963F\u5E15\u5207\u8AF8\u8A9E\u8A00 +ara=\u963F\u62C9\u4F2F\u6587 +arc=\u963F\u62C9\u7C73\u6587 (700-300 BCE) +arg=\u4E9E\u62C9\u5CA1\u6587 +arm=\u4E9E\u7F8E\u5C3C\u4E9E\u6587 +arn=\u963F\u52DE\u574E\u6587 +arp=\u963F\u62C9\u5E15\u970D\u6587 +art=\u4EBA\u5DE5\u8A9E\u8A00 +arw=\u963F\u62C9\u74E6\u514B\u6587 +asm=\u963F\u85A9\u59C6\u6587 +ast=\u963F\u65AF\u5716\u91CC\u4E9E\u6587 +ath=\u963F\u85A9\u5E15\u65AF\u574E\u8AF8\u8A9E\u8A00 +aus=\u6FB3\u6D32\u8AF8\u8A9E\u8A00 +ava=\u963F\u74E6\u96F7\u6587 +ave=\u963F\u672A\u65AF\u5854\u6587 +awa=\u963F\u74E6\u6587 +aym=\u4E9E\u6469\u62C9\u6587 +aze=\u4E9E\u585E\u62DC\u7136\u6587 +bad=\u73ED\u9054\u6587 +bai=\u5DF4\u7C73\u7D2F\u514B\u8AF8\u8A9E\u8A00 +bak=\u5DF4\u4EC0\u5580\u723E\u6587 +bal=\u4FFE\u8DEF\u652F\u6587 +bam=\u73ED\u5DF4\u62C9\u6587 +ban=\u5CC7\u91CC\u6587 +baq=\u5DF4\u65AF\u514B\u6587 +bas=\u5DF4\u85A9\u6587 +bat=\u6CE2\u7F85\u7684\u6D77\u8AF8\u8A9E\u8A00 +bej=\u8C9D\u624E\u6587 +bel=\u767D\u4FC4\u7F85\u65AF\u6587 +bem=\u5225\u59C6\u5DF4\u6587 +ben=\u5B5F\u52A0\u62C9\u6587 +ber=\u67CF\u67CF\u723E\u6587 +bho=\u535A\u5091\u666E\u723E\u6587 +bih=\u6BD4\u54C8\u723E\u6587 +bik=\u6BD4\u79D1\u723E\u6587 +bin=\u6BD4\u5C3C\u6587 +bis=\u6BD4\u65AF\u62C9\u99AC\u6587 +bla=\u932B\u514B\u932B\u5361\u6587 +bnt=\u73ED\u5716\u8AF8\u8A9E\u8A00 +bos=\u6CE2\u58EB\u5C3C\u4E9E\u6587 +bra=\u5E03\u62C9\u6770\u6587 +bre=\u4E0D\u5217\u5854\u5C3C\u6587 +btk=\u5DF4\u5854\u514B\u6587 +bua=\u5E03\u91CC\u963F\u7279\u6587 +bug=\u5E03\u5409\u65AF\u6587 +bul=\u4FDD\u52A0\u5229\u4E9E\u6587 +bur=\u7DEC\u7538\u6587 +byn=\u5E03\u6797\u6587 +cad=\u5361\u591A\u6587 +cai=\u4E2D\u7F8E\u5370\u7B2C\u5B89\u8AF8\u8A9E\u8A00 +car=\u5DF4\u52D2\u6BD4\u6587 +cat=\u5609\u6CF0\u7F85\u5C3C\u4E9E\u6587 +cau=\u9AD8\u52A0\u7D22\u8AF8\u8A9E\u8A00 +ceb=\u5BBF\u9727\u6587 +cel=\u51F1\u723E\u7279\u8AF8\u8A9E\u8A00 +cha=\u67E5\u6469\u6D1B\u6587 +chb=\u5947\u5E03\u67E5\u6587 +che=\u8ECA\u81E3\u6587 +chg=\u67E5\u52A0\u6587 +chi=\u4E2D\u6587 +chk=\u8655\u5947\u65AF\u6587 +chm=\u99AC\u91CC\u6587 +chn=\u5951\u5974\u514B\u6587 +cho=\u55AC\u514B\u6258\u6587 +chp=\u5947\u4F69\u74E6\u63DA\u6587 +chr=\u67F4\u7F85\u57FA\u6587 +chu=\u6559\u6703\u65AF\u62C9\u592B\u6587 +chv=\u695A\u74E6\u58EB\u6587 +chy=\u6C99\u4F0A\u5B89\u6587 +cmc=\u67E5\u7C73\u514B\u6587 +cop=\u79D1\u666E\u7279\u6587 +cor=\u5EB7\u74E6\u8033\u6587 +cos=\u79D1\u897F\u5609\u6587 +cpe=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u82F1\u6587\u7684(\u5176\u4ED6) +cpf=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u6CD5\u6587\u7684(\u5176\u4ED6) +cpp=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u8461\u8404\u7259\u6587\u7684(\u5176\u4ED6) +cre=\u514B\u91CC\u6587 +crh=\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u571F\u8033\u5176\u6587\uFF1B\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u5854\u5854\u723E\u6587 +crp=\u5176\u4ED6\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\u7CFB +csb=\u5361\u8212\u5E03\u6587 +cus=\u5EAB\u65BD\u7279\u8AF8\u8A9E\u8A00 +cze=\u6377\u514B\u6587 +dak=\u9054\u79D1\u4ED6\u6587 +dan=\u4E39\u9EA5\u6587 +dar=\u9054\u723E\u683C\u74E6\u6587 +day=\u8FEA\u96C5\u514B\u6587 +del=\u5FB7\u62C9\u74E6\u6587 +den=\u65AF\u62C9\u592B +dgr=\u591A\u683C\u91CC\u5E03\u6587 +din=\u4E01\u5361\u6587 +div=\u8FEA\u7DAD\u897F\u6587 +doi=\u591A\u683C\u4F86\u6587 +dra=\u5FB7\u62C9\u5A01\u8AF8\u8A9E\u8A00 +dsb=\u4E0B\u7D22\u5E03\u6587 +dua=\u675C\u4E9E\u62C9\u6587 +dum=\u4E2D\u53E4\u8377\u862D\u6587 (\u7D04 1050-1350) +dut=\u8377\u862D\u6587 +dyu=\u8FEA\u5C24\u62C9\u6587 +dzo=\u4E0D\u4E39\u6587 +efi=\u57C3\u83F2\u514B\u6587 +egy=\u53E4\u57C3\u53CA\u6587 +eka=\u827E\u5361\u6731\u514B\u6587 +elx=\u827E\u62C9\u7C73\u7279\u6587 +eng=\u82F1\u6587 +enm=\u4E2D\u53E4\u82F1\u6587 (1100-1500) +epo=\u4E16\u754C\u6587 +est=\u611B\u6C99\u5C3C\u4E9E\u6587 +ewe=\u57C3\u7DAD\u6587 +ewo=\u4F9D\u6C6A\u90FD\u6587 +fan=\u82B3\u65CF\u6587 +fao=\u6CD5\u7F85\u6587 +fat=\u82B3\u8482\u6587 +fij=\u6590\u6FDF\u6587 +fil=\u83F2\u5F8B\u8CD3\u6587 +fin=\u82AC\u862D\u6587 +fiu=\u82AC\u70CF\u8AF8\u8A9E\u8A00 +fon=\u8C50\u6587 +fre=\u6CD5\u6587 +frm=\u4E2D\u53E4\u6CD5\u6587 (\u7D04 1400-1600) +fro=\u53E4\u6CD5\u6587 (842-\u7D04 1400) +frr=\u5317\u5F17\u91CC\u897F\u4E9E\u6587 +frs=\u6771\u5F17\u91CC\u897F\u4E9E\u6587 +fry=\u897F\u5F17\u91CC\u897F\u4E9E\u6587 +ful=\u5BCC\u62C9\u6587 +fur=\u5F17\u7559\u5229\u6587 +gaa=\u52A0\u65CF\u6587 +gay=\u52A0\u7D04\u6587 +gba=\u845B\u5DF4\u4E9E\u6587 +gem=\u5176\u4ED6\u65E5\u8033\u66FC\u8A9E\u7CFB +geo=\u55AC\u6CBB\u4E9E\u6587 +ger=\u5FB7\u6587 +gez=\u5409\u8332\u6587 +gil=\u5409\u723E\u4F2F\u7279\u7FA4\u5CF6\u6587 +gla=\u84CB\u723E\u6587 +gle=\u611B\u723E\u862D\u6587 +glg=\u52A0\u91CC\u897F\u4E9E\u6587 +glv=\u66FC\u5CF6\u6587 +gmh=\u4E2D\u53E4\u9AD8\u5730\u5FB7\u6587 (\u7D04 1050-1500) +goh=\u53E4\u9AD8\u5730\u5FB7\u6587 (\u7D04 750-1050) +gon=\u5CA1\u5FB7\u6587 +gor=\u79D1\u9686\u9054\u7F85\u6587 +got=\u54E5\u5FB7\u6587 +grb=\u683C\u5217\u535A\u6587 +grc=\u53E4\u5E0C\u81D8\u6587 (\u76F4\u5230 1453) +gre=\u4E2D\u53E4\u5E0C\u81D8\u6587 (1453-) +grn=\u74DC\u62C9\u5C3C\u6587 +gsw=\u5FB7\u6587 (\u745E\u58EB) +guj=\u53E4\u5409\u62C9\u7279\u6587 +gwi=\u572D\u5951\u6587 +hai=\u6D77\u9054\u6587 +hat=\u6D77\u5730\u6587 +hau=\u8C6A\u85A9\u6587 +haw=\u590F\u5A01\u5937\u6587 +heb=\u5E0C\u4F2F\u4F86\u6587 +her=\u8D6B\u96F7\u7F85\u6587 +hil=\u5E0C\u5229\u84CB\u8FB2\u6587 +him=\u8D6B\u99AC\u67E5\u5229\u6587 +hin=\u5317\u5370\u5EA6\u6587 +hit=\u8D6B\u68AF\u6587 +hmn=\u5B5F\u6587 +hmo=\u65B0\u91CC\u6728\u6258\u6587 +hrv=\u514B\u7F85\u57C3\u897F\u4E9E\u6587 +hsb=\u4E0A\u7D22\u5E03\u6587 +hun=\u5308\u7259\u5229\u6587 +hup=\u80E1\u5E15\u6587 +iba=\u4F0A\u73ED\u6587 +ibo=\u4F0A\u5E03\u6587 +ice=\u51B0\u5CF6\u6587 +ido=\u4F0A\u591A\u6587 +iii=\u56DB\u5DDD\u5937\u6587 +ijo=\u4F0A\u55AC\u6587 +iku=\u4F0A\u52AA\u4F0A\u7279\u6587 +ile=\u4EBA\u5DE5\u570B\u969B\u6587 +ilo=\u4F0A\u6D1B\u95CA\u6587 +ina=\u4EBA\u5DE5\u570B\u969B\u6587 (\u570B\u969B\u8F14\u52A9\u8A9E\u8A00\u5354\u6703) +inc=\u5370\u5EA6\u8AF8\u8A9E\u8A00 +ind=\u5370\u5C3C\u6587 +ine=\u5370\u6B50\u8AF8\u8A9E\u8A00 +inh=\u5370\u53E4\u4EC0\u6587 +ipk=\u4F9D\u5974\u76AE\u7DAD\u514B\u6587 +ira=\u4F0A\u6717\u8AF8\u8A9E\u8A00 +iro=\u6613\u6D1B\u9B41\u6587 +ita=\u7FA9\u5927\u5229\u6587 +jav=\u722A\u54C7\u6587 +jbo=\u908F\u8F2F\u6587 +jpn=\u65E5\u6587 +jpr=\u7336\u592A\u6559-\u6CE2\u65AF\u6587 +jrb=\u7336\u592A\u963F\u62C9\u4F2F\u6587 +kaa=\u5361\u62C9\u5361\u723E\u5E15\u514B\u6587 +kab=\u5361\u6BD4\u723E\u6587 +kac=\u5361\u7434\u6587 +kal=\u683C\u9675\u862D\u6587 +kam=\u5361\u59C6\u5DF4\u6587 +kan=\u574E\u90A3\u9054\u6587 +kar=\u514B\u502B\u6587 +kas=\u5580\u4EC0\u7C73\u723E\u6587 +kau=\u5361\u52AA\u91CC\u6587 +kaw=\u5361\u5A01\u6587 +kaz=\u54C8\u85A9\u514B\u6587 +kbd=\u5361\u5DF4\u723E\u9054\u6587 +kha=\u5361\u897F\u6587 +khi=\u79D1\u4F9D\u6851\u8AF8\u8A9E\u8A00 +khm=\u4E2D\u592E\u67EC\u57D4\u5BE8\u6587 +kho=\u548C\u95D0\u6587 +kik=\u57FA\u5EAB\u7336\u6587 +kin=\u91D1\u63DA\u842C\u7B54\u6587 +kir=\u5409\u723E\u5409\u65AF\u6587 +kmb=\u91D1\u90A6\u675C\u6587 +kok=\u8CA2\u6839\u6587 +kom=\u79D1\u5BC6\u6587 +kon=\u525B\u679C\u6587 +kor=\u97D3\u6587 +kos=\u79D1\u65AF\u96F7\u6069\u6587 +kpe=\u514B\u4F69\u5217\u6587 +krc=\u5361\u62C9\u67F4-\u5305\u723E\u5361\u723E\u6587 +krl=\u5361\u7D2F\u5229\u963F\u6587 +kro=\u514B\u9B6F\u6587 +kru=\u5EAB\u9B6F\u79D1\u6587 +kua=\u95DC\u4E9E\u99AC\u6587 +kum=\u5EAB\u5BC6\u514B\u6587 +kur=\u5EAB\u5FB7\u6587 +kut=\u5EAB\u7279\u5948\u6587 +lad=\u62C9\u8FEA\u8AFE\u6587 +lah=\u62C9\u4EA8\u9054\u6587 +lam=\u862D\u5DF4\u6587 +lao=\u5BEE\u6587 +lat=\u62C9\u4E01\u6587 +lav=\u62C9\u812B\u7DAD\u4E9E\u6587 (\u5217\u7279\u6587) +lez=\u83DC\u8332\u4F9D\u6602\u6587 +lim=\u5229\u535A\u574E\u6587 +lin=\u9675\u52A0\u62C9\u6587 +lit=\u7ACB\u9676\u5B9B\u6587 +lol=\u8292\u6208\u6587 +loz=\u6D1B\u9F4A\u6587 +ltz=\u76E7\u68EE\u5821\u6587 +lua=\u9B6F\u5DF4\u9B6F\u9B6F\u4E9E\u6587 +lub=\u76E7\u5DF4-\u52A0\u4E39\u52A0\u6587 +lug=\u5E72\u9054\u6587 +lui=\u8DEF\u6613\u585E\u8AFE\u6587 +lun=\u76E7\u6069\u9054\u6587 +luo=\u76E7\u5967\u6587 (\u80AF\u4E9E\u8207\u5766\u5C1A\u5C3C\u4E9E) +lus=\u76E7\u6652\u6587 +mac=\u99AC\u5176\u9813\u6587 +mad=\u99AC\u90FD\u62C9\u6587 +mag=\u99AC\u52A0\u4F0A\u6587 +mah=\u99AC\u7D39\u723E\u7FA4\u5CF6\u6587 +mai=\u9081\u8482\u5229\u6587 +mak=\u671B\u52A0\u932B\u6587 +mal=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587 +man=\u66FC\u4E01\u54E5\u6587 +mao=\u6BDB\u5229\u6587 +map=\u5357\u5CF6\u8AF8\u8A9E\u8A00 +mar=\u99AC\u62C9\u5730\u6587 +mas=\u99AC\u8CFD\u6587 +may=\u99AC\u4F86\u6587 +mdf=\u83AB\u514B\u6C99\u6587 +mdr=\u66FC\u9054\u6587 +men=\u9580\u5FB7\u6587 +mga=\u4E2D\u53E4\u611B\u723E\u862D\u6587 (900-1200) +mic=\u7C73\u514B\u99AC\u514B\u6587 +min=\u7C73\u5357\u5361\u5821\u6587 +mis=\u6DF7\u96DC\u8A9E\u8AF8\u8A9E\u8A00 +mkh=\u5B5F\u9AD8\u68C9\u8AF8\u8A9E\u8A00 +mlg=\u99AC\u62C9\u52A0\u897F\u6587 +mlt=\u99AC\u723E\u4ED6\u6587 +mnc=\u6EFF\u65CF\u6587 +mni=\u66FC\u5C3C\u666E\u88E1\u6587 +mno=\u99AC\u8AFE\u535A\u8AF8\u8A9E\u8A00 +moh=\u83AB\u970D\u514B\u6587 +mon=\u8499\u53E4\u6587 +mos=\u83AB\u897F\u6587 +mul=\u591A\u7A2E\u8A9E\u8A00 +mun=\u8499\u9054\u8AF8\u8A9E\u8A00 +mus=\u514B\u91CC\u514B\u6587 +mwl=\u7C73\u862D\u5FB7\u65AF\u6587 +mwr=\u99AC\u723E\u5C3C\u88E1\u6587 +myn=\u99AC\u96C5\u8AF8\u8A9E\u8A00 +myv=\u5384\u723E\u8332\u4E9E\u6587 +nah=\u7D0D\u74E6\u7279\u6587 +nai=\u5317\u7F8E\u5370\u7B2C\u5B89\u8AF8\u8A9E\u8A00 +nap=\u62FF\u6CE2\u91CC\u6587 +nau=\u8AFE\u9B6F\u6587 +nav=\u7D0D\u74E6\u8377\u6587 +nbl=\u5357\u6069\u5FB7\u6BD4\u5229\u6587 +nde=\u5317\u6069\u5FB7\u6BD4\u5229\u6587 +ndo=\u6069\u6771\u52A0\u6587 +nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u905C\u6587 +nep=\u5C3C\u6CCA\u723E\u6587 +new=\u5C3C\u74E6\u723E\u6587 +nia=\u5C3C\u4E9E\u65AF\u6587 +nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4 +niu=\u7D10\u57C3\u6587 +nno=\u632A\u5A01\u8010\u8AFE\u65AF\u514B\u6587 +nob=\u535A\u514B\u99AC\u723E\u6587\uFF0C\u632A\u5A01 +nog=\u8AFE\u84CB\u6587 +non=\u53E4\u8AFE\u723E\u65AF\u6587 +nor=\u632A\u5A01\u6587 +nqo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko) +nso=\u5317\u7D22\u6258\u6587 +nub=\u52AA\u6BD4\u4E9E\u8AF8\u8A9E\u8A00 +nwc=\u53E4\u5C3C\u74E6\u723E\u6587 +nya=\u9F4A\u5207\u74E6\u6587 +nym=\u5C3C\u63DA\u97CB\u9F4A\u6587 +nyn=\u5C3C\u63DA\u79D1\u840A\u6587 +nyo=\u5C3C\u5967\u56C9\u6587 +nzi=\u5C3C\u8332\u99AC\u6587 +oci=\u6B50\u897F\u5766\u6587 (\u524D 1500) +oji=\u5967\u6770\u5E03\u97CB\u6587 +ori=\u6B50\u5229\u4E9E\u6587 +orm=\u5967\u7F85\u8499\u6587 +osa=\u6B50\u585E\u5947\u6587 +oss=\u5967\u585E\u68AF\u6587 +ota=\u9102\u5716\u66FC\u571F\u8033\u5176\u6587 (1500-1928) +oto=\u5967\u6258\u7C73\u8AF8\u8A9E\u8A00 +paa=\u5DF4\u5E03\u4E9E\u8AF8\u8A9E\u8A00 +pag=\u6F58\u52A0\u8F9B\u6587 +pal=\u5DF4\u5217\u7DAD\u6587 +pam=\u6F58\u5E15\u5609\u6587 +pan=\u65C1\u906E\u666E\u6587 +pap=\u5E15\u76AE\u963F\u9580\u6258\u6587 +pau=\u5E1B\u7409\u6587 +peo=\u53E4\u6CE2\u65AF\u6587 (ca.600-400 B.C.) +per=\u6CE2\u65AF\u6587 +phi=\u83F2\u5F8B\u8CD3\u8AF8\u8A9E\u8A00 +phn=\u8153\u5C3C\u57FA\u6587 +pli=\u5E15\u91CC\u6587 +pol=\u6CE2\u862D\u6587 +pon=\u6CE2\u90A3\u8C9D\u6587 +por=\u8461\u8404\u7259\u6587 +pra=\u666E\u62C9\u514B\u91CC\u7279\u8AF8\u8A9E\u8A00 +pro=\u53E4\u666E\u7F85\u6587\u65AF\u6587 (\u76F4\u5230 1500) +pus=\u666E\u4EC0\u5716\u6587 +que=\u84CB\u695A\u74E6\u6587 +raj=\u62C9\u8CC8\u65AF\u5766\u8AF8\u6587 +rap=\u5FA9\u6D3B\u5CF6\u6587 +rar=\u62C9\u7F85\u901A\u52A0\u6587 +roa=\u7F85\u66FC\u8AF8\u8A9E\u8A00 +roh=\u7F85\u66FC\u4EC0\u6587 +rom=\u5409\u666E\u8CFD\u6587 +rum=\u7F85\u99AC\u5C3C\u4E9E\u6587 +run=\u79D1\u9686\u5730\u6587 +rup=\u7F85\u99AC\u5C3C\u4E9E\u8A9E\u7CFB +rus=\u4FC4\u6587 +sad=\u6851\u9054\u97CB\u6587 +sag=\u6851\u6208\u8A9E +sah=\u96C5\u5EAB\u7279\u6587 +sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587 +sal=\u85A9\u5229\u4EC0\u8AF8\u8A9E\u8A00 +sam=\u85A9\u746A\u5229\u4E9E\u963F\u62C9\u59C6\u6587 +san=\u68B5\u6587\u5B57\u6BCD +sas=\u6492\u6492\u514B\u6587 +sat=\u6563\u5854\u5229\u6587 +scn=\u897F\u897F\u91CC\u6587 +sco=\u8607\u683C\u862D\u6587 +sel=\u745F\u723E\u5361\u666E\u6587 +sem=\u9583\u8A9E\u8AF8\u8A9E\u8A00 +sga=\u53E4\u611B\u723E\u862D\u6587 (\u81F3 900) +sgn=\u624B\u8A9E +shn=\u64A3\u6587 +sid=\u5E0C\u9054\u6469\u6587 +sin=\u932B\u862D\u6587 +sio=\u8607\u8A9E\u8AF8\u8A9E\u8A00 +sit=\u6F22\u85CF\u8A9E\u7CFB +sla=\u65AF\u62C9\u592B\u8AF8\u8A9E\u8A00 +slo=\u65AF\u6D1B\u4F10\u514B\u6587 +slv=\u65AF\u6D1B\u7DAD\u5C3C\u4E9E\u8A9E +sma=\u5357\u85A9\u7C73\u6587 +sme=\u5317\u6C99\u5BC6\u6587 +smi=\u85A9\u7C73\u8AF8\u8A9E\u8A00 +smj=\u9B6F\u52D2\u85A9\u7C73\u6587 +smn=\u4F0A\u7D0D\u88E1\u85A9\u7C73\u6587 +smo=\u85A9\u6469\u4E9E\u6587 +sms=\u65AF\u79D1\u7279\u85A9\u7C73\u6587 +sna=\u980C\u54C8\u6587 +snd=\u4FE1\u5FB7\u6587 +snk=\u7D22\u5C3C\u57FA\u6587 +sog=\u7D22\u683C\u5E95\u4E9E\u7D0D\u6587 +som=\u7D22\u99AC\u5229\u6587 +son=\u6851\u6D77\u6587 +sot=\u7D22\u6258\u6587, \u5357\u90E8 +spa=\u897F\u73ED\u7259\u6587 +srd=\u85A9\u4E01\u5C3C\u4E9E\u6587 +srn=Sranan Tongo (\u6E90\u65BC\u514B\u91CC\u5967\u723E\u8A9E) +srp=\u585E\u723E\u7DAD\u4E9E\u6587 +srr=\u585E\u96F7\u723E\u6587 +ssa=\u5C3C\u7F85\u6492\u54C8\u62C9\u8AF8\u8A9E\u8A00 +ssw=\u897F\u65AF\u74E6\u63D0\u6587 +suk=\u8607\u5EAB\u99AC\u6587 +sun=\u5DFD\u4E39\u6587 +sus=\u8607\u8607\u6587 +sux=\u8607\u7F8E\u6587 +swa=\u53F2\u74E6\u897F\u91CC\u6587 +swe=\u745E\u5178\u6587 +syc=\u53E4\u6558\u5229\u4E9E\u6587 +syr=\u6558\u5229\u4E9E\u6587 +tah=\u5927\u6EAA\u5730\u6587 +tai=\u50A3\u8A9E\u8AF8\u8A9E\u8A00 +tam=\u5766\u7C73\u723E\u6587 +tat=\u97C3\u977C\u6587 +tel=\u7279\u62C9\u53E4\u6587 +tem=\u63D0\u59C6\u6587 +ter=\u6CF0\u96F7\u8AFE\u6587 +tet=\u6CF0\u9813\u6587 +tgk=\u5854\u5409\u514B\u6587 +tgl=\u5854\u52A0\u62C9\u65CF\u6587 +tha=\u6CF0\u6587 +tib=\u897F\u85CF\u6587 +tig=\u8482\u683C\u96F7\u6587 +tir=\u63D0\u683C\u5229\u5C3C\u4E9E\u6587 +tiv=\u63D0\u592B\u6587 +tkl=\u6258\u514B\u52DE\u6587 +tlh=\u514B\u6797\u8CA2\u6587 +tli=\u7279\u6797\u57FA\u7279\u6587 +tmh=\u5854\u99AC\u5947\u514B\u6587 +tog=\u6771\u52A0\u6587(\u5C3C\u4E9E\u85A9\u6587) +ton=\u6771\u52A0\u6587 (\u6771\u52A0\u7FA4\u5CF6) +tpi=\u6258\u6BD4\u8F9B\u6587 +tsi=\u6B3D\u897F\u5B89\u6587 +tsn=\u585E\u8332\u74E6\u7D0D\u6587 +tso=\u980C\u52A0\u6587 +tuk=\u571F\u5EAB\u66FC\u6587 +tum=\u5716\u59C6\u5E03\u5361\u6587 +tup=\u5716\u76AE\u8AF8\u8A9E\u8A00 +tur=\u571F\u8033\u5176\u6587 +tut=\u963F\u723E\u6CF0\u8AF8\u8A9E\u8A00 (\u5176\u4ED6) +tvl=\u5410\u74E6\u9B6F\u6587 +twi=\u5951\u7DAD\u6587 +tyv=\u571F\u51E1\u6587 +udm=\u6C83\u8482\u827E\u514B\u6587 +uga=\u70CF\u52A0\u5217\u6587 +uig=\u7DAD\u543E\u723E\u6587 +ukr=\u70CF\u514B\u862D\u6587 +umb=\u59C6\u672C\u675C\u6587 +und=\u672A\u78BA\u5B9A\u7684 +urd=\u70CF\u90FD\u6587 +uzb=\u70CF\u8332\u5225\u514B\u6587 +vai=\u8D8A\u5357\u6587 Vai +ven=\u6587\u9054\u6587 +vie=\u8D8A\u5357\u6587 +vol=\u6C83\u62C9\u666E\u514B\u6587 +vot=\u6C83\u63D0\u514B\u6587 +wak=\u74E6\u5361\u4EC0\u8AF8\u8A9E\u8A00 +wal=\u74E6\u62C9\u83AB\u6587 +war=\u74E6\u745E\u6587 +was=\u74E6\u7D39\u6587 +wel=\u5A01\u723E\u65AF\u6587 +wen=\u7D22\u5E03\u8AF8\u8A9E\u8A00 +wln=\u83EF\u9686\u6587 +wol=\u6C83\u6D1B\u592B\u6587 +xal=\u5361\u723E\u6885\u514B\u6587 +xho=\u5ED3\u85A9\u6587 +yao=\u7464\u6587 +yap=\u96C5\u6D66\u6587 +yid=\u610F\u7B2C\u7DD2\u6587 +yor=\u512A\u9B6F\u5DF4\u6587 +ypk=\u5C24\u76AE\u514B\u8AF8\u8A9E\u8A00 +zap=\u85A9\u6CE2\u7279\u514B\u6587 +zbl=\u5E03\u5217\u65AF\u7B26\u865F +zen=\u6FA4\u7D0D\u52A0\u6587 +zha=\u58EF\u6587 +znd=\u8D0A\u5FB7\u6587 +zul=\u7956\u9B6F\u6587 +zun=\u7956\u5C3C\u6587 +zxx=\u7121\u8A9E\u8A00\u5167\u5BB9 +zza=\u624E\u624E\u6587 + # script names # key is ISO 15924 script code -Hans=\u7c21\u9ad4\u4e2d\u6587 -Hant=\u7e41\u9ad4\u4e2d\u6587 +Arab=\u963F\u62C9\u4F2F\u6587 +Armi=\u7687\u5BA4\u4E9E\u7F8E\u5C3C\u4E9E\u6587 +Armn=\u4E9E\u7F8E\u5C3C\u4E9E\u6587 +Avst=\u963F\u672A\u65AF\u5854\u6587 +Bali=\u5CC7\u91CC\u6587 +Bamu=\u5DF4\u66FC\u6587 +Bass=\u5DF4\u85A9\u4F10\u6587 +Batk=\u5DF4\u5854\u514B\u6587 +Beng=\u5B5F\u52A0\u62C9\u6587 +Blis=\u5E03\u5217\u65AF\u7B26\u865F +Bopo=\u6CE8\u97F3\u7B26\u865F +Brah=\u5A46\u7F85\u7C73\u6587 +Brai=\u76F2\u4EBA\u7528\u9EDE\u5B57\u6CD5 +Bugi=\u5E03\u5409\u65AF\u6587 +Buhd=\u5E03\u5E0C\u5FB7\u6587 +Cakm=\u67E5\u514B\u99AC\u6587 +Cans=\u52A0\u62FF\u5927\u539F\u4F4F\u6C11\u901A\u7528\u5B57\u7B26 +Cari=\u5361\u91CC\u4E9E\u6587 +Cham=\u5360\u6587 +Cher=\u67F4\u7F85\u57FA\u6587 +Cirt=\u8272\u65AF\u6587 +Copt=\u79D1\u666E\u7279\u6587 +Cprt=\u585E\u6D66\u8DEF\u65AF\u6587 +Cyrl=\u897F\u91CC\u4FC4\u8A9E +Cyrs=\u897F\u91CC\u723E\u6587 (\u53E4\u6559\u6703\u65AF\u62C9\u592B\u6587\u8B8A\u9AD4) +Deva=\u68B5\u6587 +Dsrt=\u5FB7\u745F\u96F7\u7279\u6587 +Dupl=Duployan \u901F\u8A18\u6CD5 +Egyd=\u53E4\u57C3\u53CA\u4E16\u4FD7\u9AD4 +Egyh=\u53E4\u57C3\u53CA\u50E7\u4FB6\u9AD4 +Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587\u5B57 +Elba=\u611B\u723E\u5DF4\u6851\u6587 +Ethi=\u8863\u7D22\u5339\u4E9E\u6587 +Geok=\u683C\u9B6F\u5409\u4E9E\u8A9E\u7CFB (\u963F\u7D22\u4ED6\u8DEF\u91CC\u548C\u52AA\u65AF\u514B\u80E1\u91CC\u6587) +Geor=\u55AC\u6CBB\u4E9E\u6587 +Glag=\u683C\u62C9\u54E5\u91CC\u6587 +Goth=\u54E5\u5FB7\u6587 +Gran=\u683C\u862D\u85A9\u6587 +Grek=\u5E0C\u81D8\u6587 +Gujr=\u53E4\u5409\u62C9\u7279\u6587 +Guru=\u53E4\u723E\u7A46\u5947\u6587 +Hang=\u8AFA\u6587 +Hani=\u6F22\u8A9E +Hano=\u54C8\u52AA\u8AFE\u6587 +Hans=\u7C21\u9AD4\u4E2D\u6587 +Hant=\u7E41\u9AD4\u4E2D\u6587 +Hebr=\u5E0C\u4F2F\u4F86\u6587 +Hira=\u5E73\u5047\u540D +Hmng=\u694A\u677E\u9304\u82D7\u6587 +Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D +Hung=\u53E4\u5308\u7259\u5229\u6587 +Inds=\u5370\u5EA6\u6CB3\u6D41\u57DF (\u54C8\u62C9\u5E15\u6587) +Ital=\u53E4\u610F\u5927\u5229\u6587 +Java=\u722A\u54C7\u6587 +Jpan=\u65E5\u6587 +Kali=\u514B\u8036\u674E\u6587 +Kana=\u7247\u5047\u540D +Khar=\u5361\u7F85\u9808\u63D0\u6587 +Khmr=\u67EC\u57D4\u5BE8\u6587 +Knda=\u574E\u90A3\u9054\u6587 +Kore=\u97D3\u6587 +Kpel=\u514B\u4F69\u5217\u6587 +Kthi=\u5361\u5E1D\u6587 +Lana=\u85CD\u62FF\u6587 +Laoo=\u5BEE\u6587 +Latf=\u62C9\u4E01\u6587 (\u5C16\u89D2\u9AD4\u6D3B\u5B57\u8B8A\u9AD4) +Latg=\u62C9\u4E01\u6587 (\u84CB\u723E\u8A9E\u8B8A\u9AD4) +Latn=\u62C9\u4E01\u6587 +Lepc=\u96F7\u5E03\u67E5\u6587 +Limb=\u6797\u4F48\u6587 +Lina=\u7DDA\u6027\u6587\u5B57 A +Linb=\u7DDA\u6027\u6587\u5B57 B +Lisu=\u9ECE\u50F3\u6587 +Loma=\u6D1B\u99AC\u6587 +Lyci=\u5442\u897F\u4E9E\u8A9E +Lydi=\u91CC\u5E95\u4E9E\u8A9E +Mand=\u66FC\u5B89\u5E95\u6587 +Mani=\u6469\u5C3C\u6559\u6587 +Maya=\u746A\u96C5\u8C61\u5F62\u6587\u5B57 +Mend=\u9580\u8FEA\u8A9E +Merc=\u9EA5\u7F85\u57C3\u6587\u884C\u8349 +Mero=\u9EA5\u7F85\u57C3\u6587 +Mlym=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587 +Mong=\u8499\u53E4\u6587 +Moon=\u7A46\u6069\u9AD4\u76F2\u6587 +Mtei=\u66FC\u5C3C\u666E\u723E\u6587 +Mymr=\u7DEC\u7538\u6587 +Narb=\u5317\u963F\u62C9\u4F2F\u53E4\u6587 +Nbat=\u7D0D\u5DF4\u6CF0\u6587 +Nkgb=\u7D0D\u897F\u8FE6\u5DF4\u6587 +Nkoo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko) +Ogam=\u6B50\u7518\u6587 +Olck=\u6851\u5854\u5229\u6587 +Orkh=\u9102\u723E\u6E3E\u6587 +Orya=\u6B50\u5229\u4E9E\u6587 +Osma=\u6B50\u65AF\u66FC\u4E9E\u6587 +Palm=\u5E15\u7C73\u745E\u5C3C\u6587 +Perm=\u53E4\u5F7C\u723E\u59C6\u8AF8\u6587 +Phag=\u516B\u601D\u5DF4\u6587 +Phli=\u7891\u8A18\u6587\u6D3E\u9F8D\u7279\u6587 +Phlp=\u8A69\u7BC7\u96C6\u6D3E\u9F8D\u7279\u6587 +Phlv=\u66F8\u7C4D\u6D3E\u9F8D\u7279\u6587 +Phnx=\u8153\u5C3C\u57FA\u6587 +Plrd=\u67CF\u683C\u7406\u62FC\u97F3\u7B26 +Prti=\u7891\u8A18\u6587\u5DF4\u5E95\u4E9E\u6587 +Rjng=\u62C9\u8B93\u6587 +Roro=\u6717\u683C\u6717\u683C\u8C61\u5F62\u6587 +Runr=\u53E4\u5317\u6B50\u6587\u5B57 +Samr=\u6492\u99AC\u5229\u4E9E\u6587 +Sara=\u6C99\u62C9\u5824\u6587 +Sarb=\u5357\u963F\u62C9\u4F2F\u53E4\u6587 +Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u6587 +Sgnw=\u624B\u8A9E\u66F8\u5BEB\u7B26\u865F +Shaw=\u7C2B\u67CF\u7D0D\u5B57\u7B26 +Sind=\u4FE1\u5FB7\u6587 +Sinh=\u932B\u862D\u6587 +Sund=\u5DFD\u4E39\u6587 +Sylo=\u5E0C\u6D1B\u5F1F\u7D0D\u683C\u91CC\u6587 +Syrc=\u6558\u5229\u4E9E\u6587 +Syre=\u6558\u5229\u4E9E\u6587 (\u798F\u97F3\u9AD4\u6587\u5B57\u8B8A\u9AD4) +Syrj=\u6558\u5229\u4E9E\u6587 (\u897F\u65B9\u6587\u5B57\u8B8A\u9AD4) +Syrn=\u6558\u5229\u4E9E\u6587 (\u6771\u65B9\u6587\u5B57\u8B8A\u9AD4) +Tagb=\u5357\u5CF6\u6587 +Tale=\u50A3\u54EA\u6587 +Talu=\u65B0\u50A3\u6587 +Taml=\u5766\u7C73\u723E\u6587 +Tavt=\u50A3\u8D8A\u6587 +Telu=\u7279\u62C9\u53E4\u6587 +Teng=\u8AC7\u683C\u74E6\u6587 +Tfng=\u63D0\u975E\u7D0D (\u67CF\u67CF\u723E\u6587) +Tglg=\u5854\u52A0\u62C9\u65CF\u6587 +Thaa=\u5854\u5B89\u90A3\u6587 +Thai=\u6CF0\u6587 +Tibt=\u897F\u85CF\u6587 +Ugar=\u70CF\u52A0\u5217\u6587 +Vaii=\u8D8A\u5357\u6587 Vai +Visp=\u53EF\u898B\u8A9E\u8A00 +Wara=Warang Citi +Xpeo=\u53E4\u6CE2\u65AF\u6587 +Xsux=\u8607\u7C73\u9B6F\u4E9E\u7532\u6587\u6954\u5F62\u6587\u5B57 +Yiii=\u5F5D\u6587 +Zinh=\u907A\u50B3\u5B78\u8853\u8A9E +Zmth=\u6578\u5B78\u7B26\u865F +Zsym=\u7B26\u865F +Zxxx=\u64A4\u92B7\u5BEB\u5165 +Zyyy=\u4E00\u822C\u6587\u5B57 +Zzzz=\u8173\u672C\u672A\u77E5\u6216\u8005\u7121\u6548 # country names # key is ISO 3166 country code @@ -478,3 +1109,37 @@ ZA=\u5357\u975e ZM=\u5c1a\u6bd4\u4e9e ZW=\u8f9b\u5df4\u5a01 + +# territory names +# key is UN M.49 country and area code + +001=\u4E16\u754C +002=\u975E\u6D32 +003=\u5317\u7F8E\u6D32 +005=\u5357\u7F8E\u6D32 +009=\u5927\u6D0B\u6D32 +011=\u897F\u975E +013=\u4E2D\u7F8E\u6D32 +014=\u6771\u975E +015=\u5317\u975E +017=\u4E2D\u975E +018=\u975E\u6D32\u5357\u90E8 +019=\u7F8E\u6D32 +021=\u7F8E\u6D32\u5317\u90E8 +029=\u52A0\u52D2\u6BD4\u6D77 +030=\u6771\u4E9E +034=\u5357\u4E9E +035=\u6771\u5357\u4E9E +039=\u5357\u6B50 +053=\u6FB3\u6D32\u8207\u7D10\u897F\u862D +054=\u7F8E\u62C9\u5C3C\u897F\u4E9E +057=\u5BC6\u514B\u7F85\u5C3C\u897F\u4E9E +061=\u73BB\u91CC\u5C3C\u897F\u4E9E +142=\u4E9E\u6D32 +143=\u4E2D\u4E9E +145=\u897F\u4E9E +150=\u6B50\u6D32 +151=\u6771\u6B50 +154=\u5317\u6B50 +155=\u897F\u6B50 +419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/jvmti/minst/Minst.java --- a/jdk/src/share/demo/jvmti/minst/Minst.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/jvmti/minst/Minst.java Sat May 14 11:52:15 2011 -0700 @@ -45,7 +45,7 @@ */ public static void method_entry(int cnum, int mnum) { - Class x = Minst.class; + Class<Minst> x = Minst.class; synchronized ( x ) { if ( engaged > 0 ) { engaged = 0; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/FullThreadDump/Deadlock.java --- a/jdk/src/share/demo/management/FullThreadDump/Deadlock.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/FullThreadDump/Deadlock.java Sat May 14 11:52:15 2011 -0700 @@ -48,7 +48,7 @@ */ public class Deadlock { public static void main(String[] argv) { - Deadlock dl = new Deadlock(); + new Deadlock(); // Now find deadlock ThreadMonitor monitor = new ThreadMonitor(); @@ -112,6 +112,7 @@ this.mon2 = mon2; this.useSync = false; } + @Override public void run() { if (useSync) { syncLock(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java --- a/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java Sat May 14 11:52:15 2011 -0700 @@ -39,7 +39,6 @@ import java.lang.management.MonitorInfo; import javax.management.*; import java.io.*; -import java.util.*; /** * Example of using the java.lang.management API to dump stack trace @@ -167,7 +166,8 @@ } } - private void printMonitorInfo(ThreadInfo ti, MonitorInfo[] monitors) { + private void printMonitorInfo(ThreadInfo ti) { + MonitorInfo[] monitors = ti.getLockedMonitors(); System.out.println(INDENT + "Locked monitors: count = " + monitors.length); for (MonitorInfo mi : monitors) { System.out.println(INDENT + " - " + mi + " locked at "); @@ -201,6 +201,7 @@ ThreadInfo[] infos = tmbean.getThreadInfo(tids, true, true); for (ThreadInfo ti : infos) { printThreadInfo(ti); + printMonitorInfo(ti); printLockInfo(ti.getLockedSynchronizers()); System.out.println(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/JTop/JTop.java --- a/jdk/src/share/demo/management/JTop/JTop.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/JTop/JTop.java Sat May 14 11:52:15 2011 -0700 @@ -57,7 +57,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.Timer; @@ -69,10 +68,8 @@ import static java.lang.management.ManagementFactory.*; import java.awt.*; -import java.awt.event.*; import javax.swing.*; import javax.swing.border.*; -import javax.swing.event.*; import javax.swing.table.*; /** @@ -80,6 +77,8 @@ * in a table. */ public class JTop extends JPanel { + + private static final long serialVersionUID = -1499762160973870696L; private MBeanServerConnection server; private ThreadMXBean tmbean; private MyTableModel tmodel; @@ -122,29 +121,34 @@ } class MyTableModel extends AbstractTableModel { + private static final long serialVersionUID = -7877310288576779514L; private String[] columnNames = {"ThreadName", "CPU(sec)", "State"}; // List of all threads. The key of each entry is the CPU time // and its value is the ThreadInfo object with no stack trace. private List<Map.Entry<Long, ThreadInfo>> threadList = - Collections.EMPTY_LIST; + Collections.emptyList(); public MyTableModel() { } + @Override public int getColumnCount() { return columnNames.length; } + @Override public int getRowCount() { return threadList.size(); } + @Override public String getColumnName(int col) { return columnNames[col]; } + @Override public Object getValueAt(int row, int col) { Map.Entry<Long, ThreadInfo> me = threadList.get(row); switch (col) { @@ -164,7 +168,8 @@ } } - public Class getColumnClass(int c) { + @Override + public Class<?> getColumnClass(int c) { return getValueAt(0, c).getClass(); } @@ -207,12 +212,14 @@ * Format Double with 4 fraction digits */ class DoubleRenderer extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1704639497162584382L; NumberFormat formatter; public DoubleRenderer() { super(); setHorizontalAlignment(JLabel.RIGHT); } + @Override public void setValue(Object value) { if (formatter==null) { formatter = NumberFormat.getInstance(); @@ -238,12 +245,14 @@ } // Get the current thread info and CPU time + @Override public List<Map.Entry<Long, ThreadInfo>> doInBackground() { return getThreadList(); } // fire table data changed to trigger GUI update // when doInBackground() is finished + @Override protected void done() { try { // Set table model with the new thread list @@ -290,6 +299,7 @@ // A timer task to update GUI per each interval TimerTask timerTask = new TimerTask() { + @Override public void run() { // Schedule the SwingWorker to update the GUI jtop.newSwingWorker().execute(); @@ -299,6 +309,7 @@ // Create the standalone window with JTop panel // by the event dispatcher thread SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { createAndShowGUI(jtop); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/JTop/JTopPlugin.java --- a/jdk/src/share/demo/management/JTop/JTopPlugin.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/JTop/JTopPlugin.java Sat May 14 11:52:15 2011 -0700 @@ -40,13 +40,13 @@ import java.beans.PropertyChangeListener; import java.util.LinkedHashMap; import java.util.Map; -import javax.management.MBeanServerConnection; + import javax.swing.JPanel; import javax.swing.SwingWorker; -import com.sun.tools.jconsole.JConsolePlugin; import com.sun.tools.jconsole.JConsoleContext; import com.sun.tools.jconsole.JConsoleContext.ConnectionState; +import com.sun.tools.jconsole.JConsolePlugin; /** * JTopPlugin is a subclass to com.sun.tools.jconsole.JConsolePlugin @@ -70,6 +70,7 @@ /* * Returns a JTop tab to be added in JConsole. */ + @Override public synchronized Map<String, JPanel> getTabs() { if (tabs == null) { jtop = new JTop(); @@ -86,6 +87,7 @@ /* * Returns a SwingWorker which is responsible for updating the JTop tab. */ + @Override public SwingWorker<?,?> newSwingWorker() { return jtop.newSwingWorker(); } @@ -101,10 +103,10 @@ * Property listener to reset the MBeanServerConnection * at reconnection time. */ + @Override public void propertyChange(PropertyChangeEvent ev) { String prop = ev.getPropertyName(); if (prop == JConsoleContext.CONNECTION_STATE_PROPERTY) { - ConnectionState oldState = (ConnectionState)ev.getOldValue(); ConnectionState newState = (ConnectionState)ev.getNewValue(); // JConsole supports disconnection and reconnection // The MBeanServerConnection will become invalid when diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java --- a/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Sat May 14 11:52:15 2011 -0700 @@ -42,9 +42,6 @@ import javax.swing.border.EtchedBorder; import javax.swing.border.TitledBorder; import java.lang.management.*; -import java.util.*; - - /** * Demo code which plots the memory usage by all memory pools. * The memory usage is sampled at some time interval using @@ -53,6 +50,7 @@ */ public class MemoryMonitor extends JPanel { + private static final long serialVersionUID = -3463003810776195761L; static JCheckBox dateStampCB = new JCheckBox("Output Date Stamp"); public Surface surf; JPanel controls; @@ -84,6 +82,7 @@ controls.add(dateStampCB); dateStampCB.setFont(font); addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { removeAll(); if ((doControls = !doControls)) { @@ -128,28 +127,32 @@ public Surface() { setBackground(Color.black); addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if (thread == null) start(); else stop(); } }); - int i = 0; usedMem = new float[numPools][]; ptNum = new int[numPools]; } + @Override public Dimension getMinimumSize() { return getPreferredSize(); } + @Override public Dimension getMaximumSize() { return getPreferredSize(); } + @Override public Dimension getPreferredSize() { return new Dimension(135,80); } + @Override public void paint(Graphics g) { if (big == null) { @@ -315,13 +318,14 @@ notify(); } + @Override public void run() { Thread me = Thread.currentThread(); while (thread == me && !isShowing() || getSize().width == 0) { try { - thread.sleep(500); + Thread.sleep(500); } catch (InterruptedException e) { return; } } @@ -339,7 +343,7 @@ } repaint(); try { - thread.sleep(sleepAmount); + Thread.sleep(sleepAmount); } catch (InterruptedException e) { break; } if (MemoryMonitor.dateStampCB.isSelected()) { System.out.println(new Date().toString() + " " + usedStr); @@ -354,6 +358,7 @@ static class Memeater extends ClassLoader implements Runnable { Object y[]; public Memeater() {} + @Override public void run() { y = new Object[10000000]; int k =0; @@ -378,7 +383,7 @@ } - Class loadNext() throws ClassNotFoundException { + Class<?> loadNext() throws ClassNotFoundException { // public class TestNNNNNN extends java.lang.Object{ // public TestNNNNNN(); @@ -424,15 +429,15 @@ int len = begin.length + value.length + end.length; byte b[] = new byte[len]; - int i, pos=0; - for (i=0; i<begin.length; i++) { - b[pos++] = (byte)begin[i]; + int pos=0; + for (int i: begin) { + b[pos++] = (byte) i; } - for (i=0; i<value.length; i++) { - b[pos++] = value[i]; + for (byte v: value) { + b[pos++] = v; } - for (i=0; i<end.length; i++) { - b[pos++] = (byte)end[i]; + for (int e: end) { + b[pos++] = (byte) e; } return defineClass(name, b, 0, b.length); @@ -445,8 +450,11 @@ public static void main(String s[]) { final MemoryMonitor demo = new MemoryMonitor(); WindowListener l = new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) {System.exit(0);} + @Override public void windowDeiconified(WindowEvent e) { demo.surf.start(); } + @Override public void windowIconified(WindowEvent e) { demo.surf.stop(); } }; JFrame f = new JFrame("MemoryMonitor"); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/VerboseGC/PrintGCStat.java --- a/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java Sat May 14 11:52:15 2011 -0700 @@ -71,12 +71,10 @@ assert(false); } - Set mbeans = server.queryNames(poolName, null); + Set<ObjectName> mbeans = server.queryNames(poolName, null); if (mbeans != null) { pools = new ArrayList<MemoryPoolMXBean>(); - Iterator iterator = mbeans.iterator(); - while (iterator.hasNext()) { - ObjectName objName = (ObjectName) iterator.next(); + for (ObjectName objName : mbeans) { MemoryPoolMXBean p = newPlatformMXBeanProxy(server, objName.getCanonicalName(), @@ -88,9 +86,7 @@ mbeans = server.queryNames(gcName, null); if (mbeans != null) { gcmbeans = new ArrayList<GarbageCollectorMXBean>(); - Iterator iterator = mbeans.iterator(); - while (iterator.hasNext()) { - ObjectName objName = (ObjectName) iterator.next(); + for (ObjectName objName : mbeans) { GarbageCollectorMXBean gc = newPlatformMXBeanProxy(server, objName.getCanonicalName(), @@ -116,7 +112,9 @@ * of all memory pools as well as the GC statistics. */ public void printVerboseGc() { - System.out.print("Uptime: " + formatMillis(rmbean.getUptime())); + System.out.println("Uptime: " + formatMillis(rmbean.getUptime())); + System.out.println("Heap usage: " + mmbean.getHeapMemoryUsage()); + System.out.println("Non-Heap memory usage: " + mmbean.getNonHeapMemoryUsage()); for (GarbageCollectorMXBean gc : gcmbeans) { System.out.print(" [" + gc.getName() + ": "); System.out.print("Count=" + gc.getCollectionCount()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/VerboseGC/VerboseGC.java --- a/jdk/src/share/demo/management/VerboseGC/VerboseGC.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/VerboseGC/VerboseGC.java Sat May 14 11:52:15 2011 -0700 @@ -95,9 +95,8 @@ int port = -1; long interval = 5000; // default is 5 second interval long mins = 5; - for (int argIndex = 0; argIndex < args.length; argIndex++) { - String arg = args[argIndex]; - if (args[argIndex].startsWith("-")) { + for (String arg: args) { + if (arg.startsWith("-")) { if (arg.equals("-h") || arg.equals("-help") || arg.equals("-?")) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/nio/zipfs/Demo.java --- a/jdk/src/share/demo/nio/zipfs/Demo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/nio/zipfs/Demo.java Sat May 14 11:52:15 2011 -0700 @@ -42,7 +42,6 @@ import static java.nio.file.StandardOpenOption.*; import static java.nio.file.StandardCopyOption.*; - /* * ZipFileSystem usage demo * @@ -157,7 +156,6 @@ env.put("create", "true"); try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { Path path, src, dst; - boolean isRename = false; switch (action) { case rename: src = fs.getPath(args[2]); @@ -303,6 +301,7 @@ final String fStr = (args.length > 3)?args[3]:""; try (DirectoryStream<Path> ds = Files.newDirectoryStream(path, new DirectoryStream.Filter<Path>() { + @Override public boolean accept(Path path) { return path.toString().contains(fStr); } @@ -358,10 +357,18 @@ return null; } + @SuppressWarnings("unused") + /** + * Not used in demo, but included for demonstrational purposes. + */ private static byte[] getBytes(String name) { return name.getBytes(); } + @SuppressWarnings("unused") + /** + * Not used in demo, but included for demonstrational purposes. + */ private static String getString(byte[] name) { return new String(name); } @@ -534,6 +541,10 @@ Files.createDirectory(path); } + @SuppressWarnings("unused") + /** + * Not used in demo, but included for demonstrational purposes. + */ private static void rmdirs(Path path) throws IOException { while (path != null && path.getNameCount() != 0) { Files.delete(path); @@ -557,7 +568,11 @@ } } - // check the content of two paths are equal + @SuppressWarnings("unused") + /** + * Checks that the content of two paths are equal. + * Not used in demo, but included for demonstrational purposes. + */ private static void checkEqual(Path src, Path dst) throws IOException { //System.out.printf("checking <%s> vs <%s>...%n", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java --- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java Sat May 14 11:52:15 2011 -0700 @@ -38,14 +38,18 @@ * document. This is used in ScriptShellPanel class as document for editor. */ public class EditableAtEndDocument extends PlainDocument { + + private static final long serialVersionUID = 5358116444851502167L; private int mark; + @Override public void insertString(int offset, String text, AttributeSet a) throws BadLocationException { int len = getLength(); super.insertString(len, text, a); } + @Override public void remove(int offs, int len) throws BadLocationException { int start = offs; int end = offs + len; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java --- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java Sat May 14 11:52:15 2011 -0700 @@ -32,14 +32,10 @@ package com.sun.demo.scripting.jconsole; import com.sun.tools.jconsole.*; -import java.awt.*; -import java.awt.event.*; import java.io.*; -import java.lang.reflect.*; import java.util.concurrent.CountDownLatch; import javax.script.*; import javax.swing.*; -import javax.swing.event.*; import java.util.*; /** @@ -86,6 +82,7 @@ tabs.put("Script Shell", window); new Thread(new Runnable() { + @Override public void run() { // initialize the script engine initScriptEngine(); @@ -103,10 +100,12 @@ window.dispose(); } + @Override public String getPrompt() { return prompt; } + @Override public String executeCommand(String cmd) { String res; try { @@ -176,7 +175,7 @@ String oldFilename = (String) engine.get(ScriptEngine.FILENAME); engine.put(ScriptEngine.FILENAME, "<built-in jconsole." + extension + ">"); try { - Class myClass = this.getClass(); + Class<? extends ScriptJConsolePlugin> myClass = this.getClass(); InputStream stream = myClass.getResourceAsStream("/resources/jconsole." + extension); if (stream != null) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java --- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Sat May 14 11:52:15 2011 -0700 @@ -44,8 +44,11 @@ * A JPanel subclass containing a scrollable text area displaying the * jconsole's script console. */ + class ScriptShellPanel extends JPanel { + private static final long serialVersionUID = 4116273141148726319L; + // interface to evaluate script command and script prompt interface CommandProcessor { // execute given String as script and return the result @@ -75,9 +78,11 @@ add(scroller, BorderLayout.CENTER); editor.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { } + @Override public void insertUpdate(DocumentEvent e) { if (updating) return; beginUpdate(); @@ -90,10 +95,12 @@ // Trim "\\n" combinations final String cmd1 = trimContinuations(cmd); commandExecutor.execute(new Runnable() { + @Override public void run() { final String result = executeCommand(cmd1); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (result != null) { print(result + "\n"); @@ -113,6 +120,7 @@ } } + @Override public void removeUpdate(DocumentEvent e) { } }); @@ -121,6 +129,7 @@ // the JEditorPane to update the caret's position precisely the // size of the insertion editor.addCaretListener(new CaretListener() { + @Override public void caretUpdate(CaretEvent e) { int len = editor.getDocument().getLength(); if (e.getDot() > len) { @@ -133,6 +142,7 @@ hbox.add(Box.createGlue()); JButton button = new JButton("Clear"); // FIXME: i18n? button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { clear(); } @@ -148,6 +158,7 @@ commandExecutor.shutdown(); } + @Override public void requestFocus() { editor.requestFocus(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/lib/security/sunpkcs11-solaris.cfg --- a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/lib/security/sunpkcs11-solaris.cfg Sat May 14 11:52:15 2011 -0700 @@ -14,6 +14,8 @@ attributes = compatibility disabledMechanisms = { +# the following mechanisms are disabled due to lack of digest cloning support +# need to fix 6414899 first CKM_MD2 CKM_MD5 CKM_SHA_1 @@ -21,9 +23,6 @@ CKM_SHA384 CKM_SHA512 CKM_DSA_KEY_PAIR_GEN -# KEY_AND_MAC_DERIVE disabled due to Solaris bug 6306708 - CKM_SSL3_KEY_AND_MAC_DERIVE - CKM_TLS_KEY_AND_MAC_DERIVE # the following mechanisms are disabled due to performance issues (Solaris bug 6337157) CKM_DSA_SHA1 CKM_MD5_RSA_PKCS diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/native/java/lang/Throwable.c --- a/jdk/src/share/native/java/lang/Throwable.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/native/java/lang/Throwable.c Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2011, 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 @@ -44,7 +44,7 @@ * `this' so you can write 'throw e.fillInStackTrace();' */ JNIEXPORT jobject JNICALL -Java_java_lang_Throwable_fillInStackTrace(JNIEnv *env, jobject throwable) +Java_java_lang_Throwable_fillInStackTrace(JNIEnv *env, jobject throwable, int dummy) { JVM_FillInStackTrace(env, throwable); return throwable; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java --- a/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Sat May 14 11:52:15 2011 -0700 @@ -50,6 +50,8 @@ public native long getTotalPhysicalMemorySize(); public native long getOpenFileDescriptorCount(); public native long getMaxFileDescriptorCount(); + public native double getSystemCpuLoad(); + public native double getProcessCpuLoad(); static { initialize(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/sun/awt/X11/XListPeer.java --- a/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java Sat May 14 11:52:15 2011 -0700 @@ -1479,16 +1479,19 @@ int h = height - (SCROLLBAR_AREA + (2 * MARGIN)); hsb.setValue(hsb.getValue() + x); + int options = PAINT_ITEMS | PAINT_HSCROLL; + Rectangle source = null; Point distance = null; if (x < 0) { source = new Rectangle(MARGIN + SPACE, MARGIN, w + x, h); distance = new Point(-x, 0); + options |= COPY_AREA; } else if (x > 0) { source = new Rectangle(MARGIN + SPACE + x, MARGIN, w - x, h); distance = new Point(-x, 0); + options |= COPY_AREA; } - int options = COPY_AREA | PAINT_ITEMS | PAINT_HSCROLL; repaint(vsb.getValue(), lastItemDisplayed(), options, source, distance); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/sun/nio/ch/EPoll.java --- a/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Sat May 14 11:52:15 2011 -0700 @@ -99,8 +99,6 @@ // -- Native methods -- - private static native void init(); - private static native int eventSize(); private static native int eventsOffset(); @@ -116,6 +114,5 @@ static { Util.load(); - init(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java --- a/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Sat May 14 11:52:15 2011 -0700 @@ -432,8 +432,6 @@ // -- native methods -- - private static native void init(); - // sizeof inotify_event private static native int eventSize(); @@ -461,6 +459,5 @@ System.loadLibrary("nio"); return null; }}); - init(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/appletviewer.1 --- a/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,44 +19,34 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH appletviewer 1 "02 Jun 2010" +.TH appletviewer 1 "10 May 2011" .LP .SH "Name" appletviewer \- The Java Applet Viewer. .LP -.RS 3 - -.LP .LP The \f3appletviewer\fP command allows you to run applets outside of a web browser. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .LP \f4appletviewer\fP \f2[\fP \f2options\fP \f2] \fP\f2urls\fP ... .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3appletviewer\fP command connects to the documents or resources designated by \f2urls\fP and displays each applet referenced by the documents in its own window. Note: if the documents referred to by \f2urls\fP do not reference any applets with the \f2OBJECT\fP, \f2EMBED\fP, or \f2APPLET\fP tag, then \f3appletviewer\fP does nothing. For details on the HTML tags that \f3appletviewer\fP supports, see .na \f2AppletViewer Tags\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/appletviewertags.html. +http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html. .LP .LP \f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-debug diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/apt.1 --- a/jdk/src/solaris/doc/sun/man/man1/apt.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/apt.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH apt 1 "02 Jun 2010" +.TH apt 1 "10 May 2011" .LP .SH "NAME" @@ -50,21 +50,17 @@ .SH "DESCRIPTION" .LP .LP -The tool \f2apt\fP, annotation processing tool, includes a set of new reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. +\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. +.LP +.LP +The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. .LP .LP A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in .na \f4Getting Started with \fP\f4apt\fP. @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html -.LP -.RS 3 -.TP 3 -Note: -\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac(1)\fP tool and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool. -.RE - +http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html .LP .SH "OPTIONS" .LP @@ -90,6 +86,12 @@ .TP 3 \-factory classname Name of annotation processor factory to use; bypasses default discovery process +.TP 3 +\-version +Print version information. +.TP 3 +\-X +Display information about non\-standard options. .RE .LP @@ -109,10 +111,35 @@ .LP Consult the javac(1) man page for information on \f2javac\fP options. .LP +.SS +Non\-Standard Options +.LP +.RS 3 +.TP 3 +\-XListAnnotationTypes +List found annotation types. +.TP 3 +\-XListDeclarations +List specified and included declarations. +.TP 3 +\-XPrintAptRounds +Print information about initial and recursive \f2apt\fP rounds. +.TP 3 +\-XPrintFactoryInfo +Print information about which annotations a factory is asked to process. +.TP 3 +\-XclassesAsDecls +Treat both class and source files as declarations to process. +.RE + +.LP +.LP +\f3Note\fP: Because these options are non\-standard, they are subject to change without notice. +.LP .SH "NOTES" .LP .LP -The functionality of \f2apt\fP has been subsumed by the standard annotation\-processing infrastructure now offered by \f2javac\fP. Support for \f2apt\fP and its associated APIs may be discontinued in some future JDK release. +The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. .LP .SH "SEE ALSO" .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/extcheck.1 --- a/jdk/src/solaris/doc/sun/man/man1/extcheck.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/extcheck.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH extcheck 1 "02 Jun 2010" +.TH extcheck 1 "10 May 2011" .LP .SH "Name" extcheck \- A utility to detect jar conflicts .LP -.RS 3 - -.LP .LP \f3extcheck\fP detects version conflicts between a target jar file and currently installed extension jar files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3extcheck\fP utility checks a specified Jar file for title and version conflicts with any extensions installed in the Java(TM) SDK. Before installing an extension, you can use this utility to see if the same or a more recent version of the extension is already installed. .LP @@ -63,8 +55,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-verbose @@ -77,8 +67,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP jar(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/idlj.1 --- a/jdk/src/solaris/doc/sun/man/man1/idlj.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/idlj.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH idlj 1 "02 Jun 2010" +.TH idlj 1 "10 May 2011" .LP .SH "Name" idlj \- The IDL\-to\-Java Compiler .LP -.RS 3 - -.LP -\f3idlj\fP generates Java bindings from a given IDL file. -.RE +\f3idlj\fP generates Java bindings from a given IDL file. .SH "Synopsis" .LP - -.LP .nf \f3 .fl @@ -48,28 +42,62 @@ .LP .SH "Description" .LP - .LP The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the .na \f2OMG IDL to Java Language Language Mapping Specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP. +.LP .SS Emitting Client and Server Bindings .LP -.RS 3 +.LP +To generate Java bindings for an IDL file named My.idl: +.LP +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +This generates the client\-side bindings and is equivalent to: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-fclient\fP My.idl +.fl +.fi .LP -To generate Java bindings for an IDL file named My.idl: \f2idlj My.idl\fP +.LP +The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: .LP -This generates the client\-side bindings and is equivalent to: \f2idlj \fP\f4\-fclient\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fserver\fP My.idl +.fl +.fi + +.LP .LP -The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: \f2idlj \fP\f4\-fserver\fP\f2 My.idl\fP +Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: .LP -Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: \f2idlj \fP\f4\-fclient \-fserver\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fclient \-fserver\fP My.idl +.fl +idlj \f3\-fall\fP My.idl +.fl +.fi + .LP .LP There are two possible server\-side models: the Inheritance Model and the Tie Delegation Model. @@ -82,31 +110,47 @@ .na \f2org.omg.PortableServer.Servant\fP @ .fi -http://java.sun.com/javase/6/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements. +http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements. .LP .LP The \f2PortableServer\fP module for the .na \f2Portable Object Adapter (POA)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. .LP .LP Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible: .LP -\f2idlj \fP\f4\-fclient \-fserver\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fall\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fclient \-fserver\fP \f3\-oldImplBase\fP My.idl +.fl +idlj \f3\-fall\fP \f3\-oldImplBase\fP My.idl +.fl +.fi + .LP -Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP. +.LP +Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP. +.LP .LP The other server\-side model is called the Tie Model. This is a delegation model. Because it is not possible to generate ties and skeletons at the same time, they must be generated separately. The following commands generate the bindings for the Tie Model: .LP -\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fallTIE\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fall\fP My.idl +.fl +idlj \f3\-fallTIE\fP My.idl +.fl +.fi + .LP -For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance: +.LP +For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance: +.LP .nf \f3 .fl @@ -144,13 +188,21 @@ .fi .LP -You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method. +.LP +You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method. +.LP .LP To generate server\-side, Tie model bindings that are compatible with versions of the IDL to Java language mapping in versions prior to J2SE 1.4. .LP -\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fall\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fallTIE\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-oldImplBase\fP \f3\-fall\fP My.idl +.fl +idlj \f3\-oldImplBase\fP \f3\-fallTIE\fP My.idl +.fl +.fi + .LP .LP For the interface \f2My\fP, this will generate \f2My_Tie.java\fP. The constructor to \f2My_Tie\fP takes a \f2impl\fP. You must provide the implementation for \f2impl\fP, but it does not have to inherit from any other class, only the interface \f2HelloOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2My_Tie\fP. For instance: @@ -184,201 +236,383 @@ .fi .LP -.RE .SS Specifying Alternate Locations for Emitted Files .LP -.RS 3 +.LP +If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-td /altdir\fP My.idl +.fl +.fi .LP -If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as: -.RS 3 - .LP -\f2idlj \fP\f4\-td /altdir\fP\f2 My.idl\fP -.RE For the interface \f2My\fP, the bindings will be emitted to \f2/altdir/My.java\fP, etc., instead of \f2./My.java\fP. -.RE +.LP .SS Specifying Alternate Locations for Include Files .LP -.RS 3 +.LP +If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-i /includes\fP My.idl +.fl +.fi .LP -If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes\fP\f2 My.idl\fP +.LP +If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-i /includes \-i /moreIncludes\fP My.idl +.fl +.fi + +.LP .LP -If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes \-i /moreIncludes\fP\f2 My.idl\fP +Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: .LP -Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: \f2includes=/includes;/moreIncludes\fP +.nf +\f3 +.fl +includes=/includes;/moreIncludes +.fl +\fP +.fi + +.LP .LP The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the .na \f2Setting the Classpath\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general. -.RE +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general. +.LP .SS Emitting Bindings for Include Files .LP -.RS 3 +.LP +By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: +.LP + +.LP +.LP +\f4My.idl\fP +.LP +.nf +\f3 +.fl +#include <MyOther.idl> +.fl +interface My +.fl +{ +.fl +}; +.fl +\fP +.fi + +.LP + +.LP +.LP +\f4MyOther.idl\fP +.LP +.nf +\f3 +.fl +interface MyOther +.fl +{ +.fl +}; +.fl +\fP +.fi + +.LP + +.LP +.LP +The following command will only generate the java bindings for \f2My\fP: +.LP +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-emitAll\fP My.idl +.fl +.fi + +.LP +.LP +There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: +.LP .LP -By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: \f4My.idl\fP +.LP +\f4My.idl\fP .LP -\f2#include <MyOther.idl>\fP -.br -\f2interface My\fP -.br -\f2{\fP -.br -\f2};\fP -.br -\f4MyOther.idl\fP +.nf +\f3 +.fl +#include <MyOther.idl> +.fl +interface My +.fl +{ +.fl + #include <Embedded.idl> +.fl +}; +.fl +\fP +.fi + .LP -\f2interface MyOther\fP -.br -\f2{\fP -.br -\f2};\fP\ + +.LP +.LP +\f4MyOther.idl\fP .LP -The following command will only generate the java bindings for \f2My\fP: \f2idlj My.idl\fP +.nf +\f3 +.fl +interface MyOther +.fl +{ +.fl +}; +.fl +\fP +.fi + .LP -To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: \f2idlj \fP\f4\-emitAll\fP\f2 My.idl\fP + .LP -There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: \f4My.idl\fP +.LP +\f4Embedded.idl\fP .LP -\f2#include <MyOther.idl>\fP -.br -\f2interface My\fP -.br -\f2{\fP -.br -\f2\ #include <Embedded.idl>\fP -.br -\f2};\ \fP \f4MyOther.idl\fP +.nf +\f3 +.fl +enum E {one, two, three}; +.fl +\fP +.fi + +.LP + +.LP .LP -\f2interface MyOther\fP -.br -\f2{\fP -.br -\f2};\ \fP \f4Embedded.idl\fP +Running the following command: .LP -\f2enum E {one, two, three};\fP\ +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +will generate the following list of Java files: .LP -Running the following command: \f2idlj My.idl\fP +.nf +\f3 +.fl +./MyHolder.java +.fl +./MyHelper.java +.fl +./_MyStub.java +.fl +./MyPackage +.fl +./MyPackage/EHolder.java +.fl +./MyPackage/EHelper.java +.fl +./MyPackage/E.java +.fl +./My.java +.fl +\fP +.fi + .LP -will generate the following list of Java files: \f2./MyHolder.java\fP -.br -\f2./MyHelper.java\fP -.br -\f2./_MyStub.java\fP -.br -\f2./MyPackage\fP -.br -\f2./MyPackage/EHolder.java\fP -.br -\f2./MyPackage/EHelper.java\fP -.br -\f2./MyPackage/E.java\fP -.br -\f2./My.java\fP .LP -Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP). +Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP). +.LP .LP If the \f2\-emitAll\fP flag had been used in the previous example, then all types in all included files would be emitted. .LP -.RE .SS Inserting Package Prefixes .LP -.RS 3 +.LP +Suppose that you work for a company named ABC that has constructed the following IDL file: +.LP .LP -Suppose that you work for a company named ABC that has constructed the following IDL file: -.br -\f4Widgets.idl\fP +.LP +\f4Widgets.idl\fP .LP -\f2module Widgets\fP -.br -\f2{\fP -.br -\f2\ interface W1 {...};\fP -.br -\f2\ interface W2 {...};\fP -.br -\f2};\fP\ +.nf +\f3 +.fl +module Widgets +.fl +{ +.fl + interface W1 {...}; +.fl + interface W2 {...}; +.fl +}; +.fl +\fP +.fi + .LP -Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: \f2idlj \fP\f4\-pkgPrefix Widgets com.abc\fP\f2 Widgets.idl\fP + +.LP +.LP +Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: .LP -If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package. +.nf +\f3 +.fl +idlj \fP\f3\-pkgPrefix Widgets com.abc\fP Widgets.idl +.fl +.fi + +.LP +.LP +If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package. +.LP .LP If you have a number of these packages that require prefixes, it might be easier to place them into the \f2idl.config\fP file described above. Each package prefix line should be of the form: .LP -\f2PkgPrefix.<type>=<prefix>\fP +.nf +\f3 +.fl +PkgPrefix.<type>=<prefix> +.fl +\fP +.fi + .LP -So the line for the above example would be: \f2PkgPrefix.Widgets=com.abc\fP +So the line for the above example would be: +.nf +\f3 +.fl +PkgPrefix.Widgets=com.abc +.fl +\fP +.fi + .LP .LP The use of this option does not affect the Repository ID. .LP -.RE .SS Defining Symbols Before Compilation .LP -.RS 3 +.LP +You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command +.LP +.nf +\f3 +.fl +idlj \fP\f3\-d\fP MYDEF My.idl +.fl +.fi .LP -You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command \f2idlj \fP\f4\-d\fP\f2 MYDEF My.idl\fP .LP is the equivalent of putting the line \f2#define MYDEF\fP inside \f2My.idl\fP. -.RE +.LP .SS Preserving Pre\-Existing Bindings .LP -.RS 3 +.LP +If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command +.LP +.nf +\f3 +.fl +idlj \fP\f3\-keep\fP My.idl +.fl +.fi .LP -If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command \f2idlj \fP\f4\-keep\fP\f2 My.idl\fP .LP -emit all client\-side bindings that do not already exist. -.RE +emits all client\-side bindings that do not already exist. +.LP .SS Viewing Progress of Compilation .LP -.RS 3 +.LP +The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-v\fP My.idl +.fl +.fi .LP -The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: \f2idlj \fP\f4\-v\fP\f2 My.idl\fP .LP By default the compiler does not operate in verbose mode. -.RE +.LP .SS Displaying Version Information .LP -.RS 3 - -.LP .LP To display the build version of the IDL\-to\-Java compiler, specify the \f2\-version\fP option on the command\-line: .LP -.LP -\f2idlj \-version\fP +.nf +\f3 +.fl +idlj \-version +.fl +\fP +.fi + .LP .LP Version information also appears within the bindings generated by the compiler. Any additional options appearing on the command\-line are ignored. .LP -.RE .SH "Options" .LP - -.LP .RS 3 .TP 3 \-d symbol This is equivalent to the following line in an IDL file: -.RS 3 - -.LP .nf \f3 .fl @@ -386,7 +620,6 @@ .fl \fP .fi -.RE .TP 3 \-emitAll Emit all types, including those found in \f2#include\fP files. @@ -410,8 +643,9 @@ Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module. .TP 3 \-pkgTranslate type package -Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly. -.LP +Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly. +.br +.br If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include: .nf \f3 @@ -420,7 +654,6 @@ .fl \fP .fi -.LP The following translations would occur: .nf \f3 @@ -435,7 +668,6 @@ .fl \fP .fi -.LP The following package names cannot be translated: .RS 3 .TP 2 @@ -445,8 +677,7 @@ o \f2org.omg\fP or any subpackages of \f2org.omg\fP .RE -.LP -Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. +Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. .TP 3 \-skeletonName xxx%yyy Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are: @@ -481,11 +712,11 @@ .RE .LP -See the Description section for more option information. +.LP +See the Description section for more option information. +.LP .SH "Restrictions:" .LP - -.LP .RS 3 .TP 2 o @@ -498,8 +729,6 @@ .LP .SH "Known Problems:" .LP - -.LP .RS 3 .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH appletviewer 1 "14 Apr 2011" +.TH appletviewer 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/apt.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH apt 1 "14 Apr 2011" +.TH apt 1 "07 May 2011" .LP .SH "NAME" @@ -50,7 +50,10 @@ .SH "��" .LP .LP -��ġ�� \f2apt\fP �ϡ��ե쥯�� API �ȥ��ݡ��ȥ��ե饹�ȥ饯��㡼��鹽��졢�ץ��ޤ��\f2apt\fP ��ե쥯�� API �ϡ� ��ۻ��Υ��١��ǡ��ץ��๽¤�˴ؤ��ɤ߼��ѥӥ塼��󶡤��ޤ��Υ�ե쥯�� API �ϡ��Τ��ɲä��ˡ�Java(TM) �ץ��ߥ󥰸��η��ƥ��ǥ벽��褦��߷פ��Ƥ��ޤ��ǽ�ˡ�\f2apt\fP �ϡ��ɤ�¾�Υե��ץ��å��¹Ԥ��ޤ��ˡ�\f2apt\fP �ϡ��Υ��ե��ե��ξ��򥳥�ѥ��뤹�뤿�ᡢ��ȯ��ڤˤʤ�ޤ��ġ��ȤΥ��󥿥ե��˻��Ѥ��ե쥯�� API �ʤɤ� API �ϡ�\f2com.sun.mirror\fP �Υ��֥ѥå��Ǥ�� +\f3��\fP: \f2apt\fP �ġ��ȡ��ѥå�� \f2com.sun.mirror\fP �˴ޤޤ�Ƥ��뤽��˴�Ϣ�� API �ϡ�JDK 7 �ʹ��侩�ˤʤäƤ��ꡢJDK �μ��Υ᥸�㡼��꡼��Ǻ��ͽ��Ǥ��\f2javac(1)\fP �ġ��Ѳ�ǽ�ʥ��ץ��ȡ��ѥå�� \f2javax.annotation.processing\fP �� \f2javax.lang.model\fP �˴ޤޤ�Ƥ�� API ��Ѥ��ơ��Ƥ�� +.LP +.LP +��ġ�� \f2apt\fP �ϡ��ե쥯�� API �ȥ��ݡ��ȥ��ե饹�ȥ饯��㡼��鹽��졢�ץ��ޤ��\f2apt\fP ��ե쥯�� API �ϡ� ��ۻ��Υ��١��ǡ��ץ��๽¤�˴ؤ��ɤ߼��ѥӥ塼��󶡤��ޤ��Υ�ե쥯�� API �ϡ��Τ��ɲä��ˡ�Java(TM) �ץ��ߥ󥰸��η��ƥ��ǥ벽��褦��߷פ��Ƥ��ޤ��ǽ�ˡ�\f2apt\fP �ϡ��ɤ�¾�Υե��ץ��å��¹Ԥ��ޤ��ˡ�\f2apt\fP �ϡ��Υ��ե��ե��ξ��򥳥�ѥ��뤹�뤿�ᡢ��ȯ��ڤˤʤ�ޤ��ġ��ȤΥ��󥿥ե��˻��Ѥ��ե쥯�� API �ʤɤ� API �ϡ�\f2com.sun.mirror\fP �Υ��֥ѥå��Ǥ�� .LP .LP �ġ��ε�ǽ�˴ؤ��ܺ٤ȡ�\f2apt\fP ��Ѥ��ȯ��ˡ�ˤĤ��Ƥϡ� @@ -59,13 +62,6 @@ .fi http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html�򻲾Ȥ��Ƥ�� .LP -.RS 3 -.TP 3 -��: -\f2apt\fP �ε�ǽ�ϡ�\f2javac(1)\fP �ġ��ΰ��Ȥʤä��ե饹�ȥ饯��㡼��Ȥ߹��ޤ졢��٤Ƥ� Java ��ѥ��ǻ��ѤǤ��褦��ɸ�ಽ��ޤ��ο��ե饹�ȥ饯��㡼�ϡ��ǥ뤪�� Java �ץ�åȥե��ΰ��Ȥʤä�� API �˰�¸��ޤ��ץ��å��γ�ȯ�ϡ�� API �� \f2javac\fP �ġ��˴�Ť��ƹԤ��褦��ᤷ�ޤ�� -.RE - -.LP .SH "��ץ��" .LP .SS @@ -143,7 +139,7 @@ .SH "��" .LP .LP -\f2apt\fP �ε�ǽ�ϡ�\f2javac\fP �ˤ��󶡤��ɸ��ե饹�ȥ饯��㡼��Ȥ߹��ޤ�ޤ�� JDK ��꡼��Ǥϡ�\f2apt\fP ��Ӵ�Ϣ�� API �Υ��ݡ��Ȥ��ߤ��ǽ��ޤ�� +\f2apt\fP �ġ��ȡ��ѥå�� \f2com.sun.mirror\fP �˴ޤޤ�Ƥ��뤽��˴�Ϣ�� API �ϡ�JDK 7 �ʹ��侩�ˤʤäƤ��ꡢJDK �μ��Υ᥸�㡼��꡼��Ǻ��ͽ��Ǥ��\f2javac(1)\fP �ġ��Ѳ�ǽ�ʥ��ץ��ȡ��ѥå�� \f2javax.annotation.processing\fP �� \f2javax.lang.model\fP �˴ޤޤ�Ƥ�� API ��Ѥ��ơ��Ƥ�� .LP .SH "��Ϣ��" .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH extcheck 1 "14 Apr 2011" +.TH extcheck 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH idlj 1 "14 Apr 2011" +.TH idlj 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jar.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jar 1 "14 Apr 2011" +.TH jar 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jarsigner 1 "14 Apr 2011" +.TH jarsigner 1 "07 May 2011" .LP .SH "̾��" @@ -110,16 +110,16 @@ .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<��ȥ��Υѥ����>\fP\f3 .fl - \-keypass dukekeypasswd MyJARFile.jar duke + \-keypass \fP\f4<��Υѥ����>\fP\f3 MyJARFile.jar duke .fl \fP .fi .LP .LP -��ȥ��ϥѥ���ɤ��ݸ��Ƥ��Τǡ��ȥ��Υѥ���� (��Ǥ� mypass) ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤǥ��ȥ��Υѥ���ɤ��ꤷ�ʤ��ȡ��ѥ���ɤ��Ϥ��ޤ��Ʊ�ͤˡ��⥭��ȥ��ǥѥ���ɤˤ�ä��ݸ��Ƥ��뤿�ᡢ��Υѥ���� (��Ǥ� dukekeypasswd) ��ꤹ��ɬ�פ��ޤ�� ޥ�ɹԤ��Υѥ���ɤ��ꤷ�Ƥ��ʤ��ޤ��ꤷ��ѥ���Ȥ��¸��Ƥ��ѥ���ɤȰ�äƤ��ˤϡ��Υѥ���ɤ��Ϥ��ޤ�� +��ȥ��ϥѥ���ɤ��ݸ��Ƥ��Τǡ��ȥ��Υѥ���ɤ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤǥ��ȥ��Υѥ���ɤ��ꤷ�ʤ��ȡ��ѥ���ɤ��Ϥ��ޤ��Ʊ�ͤˡ��⥭��ȥ��ǥѥ���ɤˤ�ä��ݸ��Ƥ��뤿�ᡢ��Υѥ���ɤ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤ��Υѥ���ɤ��ꤷ�Ƥ��ʤ��ޤ��ꤷ��ѥ���Ȥ��¸��Ƥ��ѥ���ɤȰ�äƤ��ˤϡ��Υѥ���ɤ��Ϥ��ޤ�� .LP .SS ��ȥ��ξ�� @@ -500,7 +500,7 @@ .LP \f2file\fP �˻��ѤǤ��ʸ��ϡ�a\-zA\-Z0\-9_\-�פǤ��Ĥޤꡢʸ��ӥϥ��ե��ѤǤ��ޤ��: .SF �� .DSA �Υե��̾�Ǥϡ��ʸ��Ϥ��٤��ʸ��Ѵ��ޤ�� .LP -\-sigfile \f2��ץ��\fP ��ꤷ�ʤ��ä��硢.SF �ե�� .DSA �ե��Υ١��ե��̾�ϡ��ޥ�ɹԤǻ��ꤵ�줿��̾��Ƭ�� 8 ʸ��򤹤٤��ʸ��Ѵ��Τˤʤ�ޤ��̾�� 8 ʸ��̤��ξ��ϡ��̾��Τޤ޻Ȥ��ޤ��̾��ˡ��̾�ե��̾�˻��ѤǤ��ʤ�ʸ��ޤޤ�Ƥ��ϡ��ʸ�� (_) ��֤��ƥե��̾��ޤ�� +\-sigfile \f2\-sigfile\fP ��ץ��ꤷ�ʤ��ä��硢.SF �ե�� .DSA �ե��Υ١��ե��̾�ϡ��ޥ�ɹԤǻ��ꤵ�줿��̾��Ƭ�� 8 ʸ��򤹤٤��ʸ��Ѵ��Τˤʤ�ޤ��̾�� 8 ʸ��̤��ξ��ϡ��̾��Τޤ޻Ȥ��ޤ��̾��ˡ��̾�ե��̾�˻��ѤǤ��ʤ�ʸ��ޤޤ�Ƥ��ϡ��ʸ�� (_) ��֤��ƥե��̾��ޤ�� .TP 3 \-sigalg algorithm JAR �ե��ν�̾�˻��Ѥ��̾��르�ꥺ��̾��ꤷ�ޤ�� @@ -609,7 +609,7 @@ \fP .fi .TP 3 -\-Jjavaoption +�Ǥ��ޤ�javaoption ��ꤵ�줿 \f2javaoption\fP ʸ�� Java ��󥿥ץ꥿��ľ��Ϥ��ޤ��\f3jarsigner\fP �ϡ��ºݤˤ� Java ��󥿥ץ꥿��Ф��֥�åѡ��פǤ��Υ��ץ��ˤϡ��ޤ�뤳�ȤϤǤ��ޤ��󡣤��Υ��ץ��ϡ��¹ԴĶ��ޤ��ϥ��꡼��Ѥ�Ĵ��Ǥ��Ѳ�ǽ�ʥ��󥿥ץ꥿��ץ��ΰ��ɽ��ˤϡ� \f2java \-h\fP �ޤ�� \f2java \-X\fP �ȥ��ޥ�ɹԤ��Ϥ��ޤ�� .LP .TP 3 @@ -676,14 +676,14 @@ JAR �ե��ν�̾ .LP .LP -bundle.jar �Ȥ��̾�� JAR �ե��뤬��Ȥ��ޤ��Υե��ˡ��ȥ��̾�� jane �Ǥ��桼��Ȥäơ��̾��դ��Ȥ��ޤ��ȥ��ϡ�mystore �Ȥ��̾��ǡ�C �ɥ饤�֤� working �ǥ��쥯�ȥ�ˤ��ꡢ��ȥ��Υѥ���ɤ� mypass��\f2jane\fP ��Υѥ���ɤ� j638klm �Ȥ��ޤ��ξ�硢��Υ��ޥ�ɤ�¹Ԥ��ȡ�JAR �ե��˽�̾��դ�� sbundle.jar �Ȥ��̾�դ� JAR �ե��Ǥ��ޤ�� +bundle.jar �Ȥ��̾�� JAR �ե��뤬��Ȥ��ޤ��Υե��ˡ��ȥ��̾�� jane �Ǥ��桼��Ȥäơ��̾��դ��Ȥ��ޤ��ξ�硢��Υ��ޥ�ɤ�¹Ԥ��ȡ�JAR �ե��˽�̾��դ�� sbundle.jar �Ȥ��̾�դ� JAR �ե��Ǥ��ޤ�� .LP .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<��ȥ��Υѥ����>\fP\f3 .fl - \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane + \-keypass \fP\f4<��Υѥ����>\fP\f3 \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -800,7 +800,7 @@ ��Ȥä�� .LP .LP -��ڻ�� \-verify �� \-verbose ��ץ��˲ä�� \f2\-certs\fP ��ץ��ꤷ��ϡ� JAR �ե��γƽ�̾�Ԥξ��Ϥ��ޤ��ˤϡ��񥿥��ס��̾�Լ��̾�� (X.509 ��ξ��Τ�)�� JAR �ե��θ��ξ��񤬥��ȥ��ȥ�ξ��˰��פ��ˤϡ��̤ǰϤޤ줿��̾�ԤΥ��ȥ��̾��ޤޤ�ޤ��򼨤��ޤ�� +��ڻ�� \-verify �� \-verbose ��ץ��˲ä�� \f2\-certs\fP ��ץ��ꤷ��ϡ� �� JAR �ե��γƽ�̾�Ԥξ��Ϥ��ޤ��ˤϡ��񥿥��ס��̾�Լ��̾�� (X.509 ��ξ��Τ�)�� JAR �ե��θ��ξ��񤬥��ȥ��ȥ�ξ��˰��פ��ˤϡ��̤ǰϤޤ줿��̾�ԤΥ��ȥ��̾��ޤޤ�ޤ��Ȥ��С� .LP .nf \f3 @@ -862,7 +862,7 @@ JAR �ե��뤬��JDK 1.1 �� \f3javakey\fP �ġ��Ȥäƽ�̾��Ƥ��硢��̾�Ԥϥ��ǥ�ƥ��ƥ��ǡ��١��̾�Ǥ��ξ�硢��ڤν��Ϥˤ� i �Ȥ��椬�ޤޤ�ޤ��JAR �ե��뤬��ǥ�ƥ��ƥ��ǡ��١��̾�ȥ��ȥ��̾��ξ��ˤ�äƽ�̾��Ƥ��ϡ�k �� i ��ξ��ɽ��ޤ�� .LP .LP -\f2\-certs\fP ��ץ��ꤷ��硢��ȥ��̾�ϳ�̤ǰϤޤ��Τ��Ф��ǥ�ƥ��ƥ��ǡ��١��̾�ϳѳ�̤ǰϤޤ��ɽ��ޤ��Ȥ��С� +\f2\-certs\fP ��ץ��ꤷ��硢��ȥ��̾�ϳ�̤ǰϤޤ��Τ��Ф��ǥ�ƥ��ƥ��ǡ��١��̾�ϳѳ�̤ǰϤޤ��ɽ��ޤ��򼨤��ޤ�� .LP .nf \f3 @@ -978,7 +978,7 @@ .fl �� JAR �ˤϡ��Υ��ȥ��̾�ˤ�äƽ�̾��Ƥ��ʤ��̾�դ��ȥ꤬�ޤޤ�Ƥ��ޤ� .fl - + .fl \fP .fi @@ -993,7 +993,7 @@ .nf \f3 .fl -failure 1 +failure 1 .fl \fP .fi @@ -1649,7 +1649,7 @@ .na \f4jarsigner\fP\f2 �ġ��λ��ˤĤ��Ƥϡ�\fP @ .fi -http://download.oracle.com/javase/tutorial/index.html +http://download.oracle.com/javase/tutorial/security/index.html .na \f2��Java ��塼�ȥꥢ��\fP\f4��\fP @ .fi diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/java.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/java.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/java.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH java 1 "14 Apr 2011" +.TH java 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javac.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javac 1 "14 Apr 2011" +.TH javac 1 "07 May 2011" .LP .SH "̾��" @@ -136,10 +136,6 @@ \f3\-sourcepath\fP ��ץ��󤬻��ꤵ��Ƥ��ʤ��ϡ��ե��桼��饹�ѥ��鸡��ޤ�� .LP \f3\-processorpath\fP ��ץ��󤬻��ꤵ��Ƥ��ʤ��ϡ��ץ��å��桼��饹�ѥ��鸡��ޤ�� -.LP -�ص��塢 \f2*\fP �Υ١��̾��ޤ९�饹�ѥ��Ǥϡ��ǥ��쥯�ȥ��γ�ĥ�� \f2.jar\fP �ޤ�� \f2.JAR\fP ��Ĥ��٤ƤΥե��Υꥹ�Ȥ��ꤹ��Τ�Ʊ��Ȥߤʤ��ޤ�� -.LP -��Ȥ��С��ǥ��쥯�ȥ� \f2foo\fP �� \f2a.jar\fP �� \f2b.JAR\fP ��ޤޤ�Ƥ��硢��饹�ѥ�� \f2foo/*\fP �� \f2A.jar:b.JAR\fP ��Ÿ��ޤ��JAR �ե��ν��֤ϻ��ꤵ��ޤ��󡣤��Υꥹ�Ȥˤϡ��ե��ޤᡢ��ꤵ�줿�ǥ��쥯�ȥ��Τ��٤Ƥ� JAR �ե��뤬�ޤޤ�ޤ�� \f2*\fP ��륯�饹�ѥ��ȥ�ϡ��ߤΥǥ��쥯�ȥ��Τ��٤Ƥ� JAR �ե��Υꥹ�Ȥ�Ÿ��ޤ�� \f2CLASSPATH\fP �Ķ��ѿ��⡢��ˤ�Ʊ�ͤ�Ÿ��ޤ��\f3��:\fP ��ޥ�ɹԴĶ��ι��ˤ�äƤϡ� \f2javac \-cp "*.jar" MyClass.java\fP �ʤɤΤ褦�ˡ��磻��ɥ��ʸ��ǰϤळ�Ȥ�ɬ�פʾ��⤢��ޤ�� .TP 3 \-Djava.ext.dirs=directories ��󥹥ȡ��뷿��ĥ��ǽ�ΰ��֤򥪡��С��饤�ɤ��ޤ�� @@ -315,7 +311,7 @@ �侩��뤹�٤Ƥηٹ��ͭ��ˤ��ޤ��Υ�꡼��Ǥϡ��Ѳ�ǽ�ʤ��٤Ƥηٹ��ͭ��ˤ��뤳�Ȥ��侩��Ƥ��ޤ�� .TP 3 \-Xlint:none -Java ��ͤǤϻ��ꤵ��Ƥ��ʤ��٤Ƥηٹ��̵��ˤ��ޤ�� +��٤Ƥηٹ��̵��ˤ��ޤ�� .TP 3 \-Xlint:name �ٹ� \f2name\fP ��ͭ��ˤ��ޤ��Υ��ץ��ͭ��ˤǤ��ٹ�Υꥹ�ȤˤĤ��Ƥϡ��\-Xlint ��ץ��Ȥä�ͭ��ޤ��̵��ˤǤ��ٹ�פ򻲾Ȥ��Ƥ�� @@ -617,7 +613,7 @@ ��褹��ˤϡ��饹 \f2AnnosWithoutProcessors\fP ��ӻ��Ѥ��̾�� \f2Anno\fP �� \f2NotAnno\fP ��ѹ��ޤ�� .TP 3 rawtypes -raw ��Ф��̤��ˤĤ��Ʒٹ𤷤ޤ��äˤ��Υ��ץ��ϡ��ʤ��ѥ�᡼��줿��Ѥ��桼��Ф��Ʒٹ𤷤ޤ��ʸ�Ǥϡ� \f2rawtypes\fP �ٹ��ޤ�� +raw ��Ф��̤��ˤĤ��Ʒٹ𤷤ޤ��ʸ�Ǥϡ� \f2rawtypes\fP �ٹ��ޤ�� .nf \f3 .fl diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javadoc 1 "14 Apr 2011" +.TH javadoc 1 "07 May 2011" .SH "̾��" javadoc \- Java API �ɥ��ȥ��ͥ졼�� .LP @@ -38,11 +38,7 @@ ��ڡ��Ƕ��ڤ�줿��Ϣ�Υѥå��̾�Ǥ��Ȥ��С� \f2java.lang\ java.lang.reflect\ java.awt �Τ褦�˻��ꤷ�ޤ�\fP��ɥ��Ȳ��ѥå��̤˻��ꤹ��ɬ�פ��ޤ��磻��ɥ��ɤϻ��ԲĤǤ��Ƶ�Ū��Τ��ˤϡ�\-subpackages ��Ѥ��ޤ��Javadoc �ġ��ϡ�\f2\-sourcepath\fP ��Ѥ��Ƥ��Υѥå��̾�򸡺��ޤ��1 �İʾ�Υѥå��Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ�� .TP 3 sourcefilenames -��ڡ��Ƕ��ڤ�줿��Ϣ�Υ��ե��̾�Ǥ�� ƥե��ϡ��ѥ��ǻϤޤ�ޤ��ꥹ�� (*) �ʤɤΥ磻��ɥ��ɤ�ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��뤬��Τϡ��ե��̾��.java�פȤ��ĥ�Ҥǽ��ꡢ��γ�ĥ�Ҥ��̾��ºݤ�ͭ��ʥ��饹̾�Ǥ��뤹�٤ƤΥե��Ǥ� ( -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625�򻲾�)��äơ��ϥ��ե��ޤ�̾�� ( \f2X\-Buffer\fP �ʤ�) �䡢��¾��̵��ʸ��ޤ�̾��դ��뤳�Ȥˤ�äơ��Υե��ɥ��Ȳ��оݤ��Ǥ��ޤ��ϡ��ƥ��ѤΥե��䡢�ƥ�ץ졼�Ȥ��줿�ե��ξ��Ǥ��ե��̾��˻��ꤷ��ѥ��ˤ�äơ�javadoc ��Υե��򸡺��꤬��ޤ�ޤ��Javadoc �ġ��ϡ��Υ��ե��̾�򸡺��Ȥ��ˤ� \f2\-sourcepath\fP ��Ѥ��ޤ��Хѥ��ϸ��ߤΥǥ��쥯�ȥ��Ȥ��뤿�ᡢ \f2Button.java\fP ��Ϥ��Ȥϡ� \f2./Button.java\fP ��Ϥ��Ȥ�Ʊ��Ǥ��ե��̾��ե�ѥ��ǻ��ꤹ��ȡ� \f2/home/src/java/awt/Graphics*.java �Τ褦�ˤʤ�ޤ�\fP�� 1 �İʾ�Υ��饹�Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ��ޤ��֥ѥå��ȥ��饹�Υɥ��Ȳ��פ��Τ褦�ˡ��ѥå��̾�ȥ��ե��̾�򺮺ߤ��뤳�Ȥ�Ǥ��ޤ�� +��ڡ��Ƕ��ڤ�줿��Ϣ�Υ��ե��̾�Ǥ�� ƥե��ϡ��ѥ��ǻϤޤ�ޤ��ꥹ�� (*) �ʤɤΥ磻��ɥ��ɤ�ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��뤬��Τϡ��ե��̾��.java�פȤ��ĥ�Ҥǽ��ꡢ��γ�ĥ�Ҥ��̾��ºݤ�ͭ��ʥ��饹̾�Ǥ��뤹�٤ƤΥե��Ǥ� (Java ��ͤ򻲾�)��äơ��ϥ��ե��ޤ�̾�� ( \f2X\-Buffer\fP �ʤ�) �䡢��¾��̵��ʸ��ޤ�̾��դ��뤳�Ȥˤ�äơ��Υե��ɥ��Ȳ��оݤ��Ǥ��ޤ��ϡ��ƥ��ѤΥե��䡢�ƥ�ץ졼�Ȥ��줿�ե��ξ��Ǥ��ե��̾��˻��ꤷ��ѥ��ˤ�äơ�javadoc ��Υե��򸡺��꤬��ޤ�ޤ��Javadoc �ġ��ϡ��Υ��ե��̾�򸡺��Ȥ��ˤ� \f2\-sourcepath\fP ��Ѥ��ޤ��Хѥ��ϸ��ߤΥǥ��쥯�ȥ��Ȥ��뤿�ᡢ \f2Button.java\fP ��Ϥ��Ȥϡ� \f2./Button.java\fP ��Ϥ��Ȥ�Ʊ��Ǥ��ե��̾��ե�ѥ��ǻ��ꤹ��ȡ� \f2/home/src/java/awt/Graphics*.java �Τ褦�ˤʤ�ޤ�\fP�� 1 �İʾ�Υ��饹�Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ��ޤ��֥ѥå��ȥ��饹�Υɥ��Ȳ��פ��Τ褦�ˡ��ѥå��̾�ȥ��ե��̾�򺮺ߤ��뤳�Ȥ�Ǥ��ޤ�� .TP 3 \-subpackages pkg1:pkg2:... ��ե��뤫��ꤵ�줿�ѥå��Ӥ��Υ��֥ѥå��˺Ƶ�Ū�˥ɥ��Ȥ��ޤ��ѥå��̾�ޤ��ϥ��ե��̾��ꤹ��ɬ�פϤ��ޤ�� @@ -62,11 +58,7 @@ .RS 3 .TP 2 o -̾��\f2.java\fP�פ��ȼºݤ�ͭ��ʥ��饹̾�ˤʤäƤ�� (ͭ��ʸ��ˤĤ��Ƥ� -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625�򻲾�) +̾��\f2.java\fP�פ��ȡ��ºݤ�ͭ��ʥ��饹̾�ˤʤäƤ�� (Java ��ͤ�ͭ��ʸ��򻲾�) .TP 2 o ��ĥ꡼�Υ롼�Ȥ��Ū�ʥǥ��쥯�ȥ�ѥ��ڤ�ʸ��ɥåȤ��Ѵ��ȡ��ºݤ�ͭ��ʥѥå��̾�ˤʤäƤ�� @@ -111,11 +103,7 @@ .LP �ºݤˤϡ�Javadoc �ġ��ϡ��᥽�å��Τ��ʤ��ʥ��֥ե��Ǥ��褦�� \f2.java\fP ��ե��Ǥ�ư��ޤ��äơ�API �κ��ˤϡ��򵭽Ҥ��߷פ��ᤤ�ʳ��ǡ��ɥ��ơ��󥳥��Ȥ򵭽Ҥ�� javadoc �ġ��¹ԤǤ��ޤ�� .LP -��ѥ��˰�¸��뤳�Ȥˤ�äơ�HTML ��Ϥϡ��ºݤμ��Τ��б��ޤ��ºݤμ��ϡ��Ū�ʥ��ɤˤǤϤʤ��ۤΥ��ɤ˰�¸��礬��ޤ��Ȥ��С�Javadoc �ġ��ϡ�.class �ե��ˤ�¸�ߤ��뤬��ɤˤ�¸�ߤ��ʤ� -.na -\f2�ǥե��ȥ��󥹥ȥ饯��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (Java ��ͤΥ�� 8.6.7) \f2��ɥ��Ȳ�\fP ��ޤ�� +��ѥ��˰�¸��뤳�Ȥˤ�äơ�HTML ��Ϥϡ��ºݤμ��Τ��б��ޤ��ºݤμ��ϡ��Ū�ʥ��ɤˤǤϤʤ��ۤΥ��ɤ˰�¸��礬��ޤ��Ȥ��С�Javadoc �ġ��ϡ�.class �ե��ˤ�¸�ߤ��뤬��ɤˤ�¸�ߤ��ʤ��ǥե��ȥ��󥹥ȥ饯�� (Java ��ͤ򻲾�) \f2��ɥ��Ȳ�\fP ��ޤ�� .LP �̾Javadoc �ġ��Ǥϡ��ե��Υ��ɤ��Դ��ޤ��ϥ��顼��ޤ�Ǥ��Ǥ�ɥ��Ȥ��Ǥ��ޤ��Τ��ᡢ�ǥХå��ȥ�֥륷�塼�ƥ��󥰤�λ��˥ɥ��Ȥ��Ǥ��ޤ��Ȥ��С�Java ��ͤˤ��ȡ��ݥ᥽�åɤ�ޤ९�饹�ϡ��켫��ݤȤ��ʤ��Фʤ�ޤ��󡣤��Υ��顼�򸡽Ф��ȡ�javac ��ѥ��ߤ��ޤ��Javadoc �ġ��Ϸٹ��Ф��˽��³�Ԥ��ޤ��Javadoc �ġ��ϥɥ��ơ��󥳥��Ȥδ��Ū�ʥ��å��Ԥ��ޤ��ɥ��ơ��󥳥��Ȥ��ܤ��å��ɬ�פ��ϡ�DocCheck �ɥå��åȤ��Ѥ��Ƥ�� .LP @@ -161,7 +149,7 @@ .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html \- �ɥ��ơ��󥳥��Ȥε��ˡ�˴ؤ�� Sun �ε�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html \- �ɥ��ơ��󥳥��Ȥε��ˡ�˴ؤ�� Sun �ε�� .TP 2 o .na @@ -179,13 +167,13 @@ .na \f2DocCheck �ɥå��å�\fP @ .fi -http://java.sun.com/javadoc/doccheck \- ��ե��Υɥ��ơ��󥳥��Ȥ��å��Ф��줿��顼��Υ�ݡ��Ȥ��ޤ��Doc Check �桼�ƥ��ƥ��ΰ��Ǥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ��ե��Υɥ��ơ��󥳥��Ȥ��å��Ф��줿��顼��Υ�ݡ��Ȥ��ޤ��Doc Check �桼�ƥ��ƥ��ΰ��Ǥ�� .TP 2 o .na \f2MIF �ɥå��å�\fP @ .fi -http://java.sun.com/javadoc/mifdoclet \- MIF��FrameMaker��PDF �ν񼰤� API �ɥ��Ȥ�ư��ޤ��MIF �� Adobe FrameMaker �θ򴹽񼰤Ǥ�� +http://java.sun.com/j2se/javadoc/mifdoclet/ \- MIF��FrameMaker��PDF �ν񼰤� API �ɥ��Ȥ�ư��ޤ��MIF �� Adobe FrameMaker �θ򴹽񼰤Ǥ�� .RE .SS �Ѹ� @@ -218,7 +206,7 @@ .na \f21.3\fP @ .fi -http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ��ѹ��Ƥ��ޤ��javadoc �ġ��¹Ԥ��Ȥ��ϡ�Javadoc �Υ֡��ȥ��饹�ѥ��ӥ��饹�ѥ��ˤ��뤹�٤Ƥλ��ȥ��饹��꡼�˥��ɤ��ɬ�פ��ޤ��ȥ��饹��Ĥ��ʤ��ϡ��֥��饹��Ĥ��ޤ��פȤ��ٹ�ɽ��ޤ��Javadoc �ġ��ϡ��饹��¸�ߤȤ��Υ��С��δ��̾��Ƚ�̤��Τ�ɬ�פʤ��٤Ƥξ��.class �ե��뤫��Ф��Ȥ��Ǥ��ޤ�� +http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ��ѹ��Ƥ��ޤ��javadoc �ġ��¹Ԥ��Ȥ��ϡ�Javadoc �Υ֡��ȥ��饹�ѥ��ӥ��饹�ѥ��ˤ��뤹�٤Ƥλ��ȥ��饹��꡼�˥��ɤ��ɬ�פ��ޤ��ȥ��饹��Ĥ��ʤ��ϡ��֥��饹��Ĥ��ޤ��פȤ��ٹ�ɽ��ޤ��Javadoc �ġ��ϡ��饹��¸�ߤȤ��Υ��С��δ��̾��Ƚ�̤��Τ�ɬ�פʤ��٤Ƥξ��.class �ե��뤫��Ф��Ȥ��Ǥ��ޤ�� .LP .TP 3 ��ȥ��饹 (external referenced classes) @@ -310,7 +298,7 @@ .na \f2package.html\fP�� @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments�򻲾Ȥ��Ƥ�� .LP \f3�ѥå��ȥե��ν��\fP \- Javadoc �ġ��ϡ��¹Ի��˥ѥå��ȥե��ưŪ�˸��Υե��򸫤Ĥ��ȼ��ν��Ԥ��ޤ�� .RS 3 @@ -350,7 +338,7 @@ .RS 3 .TP 2 o -\f2<body>\fP �� \f2</body>\fP ��δ֤ˤ��뤹�٤Ƥ��Ƥ��оݤȤ��ƥ��ԡ�� +\f2<body>\fP �� \f2</body>\fP ��δ֤ˤ��뤹�٤Ƥ��Ƥ��оݤȤ��ƥ��ԡ�� .TP 2 o ��ץ��С��٤ƽ�� @@ -408,11 +396,7 @@ .LP �ƥ��ȥե�� doc ��Ȥ��ޤޤ��硢��Τ褦�˥磻��ɥ��ɤ�ޤ��ƥ��ȥ��ե��̾��Ϥ��ƥƥ��ȥե��Υɥ��Ȥ��褦�ˡ�Javadoc �ġ��̸Ĥ˼¹ԤǤ��褦��Ǥ��ޤ��Ȥ��С� \f2com/package1/test\-files/*.java �ʤɤǤ�\fP�� .LP -\f3��ե��Υƥ�ץ졼��\fP \- �ƥ�ץ졼�ȥե��̾��ϡ�.java�פǽ��뤳�Ȥ⤢��ޤ��ƥ�ץ졼�ȥե��ϥ��ѥ��Ǥ��ޤ��󡣥��ǥ��쥯�ȥ��ݻ��ե��Υƥ�ץ졼�Ȥ��ϡ� \f2Buffer\-Template.java\fP �Τ褦�˥ϥ��ե�䤽��¾��̵�� Java ʸ��̾��˴ޤ�뤳�Ȥǡ��ƥ�ץ졼�Ȥ��ʤ��褦�ˤ��ޤ��ϡ�Javadoc �ġ��뤬��Τϡ��.java��̾�� Υ��饹̾�Ǥ��륽��ե��Ǥ��뤿��Ǥ� ( -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625��)�� +\f3��ե��Υƥ�ץ졼��\fP \- �ƥ�ץ졼�ȥե��̾��ϡ�.java�פǽ��뤳�Ȥ⤢��ޤ��ƥ�ץ졼�ȥե��ϥ��ѥ��Ǥ��ޤ��󡣥��ǥ��쥯�ȥ��ݻ��ե��Υƥ�ץ졼�Ȥ��ϡ� \f2Buffer\-Template.java\fP �Τ褦�˥ϥ��ե�䤽��¾��̵�� Java ʸ��̾��˴ޤ�뤳�Ȥǡ��ƥ�ץ졼�Ȥ��ʤ��褦�ˤ��ޤ��ϡ�Javadoc �ġ��뤬��Τϡ��.java��̾�� Υ��饹̾�Ǥ��륽��ե��Ǥ��뤿��Ǥ� (Java ��ͤΡ�Identifiers�פ˴ؤ��򻲾�)�� .SH "��ե��" .LP �ǥե��ȤǤϡ�javadoc �ġ��ϡ�HTML ��Υɥ��Ȥ��ɸ��ɥå��åȤ�Ȥ��ޤ��Υɥå��åȤϡ��ʲ��μ��Υե��ޤ��줾�� HTML �ڡ��ϡ��ġ��Υե��ޤ��javadoc ��ե��̾��ˤϡ��饹�䥤�󥿥ե��̾��ˤ��ʤ��Τȡ��Ǥʤ�� ( \f2package\-summary.html �ʤ�\fP) �� 2 ��ब��ޤ��ԤΥ��롼�פΥե��̾�ˤϡ��ԤΥ��롼�פȥե��̾��礷�ʤ��褦�ˡ��ϥ��ե󤬴ޤޤ�Ƥ��ޤ�� @@ -756,7 +740,7 @@ ��ư��ϥС�� 1.3 ��ư��Ȥ��о�Ū�Ǥ��ޤǤΥС��Ǥϡ��ޤ��ϥ��¸�ߤ��С��Ȥϰ��ڷѾ��ޤ��Ǥ�� .TP 2 o -\f3{@inheritDoc} ��ޤॳ��Ȥ��Ū�˷Ѿ��\fP \- ��饤�󥿥� \f2{@inheritDoc}\fP �򡢥᥽�åɤμ��ޤ�� \f2@return\fP�� \f2@param\fP �� \f2@throws\fP �Τ��줫�Υ��ޤ��б��Ѿ��줿��ޤ��ϥ��Ȥ��ΰ��֤˥��ԡ��ޤ�� +\f3{@inheritDoc} ��ޤॳ��Ȥ��Ū�˷Ѿ��\fP \- ��饤�󥿥� \f2{@inheritDoc}\fP �򡢥᥽�åɤμ��ޤ�� \f2@return\fP �� \f2@param\fP ��ޤ�� \f2@throws\fP �Τ��줫�Υ��ޤ��б��Ѿ��줿��ޤ��ϥ��Ȥ��ΰ��֤˥��ԡ��ޤ�� .RE .LP �ɥ��ơ��󥳥��Ȥ�ºݤ˥��ԡ��Ѥ��ˤϡ��Ѿ��᥽�åɤΥ��ե��뤬 \-sourcepath �ǻ��ꤷ��ѥ��֤��Ƥ��뤳�Ȥ�ɬ�פˤʤ�ޤ��ޥ�ɹԤǡ��饹��ѥå��Ϥ�ɬ�פϤ��ޤ��󡣤��ϡ��饹��ɥ��Ȳ��륯�饹�Ǥʤ��Фʤ�ʤ��ä� 1.3.x ��Υ�꡼��Ȱۤʤ�ޤ�� @@ -954,7 +938,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 867 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 851 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1079,7 +1063,7 @@ .na \f2@author ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author�򻲾Ȥ��Ƥ�� .LP .RS 3 .TP 3 @@ -1094,11 +1078,11 @@ .na \f2@deprecated ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated�򻲾Ȥ��Ƥ�� .RS 3 .TP 2 o -Javadoc 1.2 �ʹߤǤ� \f2{@link}\fP ��Ѥ��ޤ��ˤ�ꡢɬ�פʾ��˥��饤��ǥ�󥯤��Ǥ��ޤ��Ȥ��С� +Javadoc 1.2 �ʹߤǤ� \f2{@link}\fP ��Ѥ��ޤ��ˤ�ꡢɬ�פʾ��˥��饤��ǥ�󥯤��Ǥ��ޤ��򼨤��ޤ�� .nf \f3 .fl @@ -1292,7 +1276,7 @@ .na \f2{@link} ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}�򻲾Ȥ��Ƥ�� .LP .TP 3 {@linkplain\ package.class#member\ label} @@ -1386,7 +1370,7 @@ .na \f2@param ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param�򻲾Ȥ��Ƥ�� .LP .TP 3 @return\ description @@ -1396,7 +1380,7 @@ .na \f2@return ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return�򻲾Ȥ��Ƥ�� .LP .TP 3 @see\ reference @@ -1644,7 +1628,7 @@ .nr 40 \n(79+(0*\n(38) .nr 80 +\n(40 .nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1358 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1342 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1751,7 +1735,7 @@ .LP \f3@see �θ��\fP \- Javadoc �ġ��ϡ��ե�� (.java)��ѥå��ե�� (package.html �ޤ�� package\-info.java) �ޤ��ϳ��ץե�� (overview.html) �˴ޤޤ�� \f2@see\fP ��ޤ��Ԥ� 2 �ĤΥե��Ǥϡ��̾�� \f2@see\fP ��˻��ꤷ�ʤ��Фʤ�ޤ��󡣥��ե��Ǥϡ��̾��ޤ��ʬ��̾��Ǥ��ޤ�� .LP -Javadoc �ġ��ϡ��Ǥʤ�̾��Ҥ��줿 \f2@see\fP �� \f2.java �ե��Ǹ��Ĥ��ȡ�\fP Java ��ѥ��Ʊ��ǻ��ꤵ�줿̾��򸡺��ޤ�� Javadoc �ġ��ϡ��̾��֤Τ��ޤ��򸡽Ф��ޤ�� ϡ��ɤˤ��Υ��顼��¸�ߤ��Ƥ��ʤ��Ȥ��Ȥ��Ƥ��뤿��Ǥ��θ��ϡ�Java �� 2 �Ǥ�� 6 �ϡ�Names�פ��Ƥ��ޤ��Javadoc �ġ��ϡ��Ϣ��륯�饹�ȥѥå��ӥ��ݡ��Ȥ��줿��饹�ȥѥå��Τ��٤Ƥ��̾��򸡺��ޤ��Ū�ˤϡ��ν��Ǹ��ޤ�� +Javadoc �ġ��ϡ��Ǥʤ�̾��Ҥ��줿 \f2@see\fP �� \f2.java �ե��Ǹ��Ĥ��ȡ�\fP Java ��ѥ��Ʊ��ǻ��ꤵ�줿̾��򸡺��ޤ�� Javadoc �ġ��ϡ��̾��֤Τ��ޤ��򸡽Ф��ޤ�� ϡ��ɤˤ��Υ��顼��¸�ߤ��Ƥ��ʤ��Ȥ��Ȥ��Ƥ��뤿��Ǥ��θ��ϡ�\f2Java ��\fP��Ƥ��ޤ��Javadoc �ġ��ϡ��Ϣ��륯�饹�ȥѥå��ӥ��ݡ��Ȥ��줿��饹�ȥѥå��Τ��٤Ƥ��̾��򸡺��ޤ��Ū�ˤϡ��ν��Ǹ��ޤ�� .RS 3 .TP 3 1. @@ -1990,7 +1974,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 1434 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1418 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2131,7 +2115,7 @@ .LP \f3@see ��\fP .br -��¦�Υ��Ȥϡ� \f2@see\fP �� \f2java.applet.Applet\fP �Τ褦��̤Υѥå��Υ��饹��ˤ��ˡ�̾��ɤΤ褦��ɽ��뤫�򼨤��Ƥ��ޤ�� +��¦�Υ��Ȥϡ� \f2@see\fP �� \f2java.applet.Applet\fP �ʤɤ��̤Υѥå��Υ��饹��ˤ��ˡ�̾��ɤΤ褦��ɽ��뤫�򼨤��Ƥ��ޤ�� .nf \f3 .fl @@ -2163,7 +2147,7 @@ .na \f2@see ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see�򻲾Ȥ��Ƥ�� .RE .RE .LP @@ -2198,7 +2182,7 @@ .na \f2��ľ�󲽤� FAQ��\fP @ .fi -http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing�⻲�Ȥ��Ƥ�� FAQ �ˤϡ��\-private ��å��ꤷ�ʤ�� javadoc ��¹Ԥ��Ƥ��Τ� private �ե��ɤ� @serial ��Ĥ��ʤ��Ȥ�� javadoc �ηٹ�ɽ��פʤɤΰ��Ū�ʼ��ؤβ��ܤ��Ƥ��ޤ��ľ�󲽷��ͤ˥��饹��ޤ��ˤϡ� +http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing�⻲�Ȥ��Ƥ�� FAQ �ˤϡ��\-private ��å��ꤷ�ʤ�� javadoc ��¹Ԥ��Ƥ��Τ� private �ե��ɤ� @serial ��Ĥ��ʤ��Ȥ�� javadoc �ηٹ�ɽ��פʤɤΰ��Ū�ʼ��ؤβ��ܤ��Ƥ��ޤ��ľ�󲽷��ͤ˥��饹��ޤ��ˤϡ� .na \f2��Sun �λ��͡�\fP @ .fi @@ -2241,7 +2225,7 @@ .na \f2@throws ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception�򻲾Ȥ��Ƥ�� .LP .TP 3 {@value\ package.class#field} @@ -2293,13 +2277,13 @@ @version\ version\-text \-version ��ץ��󤬻��Ѥ��ȡ��ɥ��Ȥ� [�С��] ��Ф��ɲä��ꤵ�줿 \f2version\-text\fP ��񤭹��ߤޤ��Υ��ϡ��Υ��ɤ��ޤޤ�륽�եȥ��θ��ߤΥС��ֹ��ݻ��褦�˰տޤ��Ƥ��ޤ��Ф��@since �ϡ��Υ��ɤ�Ƴ��줿�С��ֹ��ݻ��ޤ�� \f2version\-text\fP �ˤϡ��̤��¤�Ϥ��ޤ��󡣥С��󥿥��ѤǤ��Ĵ�٤�ˤϡ��֥��ѤǤ��פ򻲾Ȥ��Ƥ�� .LP -1 �ĤΥɥ��ơ��󥳥��Ȥ�ʣ�� \f2@version\fP ��ޤ�뤳�Ȥ��Ǥ��ޤ��̣��ʤ��ϰ��ǡ�1 �Ĥ� \f2@version\fP �� 1 �ĤΥС��ֹ��ꤹ�뤳�Ȥ⡢ʣ��ΥС��ֹ��ꤹ�뤳�Ȥ�Ǥ��ޤ��Ԥξ��ϡ�Javadoc �ġ��ˤ�ä�̾��̾��δ֤˥�� (\f2,\fP) �ȶ��̾��δ֤��ޤ��Ԥξ��ϡ��ƥ��Τ��Ϥ��뤳�Ȥʤ��ɥ��Ȥˤ��Τޤޥ��ԡ��ޤ��äơ��ޤǤϤʤ��Ƹ��б��̾��ڤ�ʸ��Ȥ�ɬ�פ��Ȥ��ϡ�1 �ĤΥ��ʣ��̾��ꤷ�Ƥ�� +1 �ĤΥɥ��ơ��󥳥��Ȥ�ʣ�� \f2@version\fP ��ޤ�뤳�Ȥ��Ǥ��ޤ��̣��ʤ��ϰ��ǡ�1 �Ĥ� \f2@version\fP �� 1 �ĤΥС��ֹ��ꤹ�뤳�Ȥ⡢ʣ��ΥС��ֹ��ꤹ�뤳�Ȥ�Ǥ��ޤ��Ԥξ��ϡ�Javadoc �ġ��ˤ�ä�̾��̾��δ֤˥�� (\f2,\fP) �ȶ��ޤ��Ԥξ��ϡ��ƥ��Τ��Ϥ��뤳�Ȥʤ��ɥ��Ȥˤ��Τޤޥ��ԡ��ޤ��äơ��ޤǤϤʤ��Ƹ��б��̾��ڤ�ʸ��Ȥ�ɬ�פ��Ȥ��ϡ�1 �ĤΥ��ʣ��̾��ꤷ�Ƥ�� .LP �ܺ٤ˤĤ��Ƥϡ� .na \f2@version ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version�򻲾Ȥ��Ƥ�� .RE .SS ��ѤǤ�� @@ -2789,7 +2773,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 2009 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1993 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2982,7 +2966,7 @@ .LP .TP 3 \-classpath\ classpathlist -javadoc ��ȥ��饹 (\f2.class\fP �ե��) �θ��Ԥ��Ȥ��˻��Ѥ��ѥ��ꤷ�ޤ��ȥ��饹�Ȥϡ��ɥ��Ȳ��륯�饹�ȡ��Υ��饹��黲�Ȥ��뤹�٤ƤΥ��饹��ؤ��ޤ��\f2classpathlist\fP �ˤϡ�� (\f2:\fP) �Ƕ��ڤä�ʣ��Υѥ��ޤ�뤳�Ȥ��Ǥ��ޤ�� Javadoc �ġ��ϡ��ꤵ�줿�ѥ��ʲ��Τ��٤ƤΥ��֥ǥ��쥯�ȥ�򸡺��ޤ��classpathlist ��ꤹ��Ȥ��ϡ� +javadoc ��ȥ��饹 (\f2.class\fP �ե��) �θ��Ԥ��Ȥ��˻��Ѥ��ѥ��ꤷ�ޤ��ȥ��饹�Ȥϡ��ɥ��Ȳ��륯�饹�ȡ��Υ��饹��黲�Ȥ��뤹�٤ƤΥ��饹��ؤ��ޤ��\f2classpathlist\fP �ˤϡ�� (\f2:\fP) �Ƕ��ڤä�ʣ��Υѥ��ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��ϡ��ꤵ�줿�ѥ��ʲ��Τ��٤ƤΥ��֥ǥ��쥯�ȥ�򸡺��ޤ��classpathlist ��ꤹ��Ȥ��ϡ� .na \f2��饹�ѥ�\fP @ .fi @@ -3243,13 +3227,13 @@ .LP \f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- \f2java.lang\fP�� \f2java.io\fP ��¾�� Java �ץ�åȥե��ѥå�� ( .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api ��) �˥�󥯤��ͤ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �� \f2\-d\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� +http://download.oracle.com/javase/7/docs/api/ ��) �˥�󥯤��礬��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �� \f2\-d\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- 2 �ĤΥѥå��ꡢ��Υɥ��Ȥ� Javadoc �ġ��ʣ��¹Ԥ��줿��ΤǤ��Ȥ��ޤ��ˡ��Υɥ��Ȥ��Хѥ��ʬ�䤵��Ƥ��Ȥ��ޤ��ξ�硢�ѥå��ϡ�API �Ǥ�� \f2com.apipackage\fP �ȡ�SPI (��ӥ��ץ��Х��󥿥ե��) �Ǥ�� \f2com.spipackage\fP �Ǥ��ɥ��Ȥγ�Ǽ��ϡ� \f2docs/api/com/apipackage\fP �� \f2docs/spi/com/spipackage\fP �Ǥ��API �ѥå��Υɥ��ȤϤ��Ǥ��Ѥߤǡ� \f2docs\fP ��ȥǥ��쥯�ȥ�ˤʤäƤ��Ȳ��ꤹ��ȡ�API �ɥ��ȤؤΥ�󥯤�ޤ� SPI �ѥå��ɥ��Ȳ��ˤϡ��Υ��ޥ�ɤ�¹Ԥ��ޤ�� @@ -3294,9 +3278,9 @@ .LP ��Ȥ��С�Java SE 6 API �Υѥå��ꥹ�Ȥ� .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list �ˤ��ꡢ��Τ褦��ƤǻϤޤäƤ��ޤ�� +http://download.oracle.com/javase/7/docs/api/package\-list �ˤ��ꡢ��Τ褦��ƤǻϤޤäƤ��ޤ�� .nf \f3 .fl @@ -3355,15 +3339,15 @@ .LP 1 �� javadoc �¹Ԥ�ʣ�� \f2\-linkoffline\fP ��ץ��Ǥ��ޤ��1.2.2 ��ϡ�ʣ��Υ��ץ��ꤹ�뤳�ȤϤǤ��ޤ��Ǥ�� .LP -\f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- http://java.sun.com/javase/6/docs/api �� \f2java.lang\fP�� \f2java.io\fP ��Ӥ��¾�� Java SE �ץ�åȥե��ѥå�� \f2�˥�󥯤��Ƥ�\fP Web �˥��Ǥ��ʤ��ͤ��ޤ��֥饦�� \f2��\fP +\f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- http://download.oracle.com/javase/7/docs/api/ �� \f2java.lang\fP�� \f2java.io\fP ��Ӥ��¾�� Java SE �ץ�åȥե��ѥå�� \f2�˥�󥯤��Ƥ⡢\fPWeb �˥��Ǥ��ʤ��ͤ��ޤ��֥饦�� \f2��\fP .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list �ˤ�� package\-list �ե��򳫤��ǥ��쥯�ȥ��¸�� 2 �� \f2packagelistLoc\fP �Ǥ��Υ��륳�ԡ��ؤΥѥ��ꤷ�ޤ��Ǥϡ��ѥå��ꥹ�ȥե��ϥ��ȥǥ��쥯�ȥ� "\f2.\fP" ��¸��Ƥ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �ʤɡ��¾��ɬ�ץ��ץ��ϼ��Ƥ��ޤ�� +http://download.oracle.com/javase/7/docs/api/package\-list �ˤ�� package\-list �ե��򳫤��ǥ��쥯�ȥ��¸�� 2 �� \f2packagelistLoc\fP �Ǥ��Υ��륳�ԡ��ؤΥѥ��ꤷ�ޤ��Ǥϡ��ѥå��ꥹ�ȥե��ϥ��ȥǥ��쥯�ȥ� "\f2.\fP" ��¸��Ƥ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi .LP @@ -3694,7 +3678,7 @@ .na \f2��Comparing Annotations and Javadoc Tags��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations�򻲾Ȥ��Ƥ�� .LP \-taglet ��ץ��Ѥ��ơ��ʣ��ʥ֥��å��䥫��।��饤�󥿥�� 뤳�Ȥ��Ǥ��ޤ�� .LP @@ -3890,13 +3874,13 @@ .fl .fl - <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a> + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> .fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. .fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners. + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ�� .fl \fP .fi @@ -3945,7 +3929,7 @@ .RS 3 .TP 2 o -\f3�� 1 \- 1 �İʾ�Υѥå��ε�ư��Ƶ�Ū�˼¹�\fP \- ��Ǥ� javadoc ��Ǥ�դΥǥ��쥯�ȥ꤫��¹ԤǤ��褦�ˡ�\-sourcepath ��Ѥ��Ƶ�Ū��Τ�� \-subpackages (1.4 �ο��ץ��) ��Ѥ��ޤ��ϡ� \f2java\fP �ǥ��쥯�ȥ�Υ��֥ѥå��򤿤ɤ�ޤ��κݤˡ� \f2java.net\fP �� \f2java.lang\fP ��롼�Ȥ˻��ĥѥå��Ͻ��ޤ��ΤȤ�� \f2java.lang �Υ��֥ѥå��\fP�Ǥ�� java.lang.ref �� \f2��ޤ�\fP�� +\f3�� 1 \- 1 �İʾ�Υѥå��ε�ư��Ƶ�Ū�˼¹�\fP \- ��Ǥ� javadoc ��Ǥ�դΥǥ��쥯�ȥ꤫��¹ԤǤ��褦�ˡ�\-sourcepath ��Ѥ��Ƶ�Ū��Τ�� \-subpackages (1.4 �ο��ץ��) ��Ѥ��ޤ��ϡ� \f2java\fP �ǥ��쥯�ȥ�Υ��֥ѥå��򤿤ɤ�ޤ��κݤˡ� \f2java.net\fP �� \f2java.lang\fP ��롼�Ȥ˻��ĥѥå��ޤ��ξ�硢 \f2java.lang\fP �Υ��֥ѥå��Ǥ�� \f2java.lang.ref\fP�� .nf \f3 .fl @@ -4068,13 +4052,13 @@ .fl \-bottom ' .fl - <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a> + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> .fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. .fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners.' \\ + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ��' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl @@ -4087,7 +4071,7 @@ \fP .fi .LP -�嵭�Υ��ޥ�ɤǡ� \f2packages\fP �ϡ��оݤΥѥå��̾ ( \f2java.applet java.lang\fP �ʤ�) ��äƤ��ե��̾��Ǥ��ƥ��ץ��Ρ�ñ��ǰϤޤ줿��¦�ˤϡ��ʸ��Ǥ��ޤ��󡣤��Ȥ��С��򥳥ԡ��ڡ��Ȥ��ϡ� \f2\-bottom\fP ��ץ��󤫤��ʸ��Ƥ��ˡ��Τ��ȤΡ��פ⻲�Ȥ��Ƥ�� +��ǡ� \f2packages\fP �ϡ��оݤΥѥå��̾ ( \f2java.applet java.lang\fP �ʤ�) ��äƤ��ե��̾��Ǥ��ƥ��ץ��Ρ�ñ��ǰϤޤ줿��¦�ˤϡ��ʸ��Ǥ��ޤ��󡣤��Ȥ��С��򥳥ԡ��ڡ��Ȥ��ϡ� \f2\-bottom\fP ��ץ��󤫤��ʸ��Ƥ��ˡ��Τ��ȤΡ��פ⻲�Ȥ��Ƥ�� .SS Makefile �� .LP @@ -4139,13 +4123,13 @@ .fl BOTTOM = ' .fl - <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a> + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> .fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. .fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners.' + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ��' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -4229,13 +4213,13 @@ .na \f2Javadoc �Υۡ��ڡ��\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javah.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "14 Apr 2011" +.TH javah 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javap.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "14 Apr 2011" +.TH javap 1 "07 May 2011" .LP .SH "̾��" @@ -33,7 +33,7 @@ .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -42,7 +42,20 @@ .SH "��" .LP .LP -\f3javap\fP ��ޥ�ɤϡ��饹�ե��ե��֥뤷�ޤ��ν��Ϥϻ��ꤹ�륪�ץ��ˤ��ۤʤ�ޤ��ץ��ꤷ�ʤ��硢\f3javap\fP �ϡ��Υѥå��Ϥ��줿��饹�� protected �� public �Υե��ɤȥ᥽�åɤ��Ϥ��ޤ��\f3javap\fP �Ϥ��ν��Ϥ�ɸ��Ϥ�ɽ��ޤ��Ȥ��С��Υ��饹��򥳥�ѥ��뤹��Ȥ��ޤ�� +\f3javap\fP ��ޥ�ɤϡ�1 �Ĥޤ��ʣ��Υ��饹�ե��ե��֥뤷�ޤ��ν��Ϥϻ��ꤹ�륪�ץ��ˤ��ۤʤ�ޤ��ץ��ꤷ�ʤ��硢\f3javap\fP �ϡ��Υѥå��Ϥ��줿��饹�� protected �� public �Υե��ɤȥ᥽�åɤ��Ϥ��ޤ��\f3javap\fP �Ϥ��ν��Ϥ�ɸ��Ϥ�ɽ��ޤ�� +.LP +.RS 3 +.TP 3 +options +��ޥ�ɹԥ��ץ�� +.TP 3 +classes +��ν��оݤȤʤ� 1 �İʾ�Υ��饹 \f2DocFooter.class\fP �ʤ�) �Υꥹ�� (��ڤ�)��饹�ѥ��Ǹ��Ĥ��륯�饹�ϡ��ե��̾ ( \f2/home/user/myproject/src/DocFooter.class\fP �ʤ�) �ޤ�� URL ( \f2file:///home/user/myproject/src/DocFooter.class\fP �ʤ�) �ǻ��Ǥ��ޤ�� +.RE + +.LP +.LP +��Ȥ��С��Υ��饹��򥳥�ѥ��뤹��Ȥ��ޤ�� .LP .nf \f3 @@ -88,24 +101,24 @@ .LP .LP -\f3javap DocFooter\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� +\f3javap DocFooter.class\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl @@ -114,114 +127,116 @@ .LP .LP -\f3javap \-c DocFooter\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� +\f3javap \-c DocFooter.class\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 <Method java.applet.Applet()> + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."<init>":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 <Method void resize(int, int)> + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 <String "LAST_UPDATED"> + 10: aload_0 .fl - 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 <Field java.lang.String date> + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 <String "EMAIL"> + 20: aload_0 .fl - 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 <Field java.lang.String email> + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 <Class java.lang.StringBuffer> + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 <Method java.lang.StringBuffer()> + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V .fl - 9 getfield #5 <Field java.lang.String date> + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 <String " by "> + 15: ldc #11 // String by .fl - 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 <Method java.lang.String toString()> + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 <Field java.lang.String email> + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 43: return .fl - 43 return +} .fl \fP .fi @@ -284,22 +299,7 @@ �᥽�åɤΥ��å�� \f2locals\fP �� \f2args\fP �ο��Ϥ��ޤ�� .TP 3 \-classpath path -\f3javap\fP ��饹��õ��˻��Ѥ��ѥ��ꤷ�ޤ��ǥե��Ȥޤ�� CLASSPATH �Ķ��ѿ��񤭤��ޤ��ǥ��쥯�ȥ�ϥ��ʬ�䤷�ޤ��äơ�\f2path\fP �ΰ��̷��ϼ��Τ褦�ˤʤ�ޤ�� -.nf -\f3 -.fl - .:<your_path> -.fl -\fP -.fi -��򼨤��ޤ�� -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +\f3javap\fP ��饹��õ��˻��Ѥ��ѥ��ꤷ�ޤ��ǥե��Ȥޤ�� CLASSPATH �Ķ��ѿ��񤭤��ޤ�� .TP 3 \-bootclasspath path �֡��ȥ��ȥ�åץ��饹��ɤ��ѥ��ꤷ�ޤ��֡��ȥ��ȥ�åץ��饹�ϡ��ǥե��ȤǤ� \f2jre/lib/rt.jar\fP ��¾�Τ��Ĥ�� JAR �ե�� ˤ��롢�� Java 2 �ץ�åȥե��륯�饹�Ǥ�� @@ -309,22 +309,6 @@ .RE .LP -.SH "�Ķ��ѿ�" -.LP -.RS 3 -.TP 3 -CLASSPATH -�桼��饹�ؤΥѥ��򥷥��ƥ�˻��ꤷ�ޤ��ǥ��쥯�ȥ�ϥ��ʬ�䤷�ޤ��򼨤��ޤ�� -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE - -.LP .SH "��Ϣ��" .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "14 Apr 2011" +.TH javaws 1 "07 May 2011" .LP .SH "̾��" @@ -81,7 +81,7 @@ \f2\-Xnosplash\fP .LP .LP -�ǽ�Υ��ץ�å��̤�ɽ��̵��ˤ��ޤ�� +��ץ�å��̤�ɽ��ޤ�� .LP .LP \f2\-open <arguments>\fP @@ -99,7 +99,7 @@ \f2\-online\fP .LP .LP -��饤��⡼�ɤǼ¹Ԥ��ޤ� (�ǥե��Ȥ�ư��)�� +��饤��⡼�ɤ��Ѥ��ޤ� (�ǥե��Ȥ�ư��)�� .LP .LP \f2\-wait\fP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "14 Apr 2011" +.TH jconsole 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "14 Apr 2011" +.TH jdb 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "14 Apr 2011" +.TH jhat 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "14 Apr 2011" +.TH jinfo 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "14 Apr 2011" +.TH jmap 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jps.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "14 Apr 2011" +.TH jps 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "14 Apr 2011" +.TH jrunscript 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "14 Apr 2011" +.TH jsadebugd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "14 Apr 2011" +.TH jstack 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "14 Apr 2011" +.TH jstat 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "14 Apr 2011" +.TH jstatd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2008, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jvisualvm 1 "14 Apr 2011" +.TH jvisualvm 1 "07 May 2011" .LP .SH "̾��" @@ -110,7 +110,7 @@ .na \f2Java VisualVM ��ȯ�ԤΥ��\fP @ .fi -https://visualvm.dev.java.net +http://visualvm.java.net .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998-2010 keytool tool, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "14 Apr 2011" +.TH keytool 1 "07 May 2011" .LP .SH "̾��" @@ -1087,9 +1087,9 @@ .fl keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<��ο��ѥ����>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<��ȥ��ο��ѥ����>\fP\f3 \-validity 180 .fl \fP .fi @@ -1099,10 +1099,10 @@ ��: ��Υ��ޥ�ɤ� 1 �Ԥ��Ϥ��ʤ��Фʤ�ޤ��ʣ��Ԥ��Ϥ��Ƥ��Τ��ɤߤ䤹��뤿��Ǥ�� .LP .LP -��Ǥϡ�working �ǥ��쥯�ȥ�� mykeystore �Ȥ��̾��Υ��ȥ�� (��ȥ��Ϥޤ�¸�ߤ��Ƥ��ʤ��Ȳ��ꤹ��)��ȥ��˥ѥ���� ab987c ��Ƥޤ��Υڥ��б��륨��ƥ��ƥ��Ρּ��̾�פϡ��̾Τ��Mark Jones�ס��ȿ�ñ�̤��Java�ס��ȿ��Oracle�ס�2 ʸ��ι��ֹ椬��US�פǤ��Υ��Ϥɤ�� 1024 �ӥåȤǡ��κ��ˤϥǥե��Ȥ� DSA ��르�ꥺ��Ѥ��ޤ�� +��Ǥϡ�working �ǥ��쥯�ȥ�� mykeystore �Ȥ��̾��Υ��ȥ�� (��ȥ��Ϥޤ�¸�ߤ��Ƥ��ʤ��Ȳ��ꤹ��)��ȥ��ˡ�\f2<��ȥ��ο��ѥ����>\fP �ǻ��ꤷ��ѥ���� Ƥޤ��Υڥ��б��륨��ƥ��ƥ��Ρּ��̾�פϡ��̾Τ��Mark Jones�ס��ȿ�ñ�̤��Java�ס��ȿ��Oracle�ס�2 ʸ��ι��ֹ椬��US�פǤ��Υ��Ϥɤ�� 1024 �ӥåȤǡ��κ��ˤϥǥե��Ȥ� DSA ��르�ꥺ��Ѥ��ޤ�� .LP .LP -��Υ��ޥ�ɤϡ��ȼ��̾��ޤ༫�ʽ�̾�� (�ǥե��Ȥ� SHA1withDSA ��̾��르�ꥺ��) ��ޤ��ͭ��֤� 180 ��Ǥ�� ϡ��̾��business�פ��ꤵ��륭��ȥ��ȥ��˴�Ϣ�դ��ޤ��ˤϥѥ���ɡ�kpi135�פ��Ƥ��ޤ�� +��Υ��ޥ�ɤϡ��ȼ��̾��ޤ༫�ʽ�̾�� (�ǥե��Ȥ� SHA1withDSA ��̾��르�ꥺ��) ��ޤ��ͭ��֤� 180 ��Ǥ�� ϡ��̾��business�פ��ꤵ��륭��ȥ��ȥ��˴�Ϣ�դ��ޤ��ˤϡ�\f2<��ο��ѥ����>\fP �ǻ��ꤷ��ѥ���ɤ��Ƥ��ޤ�� .LP .LP ��ץ��Υǥե��ͤ�Ȥ��ϡ��˼��ޥ�ɤ��û��뤳�Ȥ��Ǥ��ޤ��ºݤˤϡ��ץ�� 1 �Ĥ��ꤻ��˥��ޥ�ɤ�¹Ԥ��뤳�Ȥ��ǽ�Ǥ�� ǥե��ͤ��ĥ��ץ��Ǥϡ��ץ��ꤷ�ʤ��Хǥե��ͤ��Ȥ�졢ɬ�פ��ͤˤĤ��Ƥ��Ϥ��ޤ��Ȥ��С�ñ�˼��Τ褦��Ϥ��뤳�Ȥ�Ǥ��ޤ�� @@ -1120,7 +1120,7 @@ ��ξ��ϡ�mykey �Ȥ��̾�ǥ��ȥ��ȥ꤬��졢��줿��Υڥ�� 90 ��ͭ��ʾ��񤬤��Υ��ȥ�˳�Ǽ��ޤ��Υ��ȥ�ϡ��ۡ��ǥ��쥯�ȥ�� .keystore �Ȥ��̾��Υ��ȥ��֤��ޤ��Υ��ȥ��ޤ�¸�ߤ��Ƥ��ʤ��ϡ��ޤ��̾��󡢥��ȥ��Υѥ���ɡ��Υѥ���ɤˤĤ��Ƥϡ��Ϥ��ޤ�� .LP .LP -�ʲ��Ǥϡ��ץ��ꤷ�ʤ�� \f2\-genkeypair\fP ��ޥ�ɤ�¹Ԥ��ΤȤ��򼨤��ޤ��Ϥ��줿��ϡ��ǽ�˼�� \f2\-genkeypair\fP ��ޥ�ɤ��ͤ��Ϥ��ΤȤ��ޤ� (��Ȥ��С��Υѥ���ɤˤ� kpi135 �Ȼ��)�� +�ʲ��Ǥϡ��ץ��ꤷ�ʤ�� \f2\-genkeypair\fP ��ޥ�ɤ�¹Ԥ��ΤȤ��򼨤��ޤ��Ϥ��줿��ϡ��ǽ�˼�� \f2\-genkeypair\fP ��ޥ�ɤ��ͤ��Ϥ��ΤȤ��ޤ� (��Ȥ��С��̾�ˤ� cn=Mark Jones, ou=Java, o=Oracle, c=US �Ȼ��)�� .LP .SS ��ȯ�Զɤ��Ф��̾�դ��׵� @@ -1240,14 +1240,14 @@ .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<��ȥ��Υѥ����>\fP\f3 \-deststorepass \fP\f4<��åȥ��ȥ��Υѥ����>\fP\f3 .fl \fP .fi .LP .LP -�ޤ��importkeystore ��ޥ�ɤ�Ȥ��С��륽��ȥ��ñ��Υ��ȥ�򥿡��åȥ��ȥ��˥��ݡ��Ȥ��뤳�Ȥ�Ǥ��ޤ��ξ�硢�嵭��Ǽ��ץ��˲ä��ݡ��оݤȤʤ��̾��ꤹ��ɬ�פ��ޤ��srcalias ��ץ��ꤹ��ˤϡ��å��̾�⥳�ޥ�ɹԤ��Ǥ��ۤ��̩/��ݸ��ѥѥ���ɤ䥿��å��ݸ��ѥѥ���ɤ��Ǥ��ޤ��С��ץ��ץȤΤޤä��ɽ��ʤ� \f3keytool\fP ��ޥ�ɤ�ȯ�ԤǤ��ޤ��ϡ�\f3keytool\fP ��ޥ�ɤ򥹥��ץȥե��˴ޤ��ݤ��Ǥ��򼨤��ޤ�� +�ޤ��importkeystore ��ޥ�ɤ�Ȥ��С��륽��ȥ��ñ��Υ��ȥ�򥿡��åȥ��ȥ��˥��ݡ��Ȥ��뤳�Ȥ�Ǥ��ޤ��ξ�硢�嵭��Ǽ��ץ��˲ä��ݡ��оݤȤʤ��̾��ꤹ��ɬ�פ��ޤ��srcalias ��ץ��ꤹ��ˤϡ��å��̾�⥳�ޥ�ɹԤ��Ǥ��ۤ��̩/��ݸ��ѥѥ���ɤ䥿��å��ݸ��ѥѥ���ɤ��Ǥ��ޤ��ˡ�򼨤��ޥ�ɤ򼡤˼��ޤ�� .LP .nf \f3 @@ -1258,11 +1258,11 @@ .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<��ȥ��Υѥ����>\fP\f3 \-deststorepass \fP\f4<��åȥ��ȥ��Υѥ����>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<��ȥ�Υѥ����>\fP\f3 \-destkeypass \fP\f4<��åȥ��ȥ�Υѥ����>\fP\f3 .fl \-noprompt .fl @@ -1711,7 +1711,7 @@ ��: ��Ǥ��Ȥ��ƾ��򥤥�ݡ��Ȥ��ˡ��Ƥ򿵽Ť�Ĵ�٤Ƥ�� .LP .LP -�ޤ��Ƥ�ɽ�� (\-printcert ��ޥ�ɤ��Ѥ��뤫��ޤ�� \-noprompt ��ץ��ꤷ�ʤ�� \-importcert ��ޥ�ɤ��)�� ɽ��줿��Υե��󥬡��ץ��Ȥ��Ԥ��ե��󥬡��ץ��ȤȰ��פ��뤫�ɤ��ǧ��ޤ��Ȥ��С��桼��Ƥ��ơ��ξ�� /tmp/cert �Ȥ��̾��ǥե��˳�Ǽ��Ƥ��Ȥ��ޤ�� ξ��ϡ��Ǥ��Υꥹ�Ȥˤ��ξ��ɲä��ˡ� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ƥե��󥬡��ץ��Ȥ�ɽ��Ǥ��ޤ��Ȥ��С��Τ褦�ˤ��ޤ�� +�ޤ��Ƥ�ɽ�� (\-printcert ��ޥ�ɤ��Ѥ��뤫��ޤ�� \-noprompt ��ץ��ꤷ�ʤ�� \-importcert ��ޥ�ɤ��)�� ޥ�ɤ��Ѥ�� ɽ��줿��Υե��󥬡��ץ��Ȥ��Ԥ��ե��󥬡��ץ��ȤȰ��פ��뤫�ɤ��ǧ��ޤ��Ȥ��С��桼��Ƥ��ơ��ξ�� /tmp/cert �Ȥ��̾��ǥե��˳�Ǽ��Ƥ��Ȥ��ޤ�� ξ��ϡ��Ǥ��Υꥹ�Ȥˤ��ξ��ɲä��ˡ� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ƥե��󥬡��ץ��Ȥ�ɽ��Ǥ��ޤ��Ȥ��С��Τ褦�ˤ��ޤ�� .LP .nf \f3 @@ -1744,7 +1744,7 @@ ��ˡ��ʪ��Ϣ��ο�ʪ��󼨤��ե��󥬡��ץ��Ȥȡ��Υ��ޥ�ɤ�ɽ��줿�ե��󥬡��ץ��ȤȤ��Ӥ��ޤ��ե��󥬡��ץ��Ȥ��פ��С��Ǥۤ��β��Ԥ� (��Ԥʤ�) �ˤ��Τ��ؤ��Ԥ��Ƥ��ʤ��Ȥ��ǧ�Ǥ��ޤ��Ǥ��μ�ι��⤬�Ԥ��Ƥ��硢��å��Ԥ鷺�˾��򥤥�ݡ��Ȥ��ȡ��Ԥˤ�äƽ�̾��줿��٤ƤΤ�� (��Ū�տޤ��ĥ��饹�ե��ޤ�� JAR �ե��ʤ�) ��ꤹ�뤳�Ȥˤʤ�ޤ�� .LP .LP -��: ��򥤥�ݡ��Ȥ��ɬ�� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ʤ��Фʤ�ʤ��櫓�ǤϤ��ޤ��󡣥��ȥ��ο��Ǥ��Υꥹ�Ȥ˾��ɲä�� \f2\-importcert\fP ��ޥ�ɤ�¹Ԥ��ȡ��ξ��ɽ��졢��ǧ��å��ɽ��ޤ��ݡ��ϡ��λ��ߤǤ��ޤ��ǧ��å��ɽ��Τϡ�\-importcert ��ޥ�ɤ� \-noprompt ��ץ��ꤻ��˼¹Ԥ��Ǥ�� \f2\-noprompt\fP ��ץ��󤬻��ꤵ��Ƥ��硢�桼��Ȥ��äϹԤ��ޤ�� +��: ��򥤥�ݡ��Ȥ��ɬ�� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ʤ��Фʤ�ʤ��櫓�ǤϤ��ޤ��󡣥��ȥ��ο��Ǥ��Υꥹ�Ȥ˾��ɲä�� \f2\-importcert\fP ��ޥ�ɤ�¹Ԥ��ȡ��ξ��ɽ��졢��ǧ��å��ɽ��ޤ��ݡ��ϡ��λ��ߤǤ��ޤ��ǧ��å��ɽ��Τϡ�\-importcert ��ޥ�ɤ� \-noprompt ��ץ��ꤻ��˼¹Ԥ��Ǥ�� ޥ�ɤ��Ѥ�� \f2\-noprompt\fP ��ץ��󤬻��ꤵ��Ƥ��硢�桼��Ȥ��äϹԤ��ޤ�� .LP .SS �ѥ���ɤ˴ؤ��ջ�� diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "14 Apr 2011" +.TH native2ascii 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "14 Apr 2011" +.TH orbd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "14 Apr 2011" +.TH pack200 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "14 Apr 2011" +.TH policytool 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "14 Apr 2011" +.TH rmic 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "14 Apr 2011" +.TH rmid 1 "07 May 2011" .LP .SH "̾��" @@ -121,7 +121,7 @@ .LP .LP -ɬ�פ˱��ƥ��ӥ��򳫻Ϥ��褦��ꤹ��ܺ٤ˤĤ��Ƥϡ� \f2inetd\fP (Solaris) �ޤ�� \f2xinetd\fP (Linux) �Υޥ˥奢��ڡ��򻲾Ȥ��Ƥ�� +ɬ�פ˱��ƥ��ӥ��򳫻Ϥ��褦��ꤹ��ܺ٤ˤĤ��Ƥϡ� \f2inetd\fP (Solaris �ξ��)��ޤ�� \f2xinetd\fP (Linux) �Υޥ˥奢��ڡ��򻲾Ȥ��Ƥ�� .LP .SH "��ץ��" .LP @@ -239,7 +239,7 @@ .fl \fP .fi -�ǽ��Ϳ��Ƥ��륢��ϡ� \f2rmid\fP ��Ф��ѥ�̾�ˤ��Ū�˻��ꤵ�� \f2java\fP ��ޥ�ɤ� 1.7.0 �С��μ¹Ԥ��Ĥ��ޤ��ǥե��ȤǤϡ�java.home �ˤ��С�� \f2java\fP ��ޥ�� ( \f2rmid\fP ��Ѥ��Τ�Ʊ��С��) ��Ѥ��뤿�ᡢ��Υ��ޥ�ɤϡ��ݥꥷ��ե��ǻ��ꤹ��ɬ�פϤ��ޤ��2 ��ܤΥ��ϡ� \f2rmid\fP ��Ф��ơ��ǥ��쥯�ȥ� \f2/files/apps/rmidcmds\fP ��Ǥ�դΥ��ޥ�ɤμ¹Ը��¤��Ĥ��ޤ�� +�ǽ��Ϳ��Ƥ��륢��ϡ� \f2rmid\fP ��Ф��ѥ�̾�ˤ��Ū�˻��ꤵ�� \f2java\fP ��ޥ�ɤ� 1.7.0 �С��μ¹Ԥ��Ĥ��ޤ��ǥե��ȤǤϡ�java.home �ˤ��С�� \f2java\fP ��ޥ�ɤ��Ѥ��ޤ�� \f2rmid\fP ��Ѥ��Τ�Ʊ��С��) ��Ѥ��뤿�ᡢ��Υ��ޥ�ɤϡ��ݥꥷ��ե��ǻ��ꤹ��ɬ�פϤ��ޤ��2 ��ܤΥ��ϡ� \f2rmid\fP ��Ф��ơ��ǥ��쥯�ȥ� \f2/files/apps/rmidcmds\fP ��Ǥ�դΥ��ޥ�ɤμ¹Ը��¤��Ĥ��ޤ�� .LP 3 ��ܤ��Ϳ��Ƥ��륢�� \f2ExecOptionPermission\fP �ϡ� \f2rmid\fP ��Ф��ơ��ƥ��ݥꥷ��ե�� \f2/files/policies/group.policy\fP �Ȥ��Ƥ��뵯ư��롼�פγ��Ϥ��Ĥ��ޤ��Υ��ϡ��ư��롼�פ� \f2java.security.debug\fP �ץ��ѥƥ��Ѥ��뤳�Ȥ��Ĥ��Ƥ��ޤ��Ǹ�Υ��ϡ��ư��롼�פ� \f2sun.rmi\fP �Ȥ��ץ��ѥƥ��̾�γ��Ǥ�դΥץ��ѥƥ��Ѥ��뤳�Ȥ��Ĥ��Ƥ��ޤ�� .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "14 Apr 2011" +.TH rmiregistry 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "14 Apr 2011" +.TH schemagen 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "14 Apr 2011" +.TH serialver 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "14 Apr 2011" +.TH servertool 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "14 Apr 2011" +.TH tnameserv 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "14 Apr 2011" +.TH unpack200 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "14 Apr 2011" +.TH wsgen 1 "07 May 2011" .SH "̾��" wsgen \- XML Web Services (JAX\-WS) 2.0 �Τ�� Java(TM) API .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "14 Apr 2011" +.TH wsimport 1 "07 May 2011" .SH "̾��" wsimport \- XML Web Services (JAX\-WS) 2.0 �Τ�� Java(TM) API .LP @@ -818,7 +818,7 @@ .ll \n(34u*1u/3u .if \n(.l<\n(81 .ll \n(81u .in 0 -ǧ�ھ��ޤ�ե��ꤹ�� WSDL URI �Ǥ�� URI �η��ϼ��ΤȤ��Ǥ� http://username:password@example.org/stock?wsdl +ǧ�ھ��ޤ�ե��ꤹ�� WSDL URI �Ǥ�� URI �η��ϼ��ΤȤ��Ǥ� http://\f2<�桼��̾>\fP:\f2<�ѥ����>\fP@\f2<�ۥ��̾>\fP/\f2<Web ��ӥ�̾>\fP?wsdl .br .di .nr b| \n(dn @@ -1057,10 +1057,10 @@ .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -Java ��ƥ��ե��Ȥ�� \f2http://stockquote.xyz/quote?wsdl\fP �򥤥�ݡ��Ȥ��뤳�Ȥǡ��Υ��ƥ��ե��Ȥ򥳥�ѥ��뤷�ޤ�� +Java ��ƥ��ե��Ȥ�� \f2http://stockquote.example.com/quote?wsdl\fP �򥤥�ݡ��Ȥ��Ƥ�� Java ��ƥ��ե��Ȥ򥳥�ѥ��뤷�ޤ� .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "14 Apr 2011" +.TH xjc 1 "07 May 2011" .LP .ad c diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jar.1 --- a/jdk/src/solaris/doc/sun/man/man1/jar.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jar.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,17 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jar 1 "02 Jun 2010" +.TH jar 1 "10 May 2011" .LP .SH "Name" jar\-The Java Archive Tool .LP -\f3jar\fP combines multiple files into a single JAR archive file. +\f3jar\fP combines multiple files into a single JAR archive file. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 Create jar file @@ -53,9 +51,6 @@ where: .LP .RS 3 - -.LP -.RS 3 .TP 3 cuxtiv0Mmfe Options that control the \f2jar\fP command. @@ -80,11 +75,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the .na \f2ZLIB\fP @ @@ -93,9 +85,6 @@ .LP Typical usage to combine files into a jar file is: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -103,20 +92,16 @@ .fl \fP .fi -.RE .LP In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the .na \f2JAR file specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. .LP If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -124,7 +109,6 @@ .fl \fP .fi -.RE .LP An existing manifest file must end with a new line character.\ \f3jar\fP does not parse the last line of a manifest file if it does not end with a new line character. @@ -135,9 +119,6 @@ .LP \f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file: -.RS 3 - -.LP .nf \f3 .fl @@ -145,16 +126,12 @@ .fl \fP .fi -.RE .LP The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents. .LP To extract the files from a jar file, use \f2x\fP: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -162,15 +139,11 @@ .fl \fP .fi -.RE .LP .LP To extract individual files from a jar file, supply their filenames: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -178,7 +151,6 @@ .fl \fP .fi -.RE .LP .LP @@ -186,10 +158,7 @@ .na \f2JarIndex\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest. -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest. .LP .nf \f3 @@ -198,7 +167,6 @@ .fl \fP .fi -.RE .LP .LP @@ -210,9 +178,6 @@ .br To copy directories, first compress files in \f2dir1\fP to \f2stdout\fP, then extract from \f2stdin\fP to \f2dir2\fP (omitting the \f2\-f\fP option from both \f2jar\fP commands): .LP -.RS 3 - -.LP .nf \f3 .fl @@ -220,7 +185,6 @@ .fl \fP .fi -.RE .LP .LP @@ -228,12 +192,10 @@ .na \f2Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar. +http://download.oracle.com/javase/tutorial/deployment/jar. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 c @@ -241,9 +203,6 @@ .TP 3 u Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example: -.RS 3 - -.LP .nf \f3 .fl @@ -251,11 +210,7 @@ .fl \fP .fi -.RE would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example: -.RS 3 - -.LP .nf \f3 .fl @@ -263,7 +218,6 @@ .fl \fP .fi -.RE updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP. .TP 3 x @@ -274,9 +228,6 @@ .TP 3 i Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example: -.RS 3 - -.LP .nf \f3 .fl @@ -284,9 +235,8 @@ .fl \fP .fi -.RE .LP -would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example. +would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example. .TP 3 f Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u). @@ -301,12 +251,10 @@ Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u). .TP 3 m -Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value. -.LP +Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value. +.br +.br On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use: -.RS 3 - -.LP .nf \f3 .fl @@ -314,22 +262,18 @@ .fl \fP .fi -.RE You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the .na \f2JAR Files\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option. -.LP +http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option. .TP 3 e Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file. .br .br +.br For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -337,12 +281,7 @@ .fl \fP .fi -.RE -.LP The java runtime can directly invoke this application by running the following command: -.RS 3 - -.LP .nf \f3 .fl @@ -350,11 +289,7 @@ .fl \fP .fi -.RE If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways: -.RS 3 - -.LP .nf \f3 .fl @@ -362,11 +297,7 @@ .fl \fP .fi -.RE or -.RS 3 - -.LP .nf \f3 .fl @@ -374,18 +305,13 @@ .fl \fP .fi -.RE -\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted. -.LP +\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted. .TP 3 -\-C \ dir +\-C\ dir Temporarily changes directories (\f2cd\fP\ \f2dir\fP) during execution of the \f2jar\fP command while processing the following \f2inputfiles\fP argument. Its operation is intended to be similar to the \f2\-C\fP option of the UNIX \f2tar\fP utility. .br .br For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -393,11 +319,7 @@ .fl \fP .fi -.RE This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP. -.RS 3 - -.LP .nf \f3 .fl @@ -405,11 +327,7 @@ .fl \fP .fi -.RE If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -425,7 +343,6 @@ .fl \fP .fi -.RE .LP .TP 3 \-Joption @@ -435,8 +352,6 @@ .LP .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system. .LP An argument file can include options and filenames. The arguments within a file can be space\-separated or newline\-separated. Filenames within an argument file are relative to the current directory, not relative to the location of the argument file. Wildcards (*) that might otherwise be expanded by the operating system shell are not expanded. Use of the \f2@\fP character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. @@ -447,24 +362,17 @@ .br The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command: .LP -.RS 3 - -.LP .nf \f3 .fl % find \fP\f3.\fP \-name '*.class' \-print > classes.list .fl .fi -.RE .LP .LP You can then execute the \f2jar\fP command on \f2Classes.list\fP by passing it to \f2jar\fP using argfile syntax: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -472,13 +380,9 @@ .fl \fP .fi -.RE .LP An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example: -.RS 3 - -.LP .nf \f3 .fl @@ -486,7 +390,6 @@ .fl \fP .fi -.RE .LP .LP @@ -494,12 +397,7 @@ .LP .SH "EXAMPLES" .LP - -.LP To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date. -.RS 3 - -.LP .nf \f3 .fl @@ -535,13 +433,9 @@ .fl \fP .fi -.RE .LP If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file: -.RS 3 - -.LP .nf \f3 .fl @@ -585,13 +479,9 @@ .fl \fP .fi -.RE .LP To see the entry names in the jarfile, use the \f2t\fP option: -.RS 3 - -.LP .nf \f3 .fl @@ -619,7 +509,6 @@ .fl \fP .fi -.RE .LP .LP @@ -630,9 +519,6 @@ .br .LP -.RS 3 - -.LP If you split the inter\-dependent classes for a stock trade application into three jar files: \f2main.jar\fP, \f2buy.jar\fP, and \f2sell.jar\fP. .br @@ -660,38 +546,34 @@ .fi .LP -An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources. -.RE +An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources. .SH "SEE ALSO" .LP - .LP .na \f2The Jar Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jarGuide.html -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html +.LP .LP .na \f2The Jar File Specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html +.LP .LP .na \f2The JarIndex Spec\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index +.LP .LP .na \f2Jar Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar on the Java Software web site. -.br - +http://download.oracle.com/javase/tutorial/deployment/jar/index.html +.LP .LP -pack200(1) +pack200(1) +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jarsigner.1 --- a/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jarsigner 1 "02 Jun 2010" +.TH jarsigner 1 "10 May 2011" .LP .SH "Name" jarsigner \- JAR Signing and Verification Tool .LP -.RS 3 - -.LP .LP Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -51,8 +45,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jarsigner\fP tool is used for two purposes: .LP @@ -109,9 +101,6 @@ .SS Keystore Aliases .LP -.RS 3 - -.LP .LP All keystore entities are accessed via unique \f2aliases\fP. .LP @@ -121,37 +110,29 @@ .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3 .fl - \-keypass dukekeypasswd MyJARFile.jar duke + \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke .fl \fP .fi .LP .LP -Keystores are protected with a password, so the store password (in this case "myspass") must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password (in this case "dukekeypasswd") must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password. +Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password. .LP -.RE .SS Keystore Location .LP -.RS 3 - -.LP .LP \f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory. .LP .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device. .LP -.RE .SS Keystore Implementation .LP -.RS 3 - -.LP .LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP @@ -166,13 +147,13 @@ .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP .LP Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP .LP For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu. @@ -227,41 +208,36 @@ .na \f2KeyTool and JarSigner\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details. +http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details. .LP -.RE .SS Supported Algorithms .LP -.RS 3 - .LP -.LP -By default, \f3jarsigner\fP signs a JAR file using either +By default, \f3jarsigner\fP signs a JAR file using one of the following: .LP .RS 3 .TP 2 o -DSA (Digital Signature Algorithm) with the SHA\-1 digest algorithm, or +DSA (Digital Signature Algorithm) with the SHA1 digest algorithm .TP 2 o -the RSA algorithm with the SHA\-256 digest algorithm. +RSA algorithm with the SHA256 digest algorithm. +.TP 2 +o +EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm). .RE .LP .LP -That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. +That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm. .LP .LP These default signature algorithms can be overridden using the \f2\-sigalg\fP option. .LP -.RE .SS The Signed JAR File .LP -.RS 3 - -.LP .LP When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory: .LP @@ -271,7 +247,7 @@ a signature file, with a .SF extension, and .TP 2 o -a signature block file, with a .DSA extension. +a signature block file, with a .DSA, .RSA, or .EC extension. .RE .LP @@ -281,23 +257,20 @@ .nf \f3 .fl - \-sigFile MKSIGN +\-sigFile MKSIGN .fl \fP .fi .LP .LP -the files are named "MKSIGN.SF" and "MKSIGN.DSA". +The files are named "MKSIGN.SF" and "MKSIGN.DSA". .LP .LP If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens. .LP \f3The Signature (.SF) File\fP .LP -.RS 3 - -.LP .LP A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following: .LP @@ -320,25 +293,14 @@ .LP The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification. .LP -.RE -\f3The Signature Block (.DSA) File\fP -.LP -.RS 3 - +\f3The Signature Block File\fP .LP -.LP -The .SF file is signed and the signature is placed in the .DSA file. The .DSA file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. -.LP -.RE -.RE +The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used. .SS Signature Timestamp .LP -.RS 3 - .LP -.LP -\f2jarsigner\fP tool can now generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options: +\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options: .LP .RS 3 .TP 2 @@ -359,31 +321,31 @@ .LP Each of these options is detailed in the Options section below. .LP -.RE .SS JAR File Verification .LP -.RS 3 - -.LP .LP A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps: .LP .RS 3 .TP 3 1. -Verify the signature of the .SF file itself. -.LP -That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with. +Verify the signature of the .SF file itself. +.br +.br +That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with. .TP 3 2. -Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest. -.LP -The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step. -.LP -If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File). -.LP -One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file. +Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest. +.br +.br +The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step. +.br +.br +If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File). +.br +.br +One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file. .TP 3 3. Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails. @@ -393,13 +355,9 @@ .LP If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP. .LP -.RE .SS Multiple Signatures for a JAR File .LP -.RS 3 - -.LP .LP A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in: .LP @@ -435,11 +393,8 @@ .LP Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP. .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The various \f3jarsigner\fP options are listed and described below. Note: .LP @@ -462,12 +417,15 @@ .RS 3 .TP 3 \-keystore url -Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property. -.LP -A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default). -.LP -A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore. -.LP +Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property. +.br +.br +A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default). +.br +.br +A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore. +.br +.br Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is, .nf \f3 @@ -494,79 +452,93 @@ \f2\-storetype PKCS11\fP .RE For example, this command lists the contents of the configured PKCS#11 token: -.RS 3 - -.LP .nf \f3 .fl jarsigner \-keystore NONE \-storetype PKCS11 \-list .fl - -.fl \fP .fi -.RE .TP 3 \-storetype storetype -Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP. -.LP -The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified. +Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP. +.br +.br +The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified. .TP 3 -\-storepass password -Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password. -.LP -Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. +\-storepass[:env | :file] argument +Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password. +.br +.br +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. .TP 3 -\-keypass password -Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it. -.LP -Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. Also, when typing in a password at the password prompt, the password is echoed (displayed exactly as typed), so be careful not to type it in front of anyone. +\-keypass[:env | :file] argument +Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it. +.br +.br +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. .TP 3 \-sigfile file -Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file. -.LP -The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names. -.LP -If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. +Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file. +.br +.br +The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names. +.br +.br +If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. .TP 3 \-sigalg algorithm -.RS 3 - -.LP -Specifies the name of the signature algorithm to use to sign the JAR file. -.LP +Specifies the name of the signature algorithm to use to sign the JAR file. +.br +.br See .na \f2Appendix A\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA or SHA256withRSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. -.LP -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. .TP 3 \-digestalg algorithm -.RS 3 -Specifies the name of the message digest algorithm to use when digesting the entries of a jar file. -.LP +Specifies the name of the message digest algorithm to use when digesting the entries of a jar file. +.br +.br See .na \f2Appendix A\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA\-256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. -.LP -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. .TP 3 \-signedjar file -Specifies the name to be used for the signed JAR file. -.LP -If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file. +Specifies the name to be used for the signed JAR file. +.br +.br +If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file. .TP 3 \-verify -If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)" -.LP -It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both. -.LP -For further information on verification, see JAR File Verification. +If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)" +.br +.br +It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both. +.br +.br +For further information on verification, see JAR File Verification. .TP 3 \-certs If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes @@ -578,7 +550,6 @@ o if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer .RE -.LP The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed: .RS 3 .TP 2 @@ -596,26 +567,25 @@ In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP .TP 3 \-sectionsonly -If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File . -.LP -By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file. -.LP -For further information, see JAR File Verification. -.LP -\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP +If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File . +.br +.br +By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file. +.br +.br +For further information, see JAR File Verification. +.br +.br +\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP .TP 3 \-protected Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. -.RE -.RS 3 .TP 3 -\-provider provider\-class\-name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP. -.LP +\-providerClass provider\-class\-name +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP. +.br +.br Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file. -.RS 3 - -.LP .nf \f3 .fl @@ -629,19 +599,16 @@ .fl \fP .fi -.RE .TP 3 \-providerName providerName -If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider. -.LP +If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider. +.br +.br For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the .na \f2configuration attributes table\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: .nf \f3 .fl @@ -653,58 +620,59 @@ .fl \fP .fi -.RE .TP 3 \-Jjavaoption -Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. -.LP +Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .TP 3 \-tsa url -If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore. -.LP +If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore. +.br +.br To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in .na \f2RFC 3161\fP @ .fi -http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file. -.LP +http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file. .TP 3 \-tsacert alias -If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA. -.LP -The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP. -.LP +If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA. +.br +.br +The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP. .TP 3 \-altsigner class -Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism. -.LP -For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP -.LP +Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism. +.br +.br +For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP .TP 3 \-altsignerpath classpathlist -Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below. -.LP -An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path. -.LP +Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below. +.br +.br +An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path. +.br +.br Example of specifying the path to a jar file that contains the class file: -.RS 3 - -.LP -.LP -\f2\-altsignerpath /home/user/lib/authsigner.jar\fP -.LP -.RE -.LP -Note that the JAR file name is included. -.LP +.nf +\f3 +.fl +\-altsignerpath /home/user/lib/authsigner.jar +.fl +\fP +.fi +Note that the JAR file name is included. +.br +.br Example of specifying the path to the jar file that contains the class file: -.RS 3 -.LP -\f2\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP -.LP -.RE -.LP -Note that the JAR file name is omitted. +.nf +\f3 +.fl +\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/ +.fl +\fP +.fi +Note that the JAR file name is omitted. .TP 3 \-strict During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details. @@ -712,25 +680,22 @@ \-verbose:sub\-options For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information. .RE -.SH "EXAMPLES" + .LP - +.SH "EXAMPLES" .LP .SS Signing a JAR File .LP -.RS 3 - .LP -.LP -Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. Suppose the keystore password is "myspass" and the password for \f2jane\fP's private key is "j638klm". You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar": +Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar": .LP .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3 .fl - \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane + \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -747,7 +712,7 @@ .fl jarsigner \-keystore /working/mystore .fl - \-signedjar sbundle.jar bundle.jar jane + \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -759,7 +724,7 @@ .nf \f3 .fl - jarsigner \-signedjar sbundle.jar bundle.jar jane + jarsigner \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -771,26 +736,22 @@ .nf \f3 .fl - jarsigner bundle.jar jane + jarsigner bundle.jar jane .fl \fP .fi -.RE .LP .SS Verifying a Signed JAR File .LP -.RS 3 - -.LP .LP To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following: .LP .nf \f3 .fl - jarsigner \-verify sbundle.jar + jarsigner \-verify sbundle.jar .fl \fP .fi @@ -851,7 +812,7 @@ Verification with Certificate Information .LP .LP -If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (iff it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example, +If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example, .LP .nf \f3 @@ -961,11 +922,8 @@ .LP Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias. .LP -.RE .SH "WARNINGS" .LP - -.LP During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows: .nf \f3 @@ -980,25 +938,25 @@ .fl This jar contains entries whose signer certificate has expired. .fl - + .fl notYetValidCert 4 .fl This jar contains entries whose signer certificate is not yet valid. .fl - + .fl chainNotValidated 4 .fl This jar contains entries whose certificate chain cannot be correctly validated. .fl - + .fl badKeyUsage 8 .fl This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing. .fl - + .fl badExtendedKeyUsage 8 .fl @@ -1006,33 +964,33 @@ .fl doesn't allow code signing. .fl - + .fl badNetscapeCertType 8 .fl - This jar contains entries whose signer certificate's NetscapeCertType extension + This jar contains entries whose signer certificate's NetscapeCertType extension .fl doesn't allow code signing. .fl - + .fl hasUnsignedEntry 16 .fl This jar contains unsigned entries which have not been integrity\-checked. .fl - + .fl notSignedByAlias 32 .fl This jar contains signed entries which are not signed by the specified alias(es) .fl - + .fl aliasNotInStore 32 .fl This jar contains signed entries that are not signed by alias in this keystore .fl - + .fl \fP .fi @@ -1042,24 +1000,20 @@ When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned. .LP .LP -\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the exit code +\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned: .LP .nf \f3 .fl -failure 1 +failure 1 .fl \fP .fi .LP -will be returned. .SS Compatibility with JDK 1.1 .LP -.RS 3 - -.LP .LP The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them. .LP @@ -1390,7 +1344,7 @@ .nr 44 \n(83+(3*\n(38) .nr 84 +\n(44 .nr TW \n(84 -.if t .if \n(TW>\n(.li .tm Table at line 1128 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1591,8 +1545,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o @@ -1606,13 +1558,12 @@ .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool +http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool .RE .LP -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/java.1 --- a/jdk/src/solaris/doc/sun/man/man1/java.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/java.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH java 1 "02 Jun 2010" +.TH java 1 "10 May 2011" .LP .SH "Name" @@ -38,9 +38,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -56,11 +53,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method. .LP @@ -70,7 +64,7 @@ .nf \f3 .fl - public static void main(String args[]) +public static void main(String args[]) .fl \fP .fi @@ -87,76 +81,79 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases. .LP .SH "Standard Options" .LP - -.LP .RS 3 .TP 3 \-client -.LP -Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM. -.LP +Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM. +.br +.br +For default VM selection, see +.na +\f2Server\-Class Machine Detection\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html +.TP 3 +\-server +Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit. +.br +.br For default VM selection, see .na \f2Server\-Class Machine Detection\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html -.TP 3 -\-server -.LP -Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit. -.LP -For default VM selection, see -.na -\f2Server\-Class Machine Detection\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html +http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html .TP 3 \-agentlib:libname[=options] -Load native agent library \f2libname\fP, e.g. -.LP -\-agentlib:hprof -.LP -\-agentlib:jdwp=help -.LP -\-agentlib:hprof=help -.LP +Load native agent library \f2libname\fP, e.g. +.br +.br +\-agentlib:hprof +.br +.br +\-agentlib:jdwp=help +.br +.br +\-agentlib:hprof=help +.br +.br For more information, see .na \f2JVMTI Agent Command Line Options\fP @ .fi -http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting. +http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. .TP 3 \-agentpath:pathname[=options] Load a native agent library by full pathname. For more information, see .na \f2JVMTI Agent Command Line Options\fP @ .fi -http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting. +http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. .TP 3 \-classpath classpath .TP 3 \-cp classpath -Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable. -.LP +Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable. +.br +.br If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP). -.LP +.br +.br As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. -.LP +.br +.br For more information on class paths, see .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath. +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. .TP 3 \-Dproperty=value Set a system property value. @@ -164,19 +161,23 @@ \-d32 .TP 3 \-d64 -Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported. -.LP -Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release. -.LP -If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. +Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported. +.br +.br +Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release. +.br +.br +If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. .TP 3 \-enableassertions[:<package name>"..." | :<class name> ] .TP 3 \-ea[:<package name>"..." | :<class name> ] -Enable assertions. Assertions are disabled by default. -.LP -With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class. -.LP +Enable assertions. Assertions are disabled by default. +.br +.br +With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class. +.br +.br If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: .nf \f3 @@ -185,26 +186,26 @@ .fl \fP .fi -.LP -The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. +The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. .TP 3 \-disableassertions[:<package name>"..." | :<class name> ] .TP 3 \-da[:<package name>"..." | :<class name> ] -Disable assertions. This is the default. -.LP -With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class. -.LP +Disable assertions. This is the default. +.br +.br +With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class. +.br +.br To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used: .nf \f3 .fl -java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class> +java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3 .fl \fP .fi -.LP -The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. +The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. .TP 3 \-enablesystemassertions .TP 3 @@ -215,29 +216,36 @@ .TP 3 \-dsa Disables asserts in all system classes. -.LP .TP 3 \-jar Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the .na \f2Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar for information about working with Jar files and Jar\-file manifests. -.LP -When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored. -.LP +http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests. +.br +.br +When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored. +.br +.br Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to .na \f2Java Archive (JAR) Files\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/index.html. +http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html. .TP 3 \-javaagent:jarpath[=options] Load a Java programming language agent, see .na \f2java.lang.instrument\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/lang/instrument/package\-summary.html. +http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. +.TP 3 +\-jre\-restrict\-search +Include user\-private JREs in the version search. +.TP 3 +\-no\-jre\-restrict\-search +Exclude user\-private JREs in the version search. .TP 3 \-verbose .TP 3 @@ -254,8 +262,9 @@ Display version information and exit. .TP 3 \-version:release -Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used. -.LP +Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used. +.br +.br \f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example: .nf \f3 @@ -264,11 +273,13 @@ .fl \fP .fi -The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56). -.LP -For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line. -.LP -See the following NOTES section for important policy information on the use of this option. +The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56). +.br +.br +For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line. +.br +.br +See the following NOTES section for important policy information on the use of this option. .TP 3 \-showversion Display version information and continue. @@ -278,6 +289,9 @@ \-help Display usage information and exit. .TP 3 +\-splash:imagepath +Show splash screen with image specified by \f2imagepath\fP. +.TP 3 \-X Display information about non\-standard options and exit. .RE @@ -287,9 +301,6 @@ Non\-Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Xint Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. @@ -319,18 +330,20 @@ Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. .TP 3 \-Xloggc:file -Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event. -.LP -Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. -.LP +Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event. +.br +.br +Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. .TP 3 \-Xmsn -Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics +Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see +.na +\f2HotSpot Ergonomics\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html +.br .br Examples: -.RS 3 - -.LP .nf \f3 .fl @@ -340,19 +353,20 @@ .fl \-Xms6m .fl - + .fl \fP .fi -.RE .TP 3 \-Xmxn -Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics +Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see +.na +\f2HotSpot Ergonomics\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html +.br .br Examples: -.RS 3 - -.LP .nf \f3 .fl @@ -362,28 +376,31 @@ .fl \-Xmx80m .fl - + .fl \fP .fi -.RE On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts. .TP 3 \-Xprof Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems. -.LP .TP 3 \-Xrs -Reduces use of operating\-system signals by the Java virtual machine (JVM). -.LP -In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly. -.LP -Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks. -.LP -The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps. -.LP -Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed. -.LP +Reduces use of operating\-system signals by the Java virtual machine (JVM). +.br +.br +In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly. +.br +.br +Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks. +.br +.br +The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps. +.br +.br +Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed. +.br +.br There are two consequences of specifying \f3\-Xrs\fP: .RS 3 .TP 2 @@ -402,12 +419,11 @@ .RE .LP -.RE .SH "NOTES" .LP - .LP -The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: +The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: +.LP .RS 3 .TP 3 1. @@ -422,8 +438,7 @@ .fl \fP .fi -.LP -Would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. +This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. .TP 3 3. A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example: @@ -448,10 +463,23 @@ .RE .LP -.SH "SEE ALSO" +.SH "EXIT STATUS" +.LP +.LP +The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. .LP +.RS 3 +.TP 2 +o +\f20\fP: Successful completion +.TP 2 +o +\f2>0\fP: An error occurred +.RE .LP +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -470,13 +498,13 @@ .na \f2The Java Extensions Framework\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html .TP 2 o .na \f2Security Features\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/index.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html. .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javac.1 --- a/jdk/src/solaris/doc/sun/man/man1/javac.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javac.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javac 1 "02 Jun 2010" +.TH javac 1 "10 May 2011" .LP .SH "Name" @@ -27,14 +27,12 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl \fP\f3javac\fP [ options ] [ sourcefiles ] [ classes ] [ @argfiles ] .fl - + .fl .fi @@ -43,9 +41,6 @@ Arguments may be in any order. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -61,11 +56,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f3javac\fP tool reads class and interface definitions, written in the Java programming language, and compiles them into bytecode class files. It can also process annotations in Java source files and classes. .LP @@ -96,8 +88,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The compiler has a set of standard options that are supported on the current development environment and will be supported in future releases. An additional set of non\-standard options are specific to the current virtual machine and compiler implementations and are subject to change in the future. Non\-standard options begin with \f3\-X\fP. .LP @@ -105,28 +95,18 @@ Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Akey[=value] Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".". .TP 3 \-cp path or \-classpath path -Specify where to find user class files, and (optionally) annotation processors and source files. This classpath overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See -.na -\f2Setting the Class Path\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath for more details. -.LP -If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files. -.LP -If the \f3\-processorpath\fP option is not specified, the classpath is also searched for annotation processors. -.LP -As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP. +Specify where to find user class files, and (optionally) annotation processors and source files. This class path overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See Setting the Class Path for more details. .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. \f3Note:\fP \ Depending of the configuration of your command line environment, you may have to quote the wild card character, for example, \f2javac \-cp "*.jar" MyClass.java\fP. +>If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files. +.br +.br +If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors. .TP 3 \-Djava.ext.dirs=directories Override the location of installed extensions. @@ -135,17 +115,28 @@ Override the location of endorsed standards path. .TP 3 \-d directory -Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP. -.LP -If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated. -.LP -\f3Note:\fP \ The directory specified by \f3\-d\fP is not automatically added to your user class path. +Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP. +.br +.br +If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated. +.br +.br +\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path. .TP 3 \-deprecation Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP. .TP 3 \-encoding encoding -Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used. +Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used. +.TP 3 +\-endorseddirs directories +Override the location of endorsed standards path. +.TP 3 +\-extdirs directories +Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path. +.br +.br +If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information. .TP 3 \-g Generate all debugging information, including local variables. By default, only line number and source file information is generated. @@ -171,7 +162,13 @@ Print a synopsis of standard options. .TP 3 \-implicit:{class,none} -Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types. +Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types. +.TP 3 +\-Joption +Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. +.br +.br +\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. .TP 3 \-nowarn Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP. @@ -183,7 +180,7 @@ Names of the annotation processors to run. This bypasses the default discovery process. .TP 3 \-processorpath path -Specify where to find annotation processors; if this option is not used, the classpath will be searched for processors. +Specify where to find annotation processors; if this option is not used, the class path will be searched for processors. .TP 3 \-s dir Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP. @@ -218,41 +215,42 @@ .RE .TP 3 \-sourcepath sourcepath -Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name. -.LP -\f3Note:\fP \ Classes found through the classpath may be subject to automatic recompilation if their sources are also found. See Searching For Types. +Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name. +.br +.br +\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types. .TP 3 \-verbose Verbose output. This includes information about each class loaded and each source file compiled. .TP 3 \-version -Print version information. +Print version information. +.TP 3 +\-Werror +Terminate compilation if warnings occur. .TP 3 \-X Display information about non\-standard options and exit. .RE .LP -.RE .SS Cross\-Compilation Options .LP -.RS 3 - -.LP .LP By default, classes are compiled against the bootstrap and extension classes of the platform that \f3javac\fP shipped with. But \f3javac\fP also supports \f2cross\-compiling\fP, where classes are compiled against a bootstrap and extension classes of a different Java platform implementation. It is important to use \f3\-bootclasspath\fP and \f3\-extdirs\fP when cross\-compiling; see Cross\-Compilation Example below. .LP .RS 3 .TP 3 \-target version -Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP). -.LP +Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP). +.br +.br The default for \f3\-target\fP depends on the value of \f3\-source\fP: .RS 3 .TP 2 o -If \-source is \f3not specified\fP, the value of \-target is \f31.6\fP +If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP .TP 2 o If \-source is \f31.2\fP, the value of \-target is \f31.4\fP @@ -261,25 +259,18 @@ If \-source is \f31.3\fP, the value of \-target is \f31.4\fP .TP 2 o -For \f3all other values\fP of \-source, the value of \-target is the value of \f3\-source\fP. +For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP. .RE .TP 3 \-bootclasspath bootclasspath Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. -.TP 3 -\-extdirs directories -Cross\-compile against the specified extension directories. \f2Directories\fP is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. .RE .LP -.RE .SS Non\-Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Xbootclasspath/p:path Prepend to the bootstrap class path. @@ -291,54 +282,19 @@ Override location of bootstrap class files. .TP 3 \-Xlint -Enable all recommended warnings. In this release, all available warnings are recommended. +Enable all recommended warnings. In this release, enabling all available warnings is recommended. +.TP 3 +\-Xlint:all +Enable all recommended warnings. In this release, enabling all available warnings is recommended. .TP 3 \-Xlint:none -Disable all warnings not mandated by the Java Language Specification. +Disable all warnings. +.TP 3 +\-Xlint:name +Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option. .TP 3 \-Xlint:\-name -Disable warning \f2name\fP, where \f2name\fP is one of the warning names supported for \f3\-Xlint:\fP\f2name\fP, below. -.TP 3 -\-Xlint:unchecked -Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. -.TP 3 -\-Xlint:path -Warn about nonexistent path (classpath, sourcepath, etc) directories. -.TP 3 -\-Xlint:serial -Warn about missing \f2serialVersionUID\fP definitions on serializable classes. -.TP 3 -\-Xlint:finally -Warn about \f2finally\fP clauses that cannot complete normally. -.TP 3 -\-Xlint:fallthrough -Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement: -.RS 3 - -.LP -.nf -\f3 -.fl -switch (x) { -.fl -case 1: -.fl - System.out.println("1"); -.fl - // No break; statement here. -.fl -case 2: -.fl - System.out.println("2"); -.fl -} -.fl - -.fl -\fP -.fi -.RE -If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question. +Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option. .TP 3 \-Xmaxerrs number Set the maximum number of errors to print. @@ -350,7 +306,10 @@ Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP. .TP 3 \-Xprefer:{newer,source} -Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP. +Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP. +.TP 3 +\-Xpkginfo:{always,legacy,nonempty} +Specify handling of package\-info files .TP 3 \-Xprint Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change. @@ -363,27 +322,420 @@ .RE .LP -.RE .SS -The \-J Option +Warnings That Can Be Enabled or Disabled with \-Xlint Option .LP -.RS 3 - +.LP +Enable warning \f2name\fP with the option \f3\-Xlint:\fP\f2name\fP, where \f2name\fP is one of the following warning names. Similarly, you can disable warning \f2name\fP with the option \f3\-Xlint:\-\fP\f2name\fP: .LP .RS 3 .TP 3 -\-Joption -Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f3\-X\fP, it is not a `standard option' of \f3javac\fP. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. -.LP -\f3Note:\fP \ \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. +cast +Warn about unnecessary and redundant casts. For example: +.nf +\f3 +.fl +String s = (String)"Hello!" +.fl +\fP +.fi +.TP 3 +classfile +Warn about issues related to classfile contents. +.TP 3 +deprecation +Warn about use of deprecated items. For example: +.nf +\f3 +.fl + java.util.Date myDate = new java.util.Date(); +.fl + int currentDay = myDate.getDay(); +.fl +\fP +.fi +The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1. +.TP 3 +dep\-ann +Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example: +.nf +\f3 +.fl + /** +.fl + * @deprecated As of Java SE 7, replaced by {@link #newMethod()} +.fl + */ +.fl + +.fl + public static void deprecatedMethood() { } +.fl + +.fl + public static void newMethod() { } +.fl +\fP +.fi +.TP 3 +divzero +Warn about division by constant integer 0. For example: +.nf +\f3 +.fl + int divideByZero = 42 / 0; +.fl +\fP +.fi +.TP 3 +empty +Warn about empty statements after \f2if\fP statements. For example: +.nf +\f3 +.fl +class E { +.fl + void m() { +.fl + if (true) ; +.fl + } +.fl +} +.fl +\fP +.fi +.TP 3 +fallthrough +Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement: +.nf +\f3 +.fl +switch (x) { +.fl +case 1: +.fl + System.out.println("1"); +.fl + // No break statement here. +.fl +case 2: +.fl + System.out.println("2"); +.fl +} +.fl +\fP +.fi +If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question. +.TP 3 +finally +Warn about \f2finally\fP clauses that cannot complete normally. For example: +.nf +\f3 +.fl + public static int m() { +.fl + try { +.fl + throw new NullPointerException(); +.fl + } catch (NullPointerException e) { +.fl + System.err.println("Caught NullPointerException."); +.fl + return 1; +.fl + } finally { +.fl + return 0; +.fl + } +.fl + } +.fl +\fP +.fi +The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method. +.TP 3 +options +Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning. +.TP 3 +overrides +Warn about issues regarding method overrides. For example, consider the following two classes: +.nf +\f3 +.fl +public class ClassWithVarargsMethod { +.fl + void varargsMethod(String... s) { } +.fl +} +.fl +\fP +.fi +.nf +\f3 +.fl +public class ClassWithOverridingMethod extends ClassWithVarargsMethod { +.fl + @Override +.fl + void varargsMethod(String[] s) { } +.fl +} +.fl +\fP +.fi +The compiler generates a warning similar to the following: +.br +.br +\f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP +.br +.br +When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles. +.TP 3 +path +Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example: +.nf +\f3 +.fl +javac \-Xlint:path \-classpath /nonexistentpath Example.java +.fl +\fP +.fi +.TP 3 +processing +Warn about issues regarding annotation processing. The compiler generates this warning if you have a class that has an annotation, and you use an annotation processor that cannot handle that type of exception. For example, the following is a simple annotation processor: +.br +.br +\f3Source file \fP\f4AnnoProc.java\fP: +.nf +\f3 +.fl +import java.util.*; +.fl +import javax.annotation.processing.*; +.fl +import javax.lang.model.*; +.fl +import javax.lang.model.element.*; +.fl + +.fl +@SupportedAnnotationTypes("NotAnno") +.fl +public class AnnoProc extends AbstractProcessor { +.fl + public boolean process(Set<? extends TypeElement> elems, RoundEnvironment renv) { +.fl + return true; +.fl + } +.fl + +.fl + public SourceVersion getSupportedSourceVersion() { +.fl + return SourceVersion.latest(); +.fl + } +.fl +} +.fl +\fP +.fi +\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP +.nf +\f3 +.fl +@interface Anno { } +.fl + +.fl +@Anno +.fl +class AnnosWithoutProcessors { } +.fl +\fP +.fi +The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP: +.nf +\f3 +.fl +% javac AnnoProc.java +.fl +% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java +.fl +\fP +.fi +When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning: +.br +.br +\f2warning: [processing] No processor claimed any of these annotations: Anno\fP +.br +.br +To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP. +.TP 3 +rawtypes +Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning: +.nf +\f3 +.fl +void countElements(List l) { ... } +.fl +\fP +.fi +The following does not generate a \f2rawtypes\fP warning: +.nf +\f3 +.fl +void countElements(List<?> l) { ... } +.fl +\fP +.fi +\f2List\fP is a raw type. However, \f2List<?>\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface. +.TP 3 +serial +Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example: +.nf +\f3 +.fl +public class PersistentTime implements Serializable +.fl +{ +.fl + private Date time; +.fl + +.fl + public PersistentTime() { +.fl + time = Calendar.getInstance().getTime(); +.fl + } +.fl + +.fl + public Date getTime() { +.fl + return time; +.fl + } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning: +.br +.br +\f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP +.br +.br +If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value. +.TP 3 +static +Warn about issues relating to use of statics. For example: +.nf +\f3 +.fl +class XLintStatic { +.fl + static void m1() { } +.fl + void m2() { this.m1(); } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning: +.nf +\f3 +.fl +warning: [static] static method should be qualified by type name, XLintStatic, instead of by an expression +.fl +\fP +.fi +To resolve this issue, you can call the static method \f2m1\fP as follows: +.nf +\f3 +.fl +XLintStatic.m1(); +.fl +\fP +.fi +Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP. +.TP 3 +try +Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used: +.nf +\f3 +.fl +try ( AutoCloseable ac = getResource() ) { +.fl + // do nothing +.fl +} +.fl +\fP +.fi +.TP 3 +unchecked +Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example: +.nf +\f3 +.fl + List l = new ArrayList<Number>(); +.fl + List<String> ls = l; // unchecked warning +.fl +\fP +.fi +During type erasure, the types \f2ArrayList<Number>\fP and \f2List<String>\fP become \f2ArrayList\fP and \f2List\fP, respectively. +.br +.br +The variable \f2ls\fP has the parameterized type \f2List<String>\fP. When the \f2List\fP referenced by \f2l\fP is assigned to \f2ls\fP, the compiler generates an unchecked warning; the compiler is unable to determine at compile time, and moreover knows that the JVM will not be able to determine at runtime, if \f2l\fP refers to a \f2List<String>\fP type; it does not. Consequently, heap pollution occurs. +.br +.br +In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List<Number>\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List<String>\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List<Number>\fP and \f2List<String>\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP. +.TP 3 +varargs +Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example: +.nf +\f3 +.fl +public class ArrayBuilder { +.fl + public static <T> void addToList (List<T> listArg, T... elements) { +.fl + for (T x : elements) { +.fl + listArg.add(x); +.fl + } +.fl + } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP: +.nf +\f3 +.fl +warning: [varargs] Possible heap pollution from parameterized vararg type T +.fl +\fP +.fi +When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution. .RE .LP -.RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP .LP To shorten or simplify the javac command line, you can specify one or more files that themselves contain arguments to the \f2javac\fP command (except \f2\-J\fP options). This enables you to create javac commands of any length on any operating system. .LP @@ -405,9 +757,7 @@ .nf \f3 .fl - % \fP\f3javac @argfile\fP -.fl - +% \fP\f3javac @argfile\fP .fl .fi @@ -433,7 +783,7 @@ .fl \-sourcepath /java/pubs/ws/1.3/src/share/classes .fl - + .fl \fP .fi @@ -451,7 +801,7 @@ .fl MyClass3.java .fl - + .fl \fP .fi @@ -465,7 +815,7 @@ .fl % \fP\f3javac @options @classes\fP .fl - + .fl .fi @@ -479,17 +829,13 @@ .nf \f3 .fl - % \fP\f3javac @path1/options @path2/classes\fP -.fl - +% \fP\f3javac @path1/options @path2/classes\fP .fl .fi .LP .SH "ANNOTATION PROCESSING" .LP - -.LP .LP \f3javac\fP provides direct support for annotation processing, superseding the need for the separate annotation processing tool, \f3apt\fP. .LP @@ -500,11 +846,7 @@ Overview of annotation processing .LP .LP -Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named -.br -\f2\ META\-INF/services/javax.annotation.processing.Processor\fP -.br -on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option. +Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named \f2META\-INF/services/javax.annotation.processing.Processor\fP on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option. .LP .LP After scanning the source files and classes on the command line to determine what annotations are present, the compiler queries the processors to determine what annotations they process. When a match is found, the processor will be invoked. A processor may "claim" the annotations it processes, in which case no further attempt is made to find any processors for those annotations. Once all annotations have been claimed, the compiler does not look for additional processors. @@ -523,8 +865,6 @@ .LP .SH "SEARCHING FOR TYPES" .LP - -.LP .LP When compiling a source file, the compiler often needs information about a type whose definition did not appear in the source files given on the command line. The compiler needs type information for every class or interface used, extended, or implemented in the source file. This includes classes and interfaces not explicitly mentioned in the source file but which provide information through inheritance. .LP @@ -532,11 +872,7 @@ For example, when you subclass \f3java.applet.Applet\fP, you are also using \f3Applet's\fP ancestor classes: \f3java.awt.Panel\fP, \f3java.awt.Container\fP, \f3java.awt.Component\fP, and \f3java.lang.Object\fP. .LP .LP -When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see -.na -\f2Setting the Class Path\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath). +When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see Setting the Class Path). .LP .LP If you set the \-sourcepath option, the compiler searches the indicated path for source files; otherwise the compiler searches the user class path for both class files and source files. @@ -555,8 +891,6 @@ .LP .SH "PROGRAMMATIC INTERFACE" .LP - -.LP .LP \f3javac\fP supports the new Java Compiler API defined by the classes and interfaces in the \f2javax.tools\fP package. .LP @@ -573,8 +907,6 @@ .fl int rc = javac.run(null, null, null, args); .fl - -.fl \fP .fi @@ -588,11 +920,8 @@ .SS Old Interface .LP -.RS 3 - .LP -.LP -\f3Note:\fP \ This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above. +\f3Note:\fP This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above. .LP .LP The \f2com.sun.tools.javac.Main\fP class provides two static methods to invoke the compiler from a program: @@ -604,8 +933,6 @@ .fl public static int compile(String[] args, PrintWriter out); .fl - -.fl \fP .fi @@ -622,21 +949,14 @@ .LP Note that all \f3other\fP classes and methods found in a package whose name starts with \f2com.sun.tools.javac\fP (informally known as sub\-packages of \f2com.sun.tools.javac\fP) are strictly internal and subject to change at any time. .LP -.RE .SH "EXAMPLES" .LP .SS Compiling a Simple Program .LP -.RS 3 - -.LP .LP One source file, \f2Hello.java\fP, defines a class called \f3greetings.Hello\fP. The \f2greetings\fP directory is the package directory both for the source file and the class file and is off the current directory. This allows us to use the default user class path. It also makes it unnecessary to specify a separate destination directory with \f3\-d\fP. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -682,25 +1002,15 @@ .fl Hello Everyone .fl - -.fl .fi -.RE .LP -.RE .SS Compiling Multiple Source Files .LP -.RS 3 - -.LP .LP This example compiles all the source files in the package \f2greetings\fP. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -720,27 +1030,15 @@ .fl Aloha.java GutenTag.java Hello.java Hi.java .fl - -.fl - -.fl .fi -.RE .LP -.RE .SS Specifying a User Class Path .LP -.RS 3 - -.LP .LP Having changed one of the source files in the previous example, we recompile it: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -750,35 +1048,23 @@ .fl % \f3javac greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP Since \f2greetings.Hi\fP refers to other classes in the \f2greetings\fP package, the compiler needs to find these other classes. The example above works, because our default user class path happens to be the directory containing the package directory. But suppose we want to recompile this file and not worry about which directory we're in? Then we need to add \f2/examples\fP to the user class path. We can do this by setting \f3CLASSPATH\fP, but here we'll use the \f3\-classpath\fP option. .LP -.RS 3 - -.LP .nf \f3 .fl % \fP\f3javac \-classpath /examples /examples/greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP If we change \f2greetings.Hi\fP again, to use a banner utility, that utility also needs to be accessible through the user class path. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -786,42 +1072,26 @@ .fl /examples/greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP To execute a class in \f2greetings\fP, we need access both to \f2greetings\fP and to the classes it uses. .LP -.RS 3 - -.LP .nf \f3 .fl % \fP\f3java \-classpath /examples:/lib/Banners.jar greetings.Hi\fP .fl - -.fl .fi -.RE .LP -.RE .SS Separating Source Files and Class Files .LP -.RS 3 - -.LP .LP It often makes sense to keep source files and class files in separate directories, especially on large projects. We use \f3\-d\fP to indicate the separate class file destination. Since the source files are not in the user class path, we use \f3\-sourcepath\fP to help the compiler find them. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -855,61 +1125,56 @@ .fl Base.class GoodBye.class .fl - -.fl - -.fl .fi -.RE .LP .LP -\f3Note:\fP \ The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option. +\f3Note:\fP The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option. .LP -.RE .SS Cross\-Compilation Example .LP -.RS 3 - .LP -.LP -Here we use \f3javac\fP to compile code that will run on a 1.7 VM. -.LP -.RS 3 - +Here we use \f3javac\fP to compile code that will run on a 1.6 VM. .LP .nf \f3 .fl -% \fP\f3javac \-target 1.7 \-bootclasspath jdk1.7.0/lib/rt.jar \\ +% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\ .fl \-extdirs "" OldCode.java\fP .fl - -.fl .fi -.RE .LP .LP -The \f3\-target 1.7\fP option ensures that the generated class files will be compatible with 1.7 VMs. By default, \f3javac\fP compiles for JDK 6. +The \f2\-source 1.6\fP option specifies that version 1.6 (or 6) of the Java programming language be used to compile \f2OldCode.java\fP. The option \f3\-target 1.6\fP option ensures that the generated class files will be compatible with 1.6 VMs. Note that in most cases, the value of the \f3\-target\fP option is the value of the \f3\-source\fP option; in this example, you can omit the \f3\-target\fP option. .LP .LP -The Java Platform JDK's \f3javac\fP would also by default compile against its own bootstrap classes, so we need to tell \f3javac\fP to compile against JDK 1.7 bootstrap classes instead. We do this with \f3\-bootclasspath\fP and \f3\-extdirs\fP. Failing to do this might allow compilation against a Java Platform API that would not be present on a 1.7 VM and would fail at runtime. +You must specify the \f3\-bootclasspath\fP option to specify the correct version of the bootstrap classes (the \f2rt.jar\fP library). If not, the compiler generates a warning: .LP -.RE +.nf +\f3 +.fl +% \fP\f3javac \-source 1.6 OldCode.java\fP +.fl +warning: [options] bootstrap class path not set in conjunction with \-source 1.6 +.fl +.fi + +.LP +.LP +If you do not specify the correct version of bootstrap classes, the compiler will use the old language rules (in this example, it will use version 1.6 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to non\-existent methods can get included. +.LP .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o .na \f2The javac Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javac/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html .TP 2 o java(1) \- the Java Application Launcher @@ -933,7 +1198,7 @@ .na \f2The Java Extensions Framework\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javadoc.1 --- a/jdk/src/solaris/doc/sun/man/man1/javadoc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javadoc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,16 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javadoc 1 "02 Jun 2010" +.TH javadoc 1 "10 May 2011" .SH "Name" javadoc \- The Java API Documentation Generator -.RS 3 - .LP -.LP -Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Sun Solaris. -.LP -.RE +Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Solaris. .SH "SYNOPSIS" .LP -.LP \f4javadoc\fP\f2\ [\ \fP\f2options\fP\f2\ ]\ [\ packagenames\ ]\ [\ sourcefilenames\ ]\ [\ \-subpackages\fP\ \f2pkg1:pkg2:...\fP\f2\ ]\ [\ \fP\f2@argfiles\fP\f2\ ]\fP .LP -.LP Arguments can be in any order. See processing of Source Files for details on how the Javadoc tool determines which "\f2.java\fP" files to process. -.LP -.RS 3 - -.LP .RS 3 .TP 3 options @@ -49,11 +38,7 @@ A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages .TP 3 sourcefilenames -A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes +A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes .TP 3 \-subpackages pkg1:pkg2:... Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames. @@ -61,31 +46,19 @@ @argfiles One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files. .RE - -.LP -.RE .SH "DESCRIPTION" .LP -.LP The \f3Javadoc\fP tool parses the declarations and documentation comments in a set of Java source files and produces a corresponding set of HTML pages describing (by default) the public and protected classes, nested classes (but not anonymous inner classes), interfaces, constructors, methods, and fields. You can use it to generate the API (Application Programming Interface) documentation or the implementation documentation for a set of source files. .LP -.LP You can run the Javadoc tool on entire packages, individual source files, or both. When documenting entire packages, you can either use \f2\-subpackages\fP for traversing recursively down from a top\-level directory, or pass in an explicit list of package names. When documenting individual source files, you pass in a list of source (\f2.java\fP) filenames. Examples are given at the end of this document. How Javadoc processes source files is covered next. -.LP .SS Processing of source files .LP -.LP The Javadoc tool processes files that end in "\f2.java\fP" plus other files described under Source Files. If you run the Javadoc tool by explicitly passing in individual source filenames, you can determine exactly which "\f2.java\fP" files are processed. However, that is not how most developers want to work, as it is simpler to pass in package names. The Javadoc tool can be run three ways without explicitly specifying the source filenames. You can (1) pass in package names, (2) use \f2\-subpackages\fP, and (3) use wildcards with source filenames (\f2*.java\fP). In these cases, the Javadoc tool processes a "\f2.java\fP" file only if it fulfills all of the following requirements: -.LP .RS 3 .TP 2 o -Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625 for legal characters) +Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters) .TP 2 o Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots) @@ -93,11 +66,8 @@ o Its package statement contains the legal package name (specified in the previous bullet) .RE - -.LP .LP \f3Processing of links\fP \- During a run, the Javadoc tool automatically adds cross\-reference links to package, class and member names that are being documented as part of that run. Links appear in several places: -.LP .RS 3 .TP 2 o @@ -124,69 +94,50 @@ o The index .RE - -.LP .LP You can add hyperlinks to existing text for classes not included on the command line (but generated separately) by way of the \f2\-link\fP and \f2\-linkoffline\fP options. .LP -.LP \f3Other processing details\fP \- The Javadoc tool produces one complete document each time it is run; it cannot do incremental builds \-\- that is, it cannot modify or \f2directly\fP incorporate results from previous runs of the Javadoc tool. However, it can link to results from other runs, as just mentioned. .LP -.LP As implemented, the Javadoc tool requires and relies on the java compiler to do its job. The Javadoc tool calls part of \f2javac\fP to compile the declarations, ignoring the member implementation. It builds a rich internal representation of the classes, including the class hierarchy, and "use" relationships, then generates the HTML from that. The Javadoc tool also picks up user\-supplied documentation from documentation comments in the source code. .LP -.LP In fact, the Javadoc tool will run on \f2.java\fP source files that are pure stub files with no method bodies. This means you can write documentation comments and run the Javadoc tool in the earliest stages of design while creating the API, before writing the implementation. .LP -.LP -Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents -.na -\f2default constructors\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (section 8.6.7 of \f2Java Language Specification\fP) that are present in the \f2.class\fP files but not in the source code. -.LP +Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents default constructors (see Java Language Specification) that are present in the \f2.class\fP files but not in the source code. .LP In many cases, the Javadoc tool allows you to generate documentation for source files whose code is incomplete or erroneous. This is a benefit that enables you to generate documentation before all debugging and troubleshooting is done. For example, according to the \f2Java Language Specification\fP, a class that contains an abstract method should itself be declared abstract. The Javadoc tool does not check for this, and would proceed without a warning, whereas the javac compiler stops on this error. The Javadoc tool does do some primitive checking of doc comments. Use the DocCheck doclet to check the doc comments more thoroughly. .LP -.LP When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path. .SS Javadoc Doclets .LP -.LP You can customize the content and format of the Javadoc tool's output by using doclets. The Javadoc tool has a default "built\-in" doclet, called the standard doclet, that generates HTML\-formatted API documentation. You can modify or subclass the standard doclet, or write your own doclet to generate HTML, XML, MIF, RTF or whatever output format you'd like. Information about doclets and their use is at the following locations: -.LP .RS 3 .TP 2 o .na \f2Javadoc Doclets\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html .TP 2 o The \f2\-doclet\fP command\-line option .RE - -.LP .LP When a custom doclet is not specified with the \f2\-doclet\fP command line option, the Javadoc tool will use the default standard doclet. The javadoc tool has several command line options that are available regardless of which doclet is being used. The standard doclet adds a supplementary set of command line options. Both sets of options are described below in the options section. -.LP .SS Related Documentation and Doclets -.LP .RS 3 .TP 2 o .na \f2Javadoc Enhancements\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. .TP 2 o .na @@ -198,7 +149,7 @@ .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html for more information about Sun conventions for writing documentation comments. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments. .TP 2 o .na @@ -216,22 +167,18 @@ .na \f2DocCheck Doclet\fP @ .fi -http://java.sun.com/javadoc/doccheck \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Sun Doc Check Utilities. +http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities. .TP 2 o .na \f2MIF Doclet\fP @ .fi -http://java.sun.com/javadoc/mifdoclet \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format. +http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format. .RE - -.LP .SS Terminology .LP -.LP The terms \f2documentation comment\fP, \f2doc comment\fP, \f2main description\fP, \f2tag\fP, \f2block tag\fP, and \f2in\-line tag\fP are described at Documentation Comments. These other terms have specific meanings within the context of the Javadoc tool: -.LP .RS 3 .TP 3 generated document @@ -259,34 +206,25 @@ .na \f21.3\fP @ .fi -http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. +http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. .LP .TP 3 external referenced classes The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited. .RE - -.LP .SH "SOURCE FILES" .LP -.LP The Javadoc tool will generate output originating from four different types of "source" files: Java language source files for classes (\f2.java\fP), package comment files, overview comment files, and miscellaneous unprocessed files. This section also covers test files and template files that can also be in the source tree, but which you want to be sure not to document. -.LP .SS Class Source Code Files .LP -.LP Each class or interface and its members can have their own documentation comments, contained in a \f2.java\fP file. For more details about these doc comments, see Documentation Comments. -.LP .SS Package Comment Files .LP -.LP Each package can have its own documentation comment, contained in its own "source" file, that the Javadoc tool will merge into the package summary page that it generates. You typically include in this comment any documentation that applies to the entire package. .LP -.LP To create a package comment file, you have a choice of two files to place your comments: -.LP .RS 3 .TP 2 o @@ -295,52 +233,18 @@ o \f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations. .RE - -.LP .LP A package may have a single \f2package.html\fP file or a single \f2package\-info.java\fP file but not both. Place either file in the package directory in the source tree along with your \f2.java\fP files. .LP -.LP \f4package\-info.java\fP \- This file can contain a package comment of the following structure \-\- the comment is placed before the package declaration: .LP -.LP File: \f2java/applet/package\-info.java\fP -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 .nf \f3 .fl /** .fl - * Provides the classes necessary to create an + * Provides the classes necessary to create an .fl * applet and the classes an applet uses .fl @@ -372,105 +276,12 @@ .fl \fP .fi -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 352 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-42 - -.LP .LP Note that while the comment separators \f2/**\fP and \f2/*\fP must be present, the leading asterisks on the intermediate lines can be omitted. .LP -.LP \f4package.html\fP \- This file can contain a package comment of the following structure \-\- the comment is placed in the \f2<body>\fP element: .LP -.LP File: \f2java/applet/package.html\fP -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 .nf \f3 .fl @@ -478,7 +289,7 @@ .fl <BODY> .fl -Provides the classes necessary to create an applet and the +Provides the classes necessary to create an applet and the .fl classes an applet uses to communicate with its applet context. .fl @@ -506,77 +317,14 @@ .fl \fP .fi -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 405 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-40 - -.LP .LP Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the .na \f2example of \fP\f2package.html\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments. .LP \f3Processing of package comment file\fP \- When the Javadoc tool runs, it will automatically look for the package comment file; if found, the Javadoc tool does the following: -.LP .RS 3 .TP 2 o @@ -590,35 +338,27 @@ .na \f2Package Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/applet/package\-summary.html. +http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. .TP 2 o Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in .na \f2Overview Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. +http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. .RE - -.LP .SS Overview Comment File .LP -.LP Each application or set of packages that you are documenting can have its own overview documentation comment, kept in its own "source" file, that the Javadoc tool will merge into the overview page that it generates. You typically include in this comment any documentation that applies to the entire application or set of packages. .LP -.LP To create an overview comment file, you can name the file anything you want, typically \f4overview.html\fP and place it anywhere, typically at the top level of the source tree. For example, if the source files for the \f2java.applet\fP package are contained in \f2/home/user/src/java/applet\fP directory, you could create an overview comment file at \f2/home/user/src/overview.html\fP. .LP -.LP Notice you can have multiple overview comment files for the same set of source files, in case you want to run javadoc multiple times on different sets of packages. For example, you could run javadoc once with \-private for internal documentation and again without that option for public documentation. In this case, you could describe the documentation as public or internal in the first sentence of each overview comment file. .LP -.LP The content of the overview comment file is one big documentation comment, written in HTML, like the package comment file described previously. See that description for details. To re\-iterate, when writing the comment, you should make the first sentence a summary about the application or set of packages, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include overview tags; as with any documentation comment, all tags except in\-line tags, such as \f2{@link}\fP, must appear after the main description. If you add a \f2@see\fP tag, it must have a fully\-qualified name. .LP -.LP When you run the Javadoc tool, you specify the overview comment file name with the \-overview option. The file is then processed similar to that of a package comment file. -.LP .RS 3 .TP 2 o @@ -632,25 +372,19 @@ .na \f2Overview Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/overview\-summary.html. +http://download.oracle.com/javase/7/docs/api/overview\-summary.html. .TP 2 o Copies the first sentence of the overview comment to the top of the overview summary page. .RE - -.LP .SS Miscellaneous Unprocessed Files .LP -.LP You can also include in your source any miscellaneous files that you want the Javadoc tool to copy to the destination directory. These typically includes graphic files, example Java source (.java) and class (.class) files, and self\-standing HTML files whose content would overwhelm the documentation comment of a normal Java source file. .LP -.LP To include unprocessed files, put them in a directory called \f4doc\-files\fP which can be a subdirectory of any package directory that contains source files. You can have one such subdirectory for each package. You might include images, example code, source files, .class files, applets and HTML files. For example, if you want to include the image of a button \f2button.gif\fP in the \f2java.awt.Button\fP class documentation, you place that file in the \f2/home/user/src/java/awt/doc\-files/\fP directory. Notice the \f2doc\-files\fP directory should not be located at \f2/home/user/src/java/doc\-files\fP because \f2java\fP is not a package \-\- that is, it does not directly contain any source files. .LP -.LP All links to these unprocessed files must be hard\-coded, because the Javadoc tool does not look at the files \-\- it simply copies the directory and all its contents to the destination. For example, the link in the \f2Button.java\fP doc comment might look like: -.LP .nf \f3 .fl @@ -664,23 +398,16 @@ .fl \fP .fi - -.LP .SS Test Files and Template Files .LP -.LP Some developers have indicated they want to store test files and templates files in the source tree near their corresponding source files. That is, they would like to put them in the same directory, or a subdirectory, of those source files. .LP -.LP If you run the Javadoc tool by explicitly passing in individual source filenames, you can deliberately omit test and templates files and prevent them from being processed. However, if you are passing in package names or wildcards, you need to follow certain rules to ensure these test files and templates files are not processed. .LP -.LP Test files differ from template files in that the former are legal, compilable source files, while the latter are not, but may end with ".java". .LP -.LP \f3Test files\fP \- Often developers want to put compilable, runnable test files for a given package in the \f2same\fP directory as the source files for that package. But they want the test files to belong to a package other than the source file package, such as the unnamed package (so the test files have no package statement or a different package statement from the source). In this scenario, when the source is being documented by specifying its package name specified on the command line, the test files will cause warnings or errors. You need to put such test files in a subdirectory. For example, if you want to add test files for source files in \f2com.package1\fP, put them in a subdirectory that would be an invalid package name (because it contains a hyphen): -.LP .nf \f3 .fl @@ -688,29 +415,17 @@ .fl \fP .fi - -.LP .LP The test directory will be skipped by the Javadoc tool with no warnings. .LP -.LP If your test files contain doc comments, you can set up a separate run of the Javadoc tool to produce documentation of the test files by passing in their test source filenames with wildcards, such as \f2com/package1/test\-files/*.java\fP. .LP -.LP -\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). -.LP +\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see information about Identifiers in the Java Language Specification). .SH "GENERATED FILES" .LP -.LP By default, javadoc uses a standard doclet that generates HTML\-formatted documentation. This doclet generates the following kinds of files (where each HTML "page" corresponds to a separate file). Note that javadoc generates files with two types of names: those named after classes/interfaces, and those that are not (such as \f2package\-summary.html\fP). Files in the latter group contain hyphens to prevent filename conflicts with those in the former group. .LP -.LP \f3Basic Content Pages\fP -.LP .RS 3 .TP 2 o @@ -722,11 +437,8 @@ o One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) .RE - -.LP .LP \f3Cross\-Reference Pages\fP -.LP .RS 3 .TP 2 o @@ -750,15 +462,12 @@ o An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English). .RE - -.LP .LP \f3Support Files\fP -.LP .RS 3 .TP 2 o -A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. +A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. .TP 2 o One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content. @@ -775,45 +484,14 @@ o A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree. .RE - -.LP .LP \f3HTML Frames\fP .LP -.LP The Javadoc tool will generate either two or three HTML frames, as shown in the figure below. It creates the minimum necessary number of frames by omitting the list of packages if there is only one package (or no packages). That is, when you pass a single package name or source files (*.java) belonging to a single package as arguments into the javadoc command, it will create only one frame (C) in the left\-hand column \-\- the list of classes. When you pass into javadoc two or more package names, it creates a third frame (P) listing all packages, as well as an overview page (Detail). This overview page has the filename \f2overview\-summary.html\fP. Thus, this file is created only if you pass in two or more package names. You can bypass frames by clicking on the "No Frames" link or entering at overview\-summary.html. .LP -.LP If you are unfamiliar with HTML frames, you should be aware that frames can have \f2focus\fP for printing and scrolling. To give a frame focus, click on it. Then on many browsers the arrow keys and page keys will scroll that frame, and the print menu command will print it. .LP -.nf -\f3 -.fl - \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\- -.fl - |C| Detail | |P| Detail | -.fl - | | | | | | -.fl - | | | |\-| | -.fl - | | | |C| | -.fl - | | | | | | -.fl - | | | | | | -.fl - \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\- -.fl - javadoc *.java javadoc java.lang java.awt -.fl -\fP -.fi - -.LP -.LP Load one of the following two files as the starting page depending on whether you want HTML frames or not: -.LP .RS 3 .TP 2 o @@ -822,24 +500,14 @@ o \f2overview\-summary.html\fP (for no frames) .RE - -.LP .LP \f3Generated File Structure\fP .LP -.LP The generated class and interface files are organized in the same directory hierarchy that Java source files and class files are organized. This structure is one directory per subpackage. .LP -.LP For example, the document generated for the class \f2java.applet.Applet\fP class would be located at \f2java/applet/Applet.html\fP. The file structure for the java.applet package follows, given that the destination directory is named \f2apidocs\fP. All files that contain the word "frame" appear in the upper\-left or lower\-left frames, as noted. All other HTML files appear in the right\-hand frame. .LP -.RS 3 - -.LP -.LP NOTE \- Directories are shown in \f3bold\fP. The asterisks (\f2*\fP) indicate the files and directories that are \f2omitted\fP when the arguments to javadoc are source filenames (*.java) rather than package names. Also when arguments are source filenames, \f2package\-list\fP is created but is empty. The doc\-files directory will not be created in the destination unless it exists in the source tree. -.LP -.RE .nf \f3 .fl @@ -922,44 +590,31 @@ AudioClip.html Page for AudioClip source code .fl .fi - -.LP .SS Generated API Declarations .LP -.LP The Javadoc tool generates a declaration at the start of each class, interface, field, constructor, and method description for that API item. For example, the declaration for the \f2Boolean\fP class is: .LP -.LP \f2public final class Boolean\fP .br \f2extends Object\fP .br \f2implements Serializable\fP .LP -.LP and the declaration for the \f2Boolean.valueOf\fPmethod is: .LP -.LP \f2public static Boolean valueOf(String s)\fP .LP -.LP The Javadoc tool can include the modifiers \f2public\fP, \f2protected\fP, \f2private\fP, \f2abstract\fP, \f2final\fP, \f2static\fP, \f2transient\fP, and \f2volatile\fP, but not \f2synchronized\fP or \f2native\fP. These last two modifiers are considered implementation detail and not part of the API specification. .LP -.LP Rather than relying on the keyword \f2synchronized\fP, APIs should document their concurrency semantics in the comment's main description, as in "a single \f2Enumeration\fP cannot be used by multiple threads concurrently". The document should not describe how to achieve these semantics. As another example, while \f2Hashtable\fP should be thread\-safe, there's no reason to specify that we achieve this by synchronizing all of its exported methods. We should reserve the right to synchronize internally at the bucket level, thus offering higher concurrency. -.LP .SH "DOCUMENTATION COMMENTS" .LP -.LP The original "Documentation Comment Specification" can be found under related documentation. -.LP .SS Commenting the Source Code .LP -.LP You can include \f2documentation comments\fP ("doc comments") in the source code, ahead of declarations for any class, interface, method, constructor, or field. You can also create doc comments for each package and another one for the overview, though their syntax is slightly different. Doc comments are also known informally as "Javadoc comments" (but this term violates its trademark usage). A doc comment consists of the characters between the characters \f2/**\fP that begin the comment and the characters \f2*/\fP that end it. Leading asterisks are allowed on each line and are described further below. The text in a comment can continue onto multiple lines. -.LP .nf \f3 .fl @@ -973,11 +628,8 @@ .fl \fP .fi - -.LP .LP To save space you can put a comment on one line: -.LP .nf \f3 .fl @@ -985,14 +637,10 @@ .fl \fP .fi - -.LP .LP \f3Placement of comments\fP \- Documentation comments are recognized only when placed immediately before class, interface, constructor, method, or field declarations \-\- see the class example, method example, and field example. Documentation comments placed in the body of a method are ignored. Only one documentation comment per declaration statement is recognized by the Javadoc tool. .LP -.LP A common mistake is to put an \f2import\fP statement between the class comment and the class declaration. Avoid this, as the Javadoc tool will ignore the class comment. -.LP .nf \f3 .fl @@ -1014,11 +662,8 @@ .fl \fP .fi - -.LP .LP \f3A doc comment is composed of a \fP\f4main description\fP\f3 followed by a \fP\f4tag section\fP \- The \f2main description\fP begins after the starting delimiter \f2/**\fP and continues until the tag section. The \f2tag section\fP starts with the first block tag, which is defined by the first \f2@\fP character that begins a line (ignoring leading asterisks, white space, and leading separator \f2/**\fP). It is possible to have a comment with only a tag section and no main description. The main description cannot continue after the tag section begins. The argument to a tag can span multiple lines. There can be any number of tags \-\- some types of tags can be repeated while others cannot. For example, this \f2@see\fP starts the tag section: -.LP .nf \f3 .fl @@ -1032,11 +677,8 @@ .fl \fP .fi - -.LP .LP \f3Block tags and in\-line tags\fP \- A \f2tag\fP is a special keyword within a doc comment that the Javadoc tool can process. There are two kinds of tags: block tags, which appear as \f2@tag\fP (also known as "standalone tags"), and in\-line tags, which appear within curly braces, as \f2{@tag}\fP. To be interpreted, a block tag must appear at the beginning of a line, ignoring leading asterisks, white space, and separator (\f2/**\fP). This means you can use the \f2@\fP character elsewhere in the text and it will not be interpreted as the start of a tag. If you want to start a line with the \f2@\fP character and not have it be interpreted, use the HTML entity \f2@\fP. Each block tag has associated text, which includes any text following the tag up to, but not including, either the next tag, or the end of the doc comment. This associated text can span multiple lines. An in\-line tag is allowed and interpreted anywhere that text is allowed. The following example contains the block tag \f2@deprecated\fP and in\-line tag \f2{@link}\fP. -.LP .nf \f3 .fl @@ -1048,17 +690,12 @@ .fl \fP .fi - -.LP .LP \f3Comments are written in HTML\fP \- The text must be written in HTML, in that they should use HTML entities and can use HTML tags. You can use whichever version of HTML your browser supports; we have written the standard doclet to generate HTML 3.2\-compliant code elsewhere (outside of the documentation comments) with the inclusion of cascading style sheets and frames. (We preface each generated file with "HTML 4.0" because of the frame sets.) .LP -.LP For example, entities for the less\-than (\f2<\fP) and greater\-than (\f2>\fP) symbols should be written \f2<\fP and \f2>\fP. Likewise, the ampersand (\f2&\fP) should be written \f2&\fP. The bold HTML tag \f2\fP is shown in the following example. .LP -.LP Here is a doc comment: -.LP .nf \f3 .fl @@ -1072,20 +709,12 @@ .fl \fP .fi - -.LP .LP \f3Leading asterisks\fP \- When javadoc parses a doc comment, leading asterisk (\f2*\fP) characters on each line are discarded; blanks and tabs preceding the initial asterisk (\f2*\fP) characters are also discarded. Starting with 1.4, if you omit the leading asterisk on a line, the leading white space is no longer removed. This enables you to paste code examples directly into a doc comment inside a \f2<PRE>\fP tag, and its indentation will be honored. Spaces are generally interpreted by browsers more uniformly than tabs. Indentation is relative to the left margin (rather than the separator \f2/**\fP or \f2<PRE>\fP tag). .LP -.LP \f3First sentence\fP \- The first sentence of each doc comment should be a summary sentence, containing a concise but complete description of the declared entity. This sentence ends at the first period that is followed by a blank, tab, or line terminator, or at the first block tag. The Javadoc tool copies this first sentence to the member summary at the top of the HTML page. .LP -.LP \f3Declaration with multiple fields\fP \- Java allows declaring multiple fields in a single statement, but this statement can have only one documentation comment, which is copied for all fields. Therefore if you want individual documentation comments for each field, you must declare each field in a separate statement. For example, the following documentation comment doesn't make sense written as a single declaration and would be better handled as two declarations: -.LP -.RS 3 - -.LP .nf \f3 .fl @@ -1099,51 +728,32 @@ .fl \fP .fi -.RE - -.LP .LP The Javadoc tool generates the following documentation from the above code: -.LP -.RS 3 - -.LP .nf \f3 .fl public int \fP\f3x\fP .fl .fi - -.LP .RS 3 The horizontal and vertical distances of point (x,y) .RE - -.LP .nf \f3 .fl public int \fP\f3y\fP .fl .fi - -.LP .RS 3 The horizontal and vertical distances of point (x,y) .RE - -.LP -.RE .LP \f3Use header tags carefully\fP \- When writing documentation comments for members, it's best not to use HTML heading tags such as <H1> and <H2>, because the Javadoc tool creates an entire structured document and these structural tags might interfere with the formatting of the generated document. However, it is fine to use these headings in class and package comments to provide your own structure. -.LP .SS Automatic Copying of Method Comments .LP -.LP The Javadoc tool has the ability to copy or "inherit" method comments in classes and interfaces under the following two circumstances. Constructors, fields and nested classes do not inherit doc comments. -.LP .RS 3 .TP 2 o @@ -1156,14 +766,10 @@ o \f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot. .RE - -.LP .LP The source file for the inherited method need only be on the path specified by \-sourcepath for the doc comment to actually be available to copy. Neither the class nor its package needs to be passed in on the command line. This contrasts with 1.3.x and earlier releases, where the class had to be a documented class .LP -.LP \f3Inherit from classes and interfaces\fP \- Inheriting of comments occurs in all three possible cases of inheritance from classes and interfaces: -.LP .RS 3 .TP 2 o @@ -1175,17 +781,12 @@ o When a method in a class implements a method in an interface .RE - -.LP .LP In the first two cases, for method overrides, the Javadoc tool generates a subheading "Overrides" in the documentation for the overriding method, with a link to the method it is overriding, whether or not the comment is inherited. .LP -.LP In the third case, when a method in a given class implements a method in an interface, the Javadoc tool generates a subheading "Specified by" in the documentation for the overriding method, with a link to the method it is implementing. This happens whether or not the comment is inherited. .LP -.LP \f3Algorithm for Inheriting Method Comments\fP \- If a method does not have a doc comment, or has an {@inheritDoc} tag, the Javadoc tool searches for an applicable comment using the following algorithm, which is designed to find the most specific applicable doc comment, giving preference to interfaces over superclasses: -.LP .RS 3 .TP 3 1. @@ -1205,16 +806,11 @@ If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass. .RE .RE - -.LP .SH "JAVADOC TAGS" .LP -.LP The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together. .LP -.LP Tags come in two types: -.LP .RS 3 .TP 2 o @@ -1223,8 +819,6 @@ o \f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP. .RE - -.LP .LP For information about tags we might introduce in future releases, see .na @@ -1232,13 +826,8 @@ .fi http://java.sun.com/j2se/javadoc/proposed\-tags.html. .LP -.LP The current tags are: .LP -.RS 3 - -.LP -.LP .TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 @@ -1350,7 +939,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 1122 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 873 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1450,53 +1039,34 @@ .35 .TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-42 - -.LP .LP For custom tags, see the \-tag option. -.LP -.RE .RS 3 .TP 3 @author\ name\-text Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma. +.RE .LP For more details, see Where Tags Can Be Used and .na \f2writing @author tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author. -.LP -.TP 3 -@deprecated\ deprecated\-text -.RS 3 - -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author. .LP -Note: You can deprecate a program element using the -.na -\f2@Deprecated annotation\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/deprecation.html. -.LP +.RS 3 +.TP 3 +@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation. .RE -.RE -.RS 3 - -.LP .LP Adds a comment indicating that this API should no longer be used (even though it may continue to work). The Javadoc tool moves the \f2deprecated\-text\fP ahead of the main description, placing it in italics and preceding it with a bold warning: "Deprecated". This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field. .LP -.LP The first sentence of \f2deprecated\-text\fP should at least tell the user when the API was deprecated and what to use as a replacement. The Javadoc tool copies just the first sentence to the summary section and index. Subsequent sentences can also explain why it has been deprecated. You should include a \f2{@link}\fP tag (for Javadoc 1.2 or later) that points to the replacement API: .LP -.LP For more details, see .na \f2writing @deprecated tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated. .RS 3 .TP 2 o @@ -1518,19 +1088,13 @@ o For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag. .RE - -.LP .LP For more about deprecation, see .na \f2The @deprecated tag\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/index.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html. .LP - -.LP -.RE .RS 3 .TP 3 {@code\ text} @@ -1700,7 +1264,7 @@ .na \f2writing {@link} tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}. .LP .TP 3 {@linkplain\ package.class#member\ label} @@ -1716,13 +1280,8 @@ .fi .LP This would display as: -.RS 3 - .LP -.LP -Refer to the overridden method. -.LP -.RE +Refer to the overridden method. .LP .TP 3 {@literal\ text} @@ -1799,7 +1358,7 @@ .na \f2writing @param tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param. .LP .TP 3 @return\ description @@ -1809,7 +1368,7 @@ .na \f2writing @return tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return. .LP .TP 3 @see\ reference @@ -1834,18 +1393,12 @@ .RS 3 .RS 3 .RS 3 - -.LP -.RS 3 .RS 3 .TP 3 See Also: "The Java Programming Language" .RE .RE - -.LP -.RE .TP 3 @see <a href="URL#value">label</a> Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example: @@ -1858,14 +1411,10 @@ .fi This generates a link such as: .RS 3 -.RS 3 .TP 3 See Also: Java Spec .RE - -.LP -.RE .TP 3 @see\ package.class#member\ label Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text. @@ -1885,7 +1434,6 @@ .RE .LP \f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP". -.RS 3 .nf \f3 .fl @@ -1897,11 +1445,7 @@ .fl \fP .fi -.RE The standard doclet produces HTML something like this: -.RS 3 - -.LP .nf \f3 .fl @@ -1915,19 +1459,12 @@ .fl \fP .fi -.RE Which looks something like this in a browser, where the label is the visible link text: .RS 3 - -.LP -.RS 3 .TP 3 See Also: equals .RE - -.LP -.RE .LP \f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments. .LP @@ -2079,7 +1616,7 @@ .nr 40 \n(79+(0*\n(38) .nr 80 +\n(40 .nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1665 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1364 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2186,7 +1723,7 @@ .LP \f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified. .LP -When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in Chapter 6, "Names" of the \f2Java Language Specification\fP, Second Edition. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order: +When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order: .RS 3 .TP 3 1. @@ -2425,7 +1962,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 1741 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1440 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2598,14 +2135,9 @@ .na \f2writing @see tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see. .RE .RE -.RS 3 - -.LP -.LP - .LP .RS 3 .TP 3 @@ -2634,11 +2166,11 @@ .na \f2Documenting Serializable Fields and Data for a Class\fP @ .fi -http://java.sun.com/javase/6/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the +http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the .na \f2Serialization FAQ\fP @ .fi -http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see +http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see .na \f2Sun's criteria\fP @ .fi @@ -2681,7 +2213,7 @@ .na \f2writing @throws tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception. .LP .TP 3 {@value\ package.class#field} @@ -2727,7 +2259,7 @@ .na \f2Constant Field Values\fP @ .fi -http://java.sun.com/javase/6/docs/api/constant\-values.html page. +http://download.oracle.com/javase/7/docs/api/constant\-values.html page. .LP .TP 3 @version\ version\-text @@ -2739,376 +2271,111 @@ .na \f2writing @version tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version. -.RE - -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version. .RE .SS Where Tags Can Be Used .LP -.LP The following sections describe where the tags can be used. Note that these tags can be used in all doc comments: \f2@see\fP, \f2@since\fP, \f2@deprecated\fP, \f2{@link}\fP, \f2{@linkplain}\fP, and \f2{@docroot}\fP. -.LP -.RS 3 - -.LP .SS Overview Documentation Tags .LP -.LP Overview tags are tags that can appear in the documentation comment for the overview page (which resides in the source file typically named \f2overview.html\fP). Like in any other documentation comments, these tags must appear after the main description. .LP -.LP \f3NOTE\fP \- The \f2{@link}\fP tag has a bug in overview documents in version 1.2 \-\- the text appears properly but has no link. The \f2{@docRoot}\fP tag does not currently work in overview documents. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Overview Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1962 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Overview Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-20 - -.LP +\f3Overview Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE .SS Package Documentation Tags .LP -.LP Package tags are tags that can appear in the documentation comment for a package (which resides in the source file named \f2package.html\fP or \f2package\-info.java\fP). The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@serial\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Package Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1994 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Package Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-22 - -.LP +\f3Package Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE .SS Class and Interface Documentation Tags .LP -.LP The following are tags that can appear in the documentation comment for a class or interface. The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@serial\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Class/Interface Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2028 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Class/Interface Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-24 - -.LP +\f3Class/Interface Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE \f3An example of a class comment:\fP -.LP .nf \f3 .fl @@ -3146,129 +2413,42 @@ .fl \fP .fi - -.LP .SS Field Documentation Tags .LP -.LP -The following are the tags that can appear in the documentation comment for a field. -.LP +The following are the tags that can appear in .LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@serial\fP -.br -\f2@serialField\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -\f2{@value}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Field Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2103 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Field Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-24 - -.LP +\f3Field Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@serialField\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.TP 2 +o +\f2{@value}\fP +.RE \f3An example of a field comment:\fP -.LP .nf \f3 .fl @@ -3286,133 +2466,48 @@ .fl \fP .fi - -.LP .SS Constructor and Method Documentation Tags .LP -.LP The following are the tags that can appear in the documentation comment for a constructor or method, except for \f2@return\fP, which cannot appear in a constructor, and \f2{@inheritDoc}\fP, which has certain restrictions. The \f2@serialData\fP tag can only be used in the doc comment for certain serialization methods. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@param\fP -.br -\f2@return\fP -.br -\f2@throws\fP and \f2@exception\fP -.br -\f2@serialData\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@inheritDoc}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Method/Constructor Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2162 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Method/Constructor Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-28 - -.LP +\f3Method/Constructor Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@param\fP +.TP 2 +o +\f2@return\fP +.TP 2 +o +\f2@throws\fP and \f2@exception\fP +.TP 2 +o +\f2@serialData\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@inheritDoc}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE \f3An example of a method doc comment:\fP -.LP .nf \f3 .fl @@ -3446,23 +2541,12 @@ .fl \fP .fi -.RE - -.LP .SH "OPTIONS" .LP - -.LP -.LP The javadoc tool uses doclets to determine its output. The Javadoc tool uses the default standard doclet unless a custom doclet is specified with the \-doclet option. The Javadoc tool provides a set of command\-line options that can be used with any doclet \-\- these options are described below under the sub\-heading Javadoc Options. The standard doclet provides an additional set of command\-line options that are described below under the sub\-heading Options Provided by the Standard Doclet. All option names are case\-insensitive, though their arguments can be case\-sensitive. .LP -.LP The options are: .LP -.RS 3 - -.LP -.LP .TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 @@ -3615,6 +2699,8 @@ .br \-\f2sourcepath\fP .br +\-sourcetab +.br \-splitindex .br \-stylesheetfile @@ -3627,6 +2713,8 @@ .br \-tagletpath .br +\-top +.br \-title .br \-use @@ -3673,7 +2761,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 2340 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 2015 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3729,53 +2817,47 @@ .rm b+ .rm c+ .TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-123 - -.LP -.RE +.if \n-(b.=0 .nr c. \n(.c-\n(d.-127 .LP Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options. -.LP .SS Javadoc Options -.LP .RS 3 .TP 3 \-overview \ path/filename -Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the \f2\-sourcepath\fP. -.LP -While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example. -.LP -For information about the file specified by \f2path/filename\fP, see overview comment file. -.LP -Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) -.LP -The title on the overview page is set by \f2\-doctitle\fP. -.LP +Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the current directory. +.br +.br +While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example. +.br +.br +For information about the file specified by \f2path/filename\fP, see overview comment file. +.br +.br +Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) +.br +.br +The title on the overview page is set by \f2\-doctitle\fP. .TP 3 \-public -Shows only public classes and members. -.LP +Shows only public classes and members. .TP 3 \-protected -Shows only protected and public classes and members. This is the default. -.LP +Shows only protected and public classes and members. This is the default. .TP 3 \-package -Shows only package, protected, and public classes and members. -.LP +Shows only package, protected, and public classes and members. .TP 3 \-private -Shows all classes and members. -.LP +Shows all classes and members. .TP 3 \-help -Displays the online help, which lists these javadoc and doclet command line options. -.LP +Displays the online help, which lists these javadoc and doclet command line options. .TP 3 \-doclet\ class -Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option. -.LP +Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option. +.br +.br For example, to call the MIF doclet, use: .nf \f3 @@ -3784,17 +2866,16 @@ .fl \fP .fi -.LP For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi -http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP +http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. .TP 3 \-docletpath\ classpathlist -Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path. -.LP +Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path. +.br +.br Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included. .nf \f3 @@ -3815,207 +2896,33 @@ .na \f2MIF Doclet documentation\fP @ .fi -http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP +http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. .TP 3 \-1.1 -\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP -.LP +\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP .TP 3 \-source release Specifies the version of source code accepted. The following values for \f2release\fP are allowed: -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 81 -.nr 34 \n(.lu -.eo -.am 81 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used. -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.eo -.am 81 -.br -.di b+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc accepts code containing assertions, which were introduced in JDK 1.4. -.br -.di -.nr b| \n(dn -.nr b- \n(dl -.. -.ec \ -.eo -.am 81 -.br -.di c+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. -.br -.di -.nr c| \n(dn -.nr c- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 31 0 -.nr 32 0 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.5\fP -.if \n(32<\n(38 .nr 32 \n(38 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.4\fP -.if \n(32<\n(38 .nr 32 \n(38 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.3\fP -.if \n(32<\n(38 .nr 32 \n(38 -.80 -.rm 80 -.nr 60 \n(31 -.nr 38 \n(60+\n(32 -.if \n(38>\n(80 .nr 80 \n(38 -.if \n(38<\n(80 .nr 60 +(\n(80-\n(38)/2 -.nr 81 0 -.81 -.rm 81 -.nr 38 \n(a- -.if \n(81<\n(38 .nr 81 \n(38 -.nr 38 \n(b- -.if \n(81<\n(38 .nr 81 \n(38 -.nr 38 \n(c- -.if \n(81<\n(38 .nr 81 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr 60 +\n(40 -.nr 41 \n(80+(3*\n(38) -.nr 81 +\n(41 -.nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 2450 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.5\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.ne \n(b|u+\n(.Vu -.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.4\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.b+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.ne \n(c|u+\n(.Vu -.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.3\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.c+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.rm b+ -.rm c+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-14 -.LP -Use the value of \f2release\fP corresponding to that used when compiling the code with javac. -.LP +.RS 3 +.TP 2 +o +\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used. +.TP 2 +o +\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4. +.TP 2 +o +\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. +.RE +Use the value of \f2release\fP corresponding to that used when compiling the code with javac. .TP 3 \-sourcepath\ sourcepathlist -Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented. -.LP -Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files. -.LP +Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented. +.br +.br +Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files. +.br +.br Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at: .nf \f3 @@ -4031,8 +2938,9 @@ % \fP\f3javadoc \-sourcepath /home/user/src/ com.mypackage\fP .fl .fi -This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP. -.LP +This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP. +.br +.br To point to two source paths: .nf \f3 @@ -4040,17 +2948,18 @@ % \fP\f3javadoc \-sourcepath /home/user1/src:/home/user2/src com.mypackage\fP .fl .fi -.LP .TP 3 \-classpath\ classpathlist Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in .na \f2class path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP. -.LP -If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP. +.br +.br +If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP. +.br +.br For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify: .nf \f3 @@ -4058,23 +2967,25 @@ % \fP\f3javadoc \-classpath /home/user/lib \-sourcepath /home/user/src com.mypackage\fP .fl .fi -As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory. -.LP +As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory. +.br +.br For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. -.LP -As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). -.br -.br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. +.br +.br +As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations). +.br +.br +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-subpackages\ \ package1:package2:... -Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files. -.LP +Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files. +.br +.br For example: .nf \f3 @@ -4082,10 +2993,10 @@ % \fP\f3javadoc \-d docs \-sourcepath /home/user/src \-subpackages java:javax.swing\fP .fl .fi -This command generates documentation for packages named "java" and "javax.swing" and all their subpackages. -.LP -You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages. -.LP +This command generates documentation for packages named "java" and "javax.swing" and all their subpackages. +.br +.br +You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages. .TP 3 \-exclude\ \ packagename1:packagename2:... Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example: @@ -4095,36 +3006,32 @@ % \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP .fl .fi -would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP). -.LP +would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP). .TP 3 \-bootclasspath\ classpathlist Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:). -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:). .TP 3 \-extdirs\ dirlist -Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:). -.LP +Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:). .TP 3 \-verbose -Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file. -.LP +Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file. .TP 3 \-quiet -Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string. -.LP +Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string. .TP 3 \-breakiterator\ Uses the internationalized sentence boundary of .na \f2java.text.BreakIterator\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index. -.LP +http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index. +.br +.br From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm: .RS 3 .TP 2 @@ -4134,31 +3041,22 @@ o Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag. .RE -.RS 3 - -.LP -.LP -NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused. -.LP -.RE +NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused. .TP 3 \-locale\ language_country_variant -.RS 3 -.LP \f3Important\fP \- The \f2\-locale\fP option must be placed \f2ahead\fP (to the left) of any options provided by the standard doclet or any other doclet. Otherwise, the navigation bars will appear in English. This is the only command\-line option that is order\-dependent. -.LP -.RE -.LP -Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant). -.LP -Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes. -.LP +.br +.br +Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant). +.br +.br +Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes. .TP 3 \-encoding\ name -Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used. -.LP -Also see \-docencoding and \-charset. -.LP +Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used. +.br +.br +Also see \-docencoding and \-charset. .TP 3 \-Jflag Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required): @@ -4183,12 +3081,12 @@ .RE .SS Options Provided by the Standard Doclet -.LP .RS 3 .TP 3 \-d\ directory -Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run. -.LP +Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run. +.br +.br For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory: .nf \f3 @@ -4196,28 +3094,27 @@ % \fP\f3javadoc \-d /home/user/doc com.mypackage\fP .fl .fi -.LP .TP 3 \-use -Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C. -.LP -For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP. -.LP -Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP. -.LP -You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar. +Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C. +.br +.br +For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP. +.br +.br +Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP. +.br +.br +You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar. .TP 3 \-version -Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option. -.LP +Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option. .TP 3 \-author -Includes the @author text in the generated docs. -.LP +Includes the @author text in the generated docs. .TP 3 \-splitindex -Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters. -.LP +Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters. .TP 3 \-windowtitle\ title Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option. @@ -4238,8 +3135,7 @@ .fi .TP 3 \-title\ title -\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. -.LP +\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. .TP 3 \-header\ header Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped. @@ -4249,28 +3145,30 @@ % \fP\f3javadoc \-header "Java 2 Platform v1.4" com.mypackage\fP .fl .fi -.LP .TP 3 \-footer\ footer Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped. -.LP +.TP 3 +\-top +Specifies the text to be placed at the top of each output file. .TP 3 \-bottom\ text -Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. -.LP +Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. .TP 3 \-link\ extdocURL -Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: -.LP +Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: .RS 3 .TP 2 o -\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. -.LP -You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. -.LP -When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. -.LP +\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. +.br +.br +You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. +.br +.br +When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. +.br +.br In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the .na \f2URL Memo\fP @ @@ -4288,8 +3186,11 @@ \f2\-link <directory>/<directory>/.../<name>\fP .RE .RE -.LP -You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. \f3Choosing between \-linkoffline and \-link\fP: +You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. +.br +.br +\f3Choosing between \-linkoffline and \-link\fP: +.br .br Use \f2\-link\fP: .RS 3 @@ -4306,16 +3207,17 @@ o when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side. .RE -.LP +.br +.br \f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running: @@ -4325,17 +3227,21 @@ % \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP .fl .fi -.LP -Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). -.LP -\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. -.LP -Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) -.LP -This option can create links in several places in the generated documentation. -.LP -Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. -.LP +Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). +.br +.br +\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. +.br +.br +Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) +.br +.br +This option can create links in several places in the generated documentation. +.br +.br +Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. +.br +.br \f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced: .RS 3 .TP 2 @@ -4353,16 +3259,17 @@ .br The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement. .RE -.LP -An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. -.LP -\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. -.LP +An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. +.br +.br +\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. +.br +.br For example, the package list for the Java SE 6 API is located at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list. and starts as follows: +http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows: .nf \f3 .fl @@ -4384,31 +3291,39 @@ .fl \fP .fi -.LP -When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. -.LP -In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. -.LP -\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. -.LP -Specify a different link option for each external document to link to: -.LP -\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP -.LP -where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. -.LP -\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. -.LP -In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. -.LP +When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. +.br +.br +In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. +.br +.br +\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. +.br +.br +Specify a different link option for each external document to link to: +.br +.br +\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP +.br +.br +where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. +.br +.br +\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. +.br +.br +In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. .TP 3 \-linkoffline\ extdocURL\ packagelistLoc -This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. -.LP -More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. -.LP -Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. -.LP +This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. +.br +.br +More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. +.br +.br +Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. +.br +.br The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP: .RS 3 .TP 2 @@ -4418,35 +3333,39 @@ o \f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename. .RE -.LP -You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) -.LP -\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://java.sun.com/javase/6/docs/api\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at +You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) +.br +.br +\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi -.LP -\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. -.LP -\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. -.LP -\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): -.LP +\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. +.br +.br +\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. +.br +.br +\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): +.br +.br \f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP .br \f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP .br -\f2\ \ \ \ \ \ \ \ \ \ ...\fP -.LP -\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. -.LP +\f2\ \ \ \ \ \ \ \ \ \ ...\fP +.br +.br +\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. +.br +.br First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update: .nf \f3 @@ -4454,14 +3373,15 @@ % \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP .fl .fi -When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. -.LP +When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. .TP 3 \-linksource\ -Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. -.LP -\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. -.LP +Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. +.br +.br +\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. +.br +.br Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button": .nf \f3 @@ -4482,7 +3402,6 @@ .fl \fP .fi -.LP .TP 3 \-group\ groupheading\ packagepattern:packagepattern:... Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP. @@ -4494,16 +3413,12 @@ o \f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP). .RE -.RS 3 - -.LP -.LP \f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP -.LP -.RE -.LP -If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". -.LP +.br +.br +If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". +.br +.br For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package. .nf \f3 @@ -4517,7 +3432,6 @@ .fi This results in the groupings: .RS 3 -.RS 3 .TP 3 Core Packages \f2java.lang\fP @@ -4530,38 +3444,27 @@ Other Packages \f2java.new\fP .RE - -.LP -.RE -.LP .TP 3 \-nodeprecated -Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. -.LP +Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. .TP 3 \-nodeprecatedlist -Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. -.LP +Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. .TP 3 \-nosince -Omits from the generated docs the "Since" sections associated with the @since tags. -.LP +Omits from the generated docs the "Since" sections associated with the @since tags. .TP 3 \-notree -Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. -.LP +Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. .TP 3 \-noindex -Omits the index from the generated docs. The index is produced by default. -.LP +Omits the index from the generated docs. The index is produced by default. .TP 3 \-nohelp -Omits the HELP link in the navigation bars at the top and bottom of each page of output. -.LP +Omits the HELP link in the navigation bars at the top and bottom of each page of output. .TP 3 \-nonavbar -Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. -.LP +Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. .TP 3 \-helpfile\ path/filename Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example: @@ -4582,8 +3485,7 @@ .fi .TP 3 \-serialwarn -Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. -.LP +Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. .TP 3 \-charset\ name Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the @@ -4609,10 +3511,10 @@ .na \f2HTML standard\fP @ .fi -http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) -.LP +http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) +.br +.br Also see \-encoding and \-docencoding. -.LP .TP 3 \-docencoding\ name Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the @@ -4626,12 +3528,12 @@ % \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP .fl .fi -Also see \-encoding and \-charset. -.LP +Also see \-encoding and \-charset. .TP 3 \-keywords -Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) -.LP +Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) +.br +.br The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords: .nf \f3 @@ -4646,16 +3548,21 @@ .fl \fP .fi -.LP .TP 3 \-tag\ \ tagname:Xaoptcmf:"taghead" -Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. -.LP -The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. -.LP -The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. -.LP -\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: \f4X\fP (disable tag) +Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. +.br +.br +The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. +.br +.br +The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. +.br +.br +\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: +.br +.br +\f4X\fP (disable tag) .br \f4a\fP (all) .br @@ -4670,7 +3577,8 @@ \f4m\fP (methods) .br \f4f\fP (fields) -.LP +.br +.br \f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is: .nf \f3 @@ -4715,8 +3623,9 @@ .fl \fP .fi -\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. -.LP +\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. +.br +.br You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use: .nf \f3 @@ -4733,13 +3642,15 @@ .fl \fP .fi -.LP -The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. -.LP -\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. -.LP -If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. -.LP +The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. +.br +.br +\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. +.br +.br +If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. +.br +.br \f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed): .nf \f3 @@ -4758,21 +3669,23 @@ .fl \fP .fi -.LP -When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. -.LP -The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. -.LP -\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Sun will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Sun. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Sun later creates a standard tag of the same name. -.LP +When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. +.br +.br +The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. +.br +.br +\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name. +.br +.br \f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See .na \f2Comparing Annotations and Javadoc Tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations -.LP -You can also create more complex block tags, or custom inline tags with the \-taglet option. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations< +.br +.br +You can also create more complex block tags, or custom inline tags with the \-taglet option. .TP 3 \-taglet\ \ class Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see: @@ -4782,13 +3695,14 @@ .na \f2Taglet Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/taglet/overview.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html .RE -.LP -Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. -.LP -Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. -.LP +Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. +.br +.br +Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. +.br +.br Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages: .nf \f3 @@ -4809,25 +3723,21 @@ .fl \fP .fi -.LP -Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. -.LP +Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. .TP 3 \-tagletpath\ \ tagletpathlist -Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. -.LP +Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. .TP 3 \-docfilessubdirs\ -Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. -.LP +Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. .TP 3 \-excludedocfilessubdir\ \ name1:name2... -Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. -.LP +Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. .TP 3 \-noqualifier\ \ all\ | \ packagename1:packagename2:... -Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. -.LP +Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. +.br +.br The following example omits all package qualifiers: .nf \f3 @@ -4852,8 +3762,7 @@ .fl \fP .fi -Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. -.LP +Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. .TP 3 \-notimestamp\ Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this: @@ -4864,53 +3773,40 @@ .fl \fP .fi -.LP .TP 3 \-nocomment\ Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project. +.TP 3 +\-sourcetab tabLength +Specify the number of spaces each tab takes up in the source. .RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP -.LP To shorten or simplify the javadoc command line, you can specify one or more files that themselves contain arguments to the \f2javadoc\fP command (except \f2\-J\fP options). This enables you to create javadoc commands of any length on any operating system. .LP -.LP An argument file can include javac options and source filenames in any combination. The arguments within a file can be space\-separated or newline\-separated. If a filename contains embedded spaces, put the whole filename in double quotes. .LP -.LP Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. .LP -.LP When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list. -.LP .SS Example \- Single Arg File .LP -.LP You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments: -.LP .nf \f3 .fl % \fP\f3javadoc @argfile\fP .fl .fi - -.LP .LP This argument file could contain the contents of both files shown in the next example. -.LP .SS Example \- Two Arg Files .LP -.LP You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.) .LP -.LP Create a file named "\f2options\fP" containing: -.LP .nf \f3 .fl @@ -4920,13 +3816,13 @@ .fl \-splitindex .fl - \-windowtitle 'Java(TM) SE 7 API Specification' -.fl - \-doctitle 'Java(TM) SE 7 API Specification' -.fl - \-header 'Java(TM); SE 7' -.fl - \-bottom 'Copyright 1993\-2009 Sun Microsystems, Inc. All Rights Reserved.' + \-windowtitle 'Java SE 7 API Specification' +.fl + \-doctitle 'Java SE 7 API Specification' +.fl + \-header 'Java(TM) SE 7' +.fl + \-bottom 'Copyright © 1993\-2011 Oracle and/or its affiliates. All rights reserved.' .fl \-group "Core Packages" "java.*" .fl @@ -4936,11 +3832,8 @@ .fl \fP .fi - -.LP .LP Create a file named "\f2packages\fP" containing: -.LP .nf \f3 .fl @@ -4952,120 +3845,85 @@ .fl \fP .fi - -.LP .LP You would then run javadoc with: -.LP .nf \f3 .fl % \fP\f3javadoc @options @packages\fP .fl .fi - -.LP .SS Example \- Arg Files with Paths .LP -.LP The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP): -.LP .nf \f3 .fl % \fP\f3javadoc @path1/options @path2/packages\fP .fl .fi - -.LP .SS Example \- Option Arguments .LP -.LP Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument: -.LP .nf \f3 .fl -'<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a -.fl -bug or feature</a> Java is a trademark or registered trademark of -.fl -Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-2000 Sun -.fl -Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl -All Rights Reserved.' + +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners. .fl \fP .fi - -.LP .LP Then run the Javadoc tool with: -.LP .nf \f3 .fl % \fP\f3javadoc \-bottom @bottom @packages\fP .fl .fi - -.LP .LP Or you could include the \f2\-bottom\fP option at the start of the argument file, and then just run it as: -.LP .nf \f3 .fl % \fP\f3javadoc @bottom @packages\fP .fl .fi - -.LP - -.LP .SH "Name" Running -.LP .SH "RUNNING JAVADOC" .LP - -.LP -.LP \f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP. .LP -.LP \f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see .na \f2Standard Doclet\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. .LP \f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP .SH "SIMPLE EXAMPLES" .LP - -.LP -.LP You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP. -.LP .SS Documenting One or More Packages .LP -.LP To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP. .LP -.LP You can run javadoc either by changing directories (with \f2cd\fP) or by using \f2\-sourcepath\fP option. The examples below illustrate both alternatives. -.LP .RS 3 .TP 2 o @@ -5108,17 +3966,12 @@ .fl .fi .RE - -.LP .LP Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages. -.LP .SS Documenting One or More Classes .LP -.LP The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes. -.LP .RS 3 .TP 2 o @@ -5155,93 +4008,76 @@ .fi This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP. .RE - -.LP .SS Documenting Both Packages and Classes .LP -.LP You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes. -.LP .nf \f3 .fl % \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP .fl .fi - -.LP .LP This example generates HTML\-formatted documentation for the package \f2java.awt\fP and class \f2Applet\fP. (The Javadoc tool determines the package name for \f2Applet\fP from the package declaration, if any, in the \f2Applet.java\fP source file.) -.LP .SH "REAL WORLD EXAMPLE" .LP - -.LP -.LP The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2. .LP -.LP The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory. -.LP .SS Command Line Example .LP -.LP -This command line example is over 900 characters, which is too long for some shells, such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. -.LP +The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. .nf \f3 .fl -% javadoc \-sourcepath /java/jdk/src/share/classes \\ -.fl - \-overview /java/jdk/src/share/classes/overview.html \\ -.fl - \-d /java/jdk/build/api \\ -.fl - \-use \\ -.fl - \-splitIndex \\ -.fl - \-windowtitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-doctitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-header 'Java(TM) SE 7' \\ -.fl - \-bottom '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl -a bug or feature</a> Java is a trademark or registered trademark of Sun Microsystems, -.fl -Inc. in the US and other countries. Copyright 1993\-1999 Sun Microsystems, Inc. -.fl -901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All Rights Reserved.' \\ +% javadoc \-sourcepath /java/jdk/src/share/classes \\ +.fl + \-overview /java/jdk/src/share/classes/overview.html \\ +.fl + \-d /java/jdk/build/api \\ +.fl + \-use \\ +.fl + \-splitIndex \\ +.fl + \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-header 'Java(TM) SE 7' \\ +.fl + \-bottom ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl - \-group "Extension Packages" "javax.*" \\ -.fl - \-J\-Xmx180m \\ + \-group "Extension Packages" "javax.*" \\ +.fl + \-J\-Xmx180m \\ .fl @packages .fl \fP .fi - -.LP .LP where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below. -.LP .SS Makefile Example .LP -.LP This is an example of a GNU makefile. For an example of a Windows makefile, see .na \f2creating a makefile for Windows\fP @ .fi http://java.sun.com/j2se/javadoc/faq/index.html#makefiles. -.LP .nf \f3 .fl @@ -5283,15 +4119,15 @@ .fl HEADER = 'Java(TM) SE 7' .fl -BOTTOM = '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl - a bug or feature</a> Java is a trademark or registered trademark -.fl - of Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-1999 -.fl - Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl - All Rights Reserved.' +BOTTOM = ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -5301,14 +4137,10 @@ .fl \fP .fi - -.LP .LP Single quotes are used to surround makefile arguments. .LP -.LP \f3NOTES\fP -.LP .RS 3 .TP 2 o @@ -5320,15 +4152,9 @@ o Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP. .RE - -.LP .SH "TROUBLESHOOTING" -.LP - -.LP .SS General Troubleshooting -.LP .RS 3 .TP 2 o @@ -5347,37 +4173,23 @@ o \f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename. .RE - -.LP .SS Errors and Warnings .LP -.LP Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment. -.LP .RS 3 .TP 2 o \f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP. .RE - -.LP .SH "ENVIRONMENT" -.LP - -.LP .RS 3 .TP 3 CLASSPATH Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example: .:/home/classes:/usr/local/java/classes .RE - -.LP .SH "SEE ALSO" -.LP - -.LP .RS 3 .TP 2 o @@ -5399,75 +4211,24 @@ .na \f2Javadoc Home Page\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general .TP 2 o .na \f2How Javac and Javadoc Find Classes\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) .RE - -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 80 0 -.80 -.rm 80 -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 3869 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.fc -.nr T. 1 -.T# 1 -.35 -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-3 - -.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javah.1 --- a/jdk/src/solaris/doc/sun/man/man1/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,38 +19,28 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "02 Jun 2010" +.TH javah 1 "10 May 2011" .LP .SH "Name" javah \- C Header and Stub File Generator .LP -.RS 3 - -.LP .LP \f3javah\fP produces C header files and C source files from a Java class. These files provide the connective glue that allow your Java and C code to interact. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . .fl -javah_g [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . -.fl \fP .fi .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3javah\fP generates C header and source files that are needed to implement native methods. The generated header and source files are used by C programs to reference an object's instance variables from native source code. The .h file contains a struct definition whose layout parallels the layout of the corresponding class. The fields in the struct correspond to instance variables in the class. .LP @@ -63,13 +53,8 @@ .LP The new native method interface, Java Native Interface (JNI), does not require header information or stub files. \f3javah\fP can still be used to generate native method function proptotypes needed for JNI\-style native methods. \f3javah\fP produces JNI\-style output by default, and places the result in the .h file. .LP -.LP -\f3javah_g\fP is a non\-optimized version of \f3javah\fP suitable for use with debuggers like jdb(1). -.LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-o outputfile @@ -110,11 +95,10 @@ .fl \fP .fi -.LP As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -132,8 +116,6 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH @@ -150,8 +132,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javap(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javap.1 --- a/jdk/src/solaris/doc/sun/man/man1/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,21 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "02 Jun 2010" +.TH javap 1 "10 May 2011" .LP .SH "Name" javap \- The Java Class File Disassembler .LP -.RS 3 - -.LP .LP Disassembles class files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -47,13 +41,21 @@ .LP .SH "DESCRIPTION" .LP +.LP +The \f3javap\fP command disassembles one or more class files. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. +.LP +.RS 3 +.TP 3 +options +Command\-line options. +.TP 3 +classes +List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP). +.RE .LP .LP -The \f3javap\fP command disassembles a class file. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. For example, compile the following class declaration: -.LP -.RS 3 - +For example, compile the following class declaration: .LP .nf \f3 @@ -96,166 +98,160 @@ .fl \fP .fi -.RE .LP .LP -The output from \f3javap DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl \fP .fi -.RE .LP .LP -The output from \f3javap \-c DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap \-c DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 <Method java.applet.Applet()> + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."<init>":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 <Method void resize(int, int)> + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 <String "LAST_UPDATED"> + 10: aload_0 .fl - 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 <Field java.lang.String date> + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 <String "EMAIL"> + 20: aload_0 .fl - 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 <Field java.lang.String email> + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 <Class java.lang.StringBuffer> + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 <Method java.lang.StringBuffer()> + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V .fl - 9 getfield #5 <Field java.lang.String date> + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 <String " by "> + 15: ldc #11 // String by .fl - 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 <Method java.lang.String toString()> + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 <Field java.lang.String email> + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 43: return .fl - 43 return +} .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 -\-help +\-help \-\-help \-? Prints out help message for \f3javap\fP. .TP 3 +\-version +Prints out version information. +.TP 3 \-l Prints out line and local variable tables. .TP 3 @@ -268,14 +264,11 @@ \-package Shows only package, protected, and public classes and members. This is the default. .TP 3 -\-private +\-private \-p Shows all classes and members. .TP 3 \-Jflag Pass \f2flag\fP directly to the runtime system. Some examples: -.RS 3 - -.LP .nf \f3 .fl @@ -285,11 +278,16 @@ .fl \fP .fi -.RE .TP 3 \-s Prints internal type signatures. .TP 3 +\-sysinfo +Shows system information (path, size, date, MD5 hash) of the class being processed. +.TP 3 +\-constants +Shows static final constants. +.TP 3 \-c Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the .na @@ -301,22 +299,7 @@ Prints stack size, number of \f2locals\fP and \f2args\fP for methods. .TP 3 \-classpath path -Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.nf -\f3 -.fl - .:<your_path> -.fl -\fP -.fi -For example: -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -326,32 +309,8 @@ .RE .LP -.SH "ENVIRONMENT VARIABLES" -.LP - -.LP -.RS 3 -.TP 3 -CLASSPATH -Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example, For example: -.RS 3 - -.LP -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE -.RE - -.LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javah(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javaws.1 --- a/jdk/src/solaris/doc/sun/man/man1/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,30 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "02 Jun 2010" +.TH javaws 1 "10 May 2011" .LP .SH "Name" \f2javaws\fP Command Line .LP -.LP -\ -.LP -.SS -NAME -.LP -.RS 3 - +.SH "NAME" .LP .LP \f2javaws\fP \- Java Web Start launcher command .LP -.RE -.SS -SYNOPSIS -.LP -.RS 3 - +.SH "SYNOPSIS" .LP .LP \f2javaws [run\-options] <jnlp>\fP @@ -50,49 +38,27 @@ .LP \f2javaws [control\-options]\fP .LP -.RE -.SS -PARAMETERS -.LP -.RS 3 - +.SH "PARAMETERS" .LP .LP \f2[run\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below. .LP -.RE .LP \f2<jnlp>\fP .LP -.RS 3 - -.LP .LP This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file. .LP -.RE .LP \f2[control\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below. .LP -.RE -.RE -.SS -DESCRIPTION -.LP -.RS 3 - +.SH "DESCRIPTION" .LP .LP The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network. @@ -103,256 +69,154 @@ .LP The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release. .LP -.RE -.SS -RUN\-OPTIONS -.LP -.RS 3 - +.SH "RUN\-OPTIONS" .LP .LP \f2\-offline\fP .LP -.RS 3 - -.LP .LP -run Java Web Start in offline mode. +Run Java Web Start in offline mode. .LP -.RE .LP \f2\-Xnosplash\fP .LP -.RS 3 - +.LP +Do not display the initial splash screen. .LP .LP -disable the display of the initial splash screen. -.LP -.RE -.LP \f2\-open <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP. .LP -.RE .LP \f2\-print <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP. .LP -.RE .LP \f2\-online\fP .LP -.RS 3 - -.LP .LP -run in online mode (default behavior). +Use online mode (default behavior). .LP -.RE .LP \f2\-wait\fP .LP -.RS 3 - -.LP .LP -If specified, the \f2javaws\fP process will not exit until the application exits. +If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms. .LP -.RE .LP \f2\-verbose\fP .LP -.RS 3 - -.LP .LP -display additional output. +Display additional output. .LP -.RE .LP \f2\-J<option>\fP .LP -.RS 3 - -.LP .LP -supply options to the vm. +Supply options to the VM. .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP -.LP -run the application from the system cache only. .LP -.RE -.RE -.SS -CONTROL\-OPTIONS +Run the application from the system cache only. .LP -.RS 3 - +.SH "CONTROL\-OPTIONS" .LP .LP \f2\-viewer\fP .LP -.RS 3 - +.LP +Show the Cache Viewer in the Java Control Panel. .LP .LP -show the Cache Viewer in the java control panel +\f2\-clearcache\fP +.LP .LP -.RE +Remove all non\-installed applications from the cache. +.LP .LP \f2\-userConfig <property name>\fP .LP -.RS 3 - -.LP .LP -clear the specified deployment property. +Clear the specified deployment property. .LP -.RE .LP \f2\-userConfig <property name> <property value>\fP .LP -.RS 3 - -.LP .LP -set the specified deployment property to the specified value. +Set the specified deployment property to the specified value. .LP -.RE .LP \f2\-uninstall\fP .LP -.RS 3 - -.LP .LP -remove all applications from the cache. +Remove all applications from the cache. .LP -.RE .LP \f2\-uninstall <jnlp>\fP .LP -.RS 3 - -.LP .LP -remove the application from the cache. +Remove the application from the cache. .LP -.RE .LP \f2\-import [import\-options] <jnlp>\fP .LP -.RS 3 - -.LP .LP -import the application to the cache. +Import the application to the cache. .LP -.RE -\f3IMPORT\-OPTIONS\fP +.SH "IMPORT\-OPTIONS" .LP .LP \f2\-silent\fP .LP -.RS 3 - -.LP .LP -import silently (with no user interface). +Import silently (with no user interface). .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP .LP -import application to the system cache. +Import application to the system cache. .LP -.RE .LP \f2\-codebase <url>\fP .LP -.RS 3 - -.LP .LP -retrieve resources from the given codebase. +Retrieve resources from the given codebase. .LP -.RE .LP \f2\-shortcut\fP .LP -.RS 3 - -.LP .LP -install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. +Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE .LP \f2\-association\fP .LP -.RS 3 - -.LP -.LP -install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE -.RE -.SS -FILES +Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RS 3 - +.SH "FILES" .LP .LP For information about the user and system cache and deployment.properties files, see .na \f2System\- and User\-Level Properties\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html. +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html. .LP -.RE -.SS -MORE INFORMATION -.LP -.RS 3 - +.SH "MORE INFORMATION" .LP .LP For more information about Java Web Start, see .na \f2Java Web Start\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html. -.LP -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html. .LP -\ -.LP -.RE -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jconsole.1 --- a/jdk/src/solaris/doc/sun/man/man1/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "02 Jun 2010" +.TH jconsole 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,41 +39,40 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 connection = pid | host:port | jmxUrl .RS 3 -\f2pid\fP\ \ \ Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See +.TP 2 +o +\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2host\fP:\f2port\fP\ \ Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2jmxUrl\fP\ \ Address of the JMX agent to be connected to as described in +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2jmxUrl\fP Address of the JMX agent to be connected to as described in .na \f2JMXServiceURL\fP @ .fi -http://java.sun.com/javase/6/docs/api/javax/management/remote/JMXServiceURL.html. +http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. .RE .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jconsole\fP command launches a graphical console tool that enables you to monitor and manage Java applications and virtual machines on a local or remote machine. .LP @@ -84,17 +81,15 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-interval=n Set the update interval to \f2n\fP seconds (default is 4 seconds). .TP 3 -\-notile\ +\-notile Do not tile windows initially (for two or more connections). .TP 3 -\-pluginpath\ plugins +\-pluginpath plugins Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named: .br .nf @@ -104,20 +99,19 @@ .fl \fP .fi -.LP containing one line for each plugin specifying the fully qualified class name of the class implementing the .na \f2com.sun.tools.jconsole.JConsolePlugin\fP @ .fi -http://java.sun.com/javase/6/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. +http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. .TP 3 -\-version\ +\-version Output version information and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jconsole is run. .RE @@ -130,13 +124,13 @@ .na \f2Using JConsole\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html .TP 2 o .na \f2Monitoring and Management for Java Platform\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jdb.1 --- a/jdk/src/solaris/doc/sun/man/man1/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "02 Jun 2010" +.TH jdb 1 "10 May 2011" .LP .SH "Name" jdb \- The Java Debugger .LP -.RS 3 - -.LP .LP \f3jdb\fP helps you find and fix bugs in Java language programs. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified below. @@ -60,24 +51,18 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the .na \f2Java Platform Debugger Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. .LP .SS Starting a jdb Session .LP -.RS 3 - -.LP .LP There are many ways to start a jdb session. The most frequently used way is to have \f3jdb\fP launch a new Java Virtual Machine (VM) with the main class of the application to be debugged. This is done by substituting the command \f3jdb\fP for \f3java\fP in the command line. For example, if your application's main class is MyClass, you use the following command to debug it under JDB: .LP @@ -137,7 +122,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the .na \f21.4.2 documentation\fP @ .fi @@ -150,9 +135,6 @@ The following is a list of the basic \f3jdb\fP commands. The Java debugger supports other commands which you can list using \f3jdb\fP's \f2help\fP command. .LP .RS 3 - -.LP -.RS 3 .TP 3 help, or ? The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description. @@ -164,10 +146,12 @@ Continues execution of the debugged application after a breakpoint, exception, or step. .TP 3 print -Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. -.LP -\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. -.LP +Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. +.br +.br +\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. +.br +.br \f2print\fP supports many simple Java expressions including those with method invocations, for example: .RS 3 .TP 2 @@ -188,15 +172,13 @@ .RE .TP 3 dump -For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. -.LP -The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. +For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. +.br +.br +The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. .TP 3 threads List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example: -.RS 3 - -.LP .nf \f3 .fl @@ -204,26 +186,22 @@ .fl \fP .fi -.RE In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running, .TP 3 thread Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above. .TP 3 where -\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. -.LP -If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. +\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. +.br +.br +If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. .RE .LP -.RE .SS Breakpoints .LP -.RS 3 - -.LP .LP Breakpoints can be set in \f3jdb\fP at line numbers or at the first instruction of a method, for example: .LP @@ -249,23 +227,15 @@ .LP The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution. .LP -.RE .SS Stepping .LP -.RS 3 - -.LP .LP The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame. .LP -.RE .SS Exceptions .LP -.RS 3 - -.LP .LP When an exception occurs for which there isn't a catch statement anywhere in the throwing thread's call stack, the VM normally prints an exception trace and exits. When running under \f3jdb\fP, however, control returns to \f3jdb\fP at the offending throw. You can then use \f3jdb\fP to diagnose the cause of the exception. .LP @@ -278,12 +248,8 @@ .LP \f2NOTE: The \fP\f2ignore\fP command does not cause the debugged VM to ignore specific exceptions, only the debugger. .LP -.RE -.RE .SH "Command Line Options" .LP - -.LP .LP When you use \f3jdb\fP in place of the Java application launcher on the command line, \f3jdb\fP accepts many of the same options as the java command, including \f2\-D\fP, \f2\-classpath\fP, and \f2\-X<option>\fP. .LP @@ -335,7 +301,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection alternatives. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives. .LP .SS Options Forwarded to Debuggee Process @@ -358,8 +324,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), javah(1), javap(1), javadoc(1). .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jhat.1 --- a/jdk/src/solaris/doc/sun/man/man1/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "02 Jun 2010" +.TH jhat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,17 +39,17 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 heap\-dump\-file Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3". -.SH "DESCRIPTION" +.RE + +.LP +.SH "DESCRIPTION" .LP .LP The \f3jhat\fP command parses a java heap dump file and launches a webserver. jhat enables you to browse heap dumps using your favorite webbrowser. jhat supports pre\-designed queries (such as 'show all instances of a known class "Foo"') as well as \f3OQL\fP (\f3O\fPbject \f3Q\fPuery \f3L\fPanguage) \- a SQL\-like query language to query heap dumps. Help on OQL is available from the OQL help page shown by jhat. With the default port, OQL help is available at http://localhost:7000/oqlhelp/ @@ -69,7 +67,7 @@ .na \f2HotSpotDiagnosticMXBean\fP @ .fi -http://java.sun.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; +http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; .TP 2 o Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option; @@ -86,7 +84,8 @@ .LP \f3NOTE:\fP This tool is \f3experimental\fP and may \f3not\fP be available in future versions of the JDK. .LP -.SH "OPTIONS" +.SH "OPTIONS" +.LP .RS 3 .TP 3 \-stack false/true @@ -107,21 +106,22 @@ \-debug int Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes. .TP 3 -\-version\ +\-version Report version number and exit. .TP 3 -\-h\ +\-h Output help message and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB. .RE .LP -.SH "SEE ALSO" +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -136,5 +136,6 @@ .fi http://java.sun.com/developer/technicalArticles/Programming/HPROF.html .RE -.RE + +.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jinfo.1 --- a/jdk/src/solaris/doc/sun/man/man1/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "02 Jun 2010" +.TH jinfo 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,54 +41,55 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option Options are mutually exclusive. Option, if used, should follow immediately after the command name. +.RE + +.LP .RS 3 .TP 3 pid process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. .RE + +.LP .RS 3 .TP 3 executable Java executable from which the core dump was produced. .RE + +.LP .RS 3 .TP 3 core core file for which the configuration info is to be printed. .RE + +.LP .RS 3 .TP 3 remote\-hostname\-or\-IP remote debug server's (see jsadebugd(1)) hostname or IP address. .RE + +.LP .RS 3 .TP 3 server\-id optional unique id, if multiple debug servers are running on the same remote host. .RE -.RE .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jinfo\fP prints Java configuration information for a given Java process or core file or a remote debug server. Configuration information includes Java System properties and Java virtual machine command line flags. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br - +jinfo \-J\-d64 \-sysprops pid .LP -.RS 3 - -.LP -jinfo \-J\-d64 \-sysprops pid -.RE .LP \f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' need to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP .LP @@ -99,8 +98,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jmap.1 --- a/jdk/src/solaris/doc/sun/man/man1/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "02 Jun 2010" +.TH jmap 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,8 +41,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option @@ -74,14 +70,9 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jmap\fP prints shared object memory maps or heap memory details of a given process or core file or a remote debug server. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -89,10 +80,11 @@ .fl \fP .fi -.RE .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP +\f3NOTE: This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP .LP \f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP @@ -101,12 +93,10 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> -When no option is used \f3jmap\fP prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. +When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. .br .TP 3 \-dump:[live,]format=b,file=<filename> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jps.1 --- a/jdk/src/solaris/doc/sun/man/man1/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "02 Jun 2010" +.TH jps 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,8 +39,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -55,8 +51,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jps\fP tool lists the instrumented HotSpot Java Virtual Machines (JVMs) on the target system. The tool is limited to reporting information on JVMs for which it has the access permissions. .LP @@ -77,8 +71,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jps\fP command supports a number of options that modify the output of the command. These options are subject to change or removal in the future. .LP @@ -107,9 +99,6 @@ .SS HOST IDENTIFIER .LP -.RS 3 - -.LP .LP The host identifier, or \f2hostid\fP is a string that indicates the target system. The syntax of the \f2hostid\fP string largely corresponds to the syntax of a URI: .LP @@ -140,11 +129,8 @@ .RE .LP -.RE .SH "OUTPUT FORMAT" .LP - -.LP .LP The output of the \f3jps\fP command follows the following pattern: .LP @@ -169,8 +155,6 @@ .LP .SH "EXAMPLES" .LP - -.LP .LP This section provides examples of the \f3jps\fP command. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jrunscript.1 --- a/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "02 Jun 2010" +.TH jrunscript 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jrunscript\fP is a command line script shell. jrunscript supports both an interactive (read\-eval\-print) mode and a batch (\-f option) mode of script execution. This is a scripting language independent shell. By default, JavaScript is the language used, but the \-l option can be used to specify a different language. Through Java to scripting language communication, jrunscript supports "exploratory programming" style. .LP @@ -63,8 +57,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath path @@ -112,10 +104,8 @@ .LP .SH "EXAMPLES" .LP -\f3Executing inline scripts\fP -.LP -.RS 3 - +.SS +Executing inline scripts .LP .nf \f3 @@ -126,13 +116,10 @@ .fl \fP .fi -.RE .LP -\f3Use specified language and evaluate given script file\fP -.LP -.RS 3 - +.SS +Use specified language and evaluate given script file .LP .nf \f3 @@ -141,42 +128,42 @@ .fl \fP .fi -.RE .LP -\f3Interactive mode\fP -.LP -.RS 3 - +.SS +Interactive mode .LP .nf \f3 .fl jrunscript .fl -js>print('hello world'); +js> print('Hello World\\n'); +.fl +Hello World .fl -hello world +js> 34 + 55 .fl -js>34 + 55 +89.0 .fl -89 +js> t = new java.lang.Thread(function() { print('Hello World\\n'); }) +.fl +Thread[Thread\-0,5,main] .fl -js> thread(function() { print('hello world'); } +js> t.start() .fl -hello world +js> Hello World +.fl + .fl js> .fl \fP .fi -.RE .LP -\f3Run script file with script arguments\fP -.LP -.RS 3 - +.SS +Run script file with script arguments .LP .nf \f3 @@ -185,13 +172,16 @@ .fl \fP .fi -.RE .LP test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array. .SH "SEE ALSO" .LP .LP -If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in jsdocs. +If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in +.na +\f2jsdocs\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 --- a/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "02 Jun 2010" +.TH jsadebugd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,35 +39,16 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 pid process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process. -.RE - -.LP -.RS 3 .TP 3 executable -.RE - -.LP -.RS 3 -.TP 3 Java executable from which the core dump was produced -.RE - -.LP -.RS 3 .TP 3 core Core file to which the debug server should attach. -.RE - -.LP -.RS 3 .TP 3 server\-id Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique. @@ -78,17 +57,12 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP, .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi must be started with: -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with: .LP .nf \f3 @@ -97,17 +71,16 @@ .fl \fP .fi -.RE .LP .LP where \f2$JAVA_HOME\fP is the JDK installation directory. If rmiregistry was not started, jsadebugd will start an rmiregistry in a standard (1099) port internally. Debug server may be stopped by sending SIGINT (pressing Ctrl\-C) to it. .LP .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +\f3NOTE\fP \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \f2PATH\fP environment variable should contain the location of \f2jvm.dll\fP used by the target process or the location from which the Crash Dump file was produced. .LP .LP -\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP +For example, \f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP .SH "SEE ALSO" .LP @@ -129,7 +102,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jstack.1 --- a/jdk/src/solaris/doc/sun/man/man1/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "02 Jun 2010" +.TH jstack 1 "10 May 2011" .LP .SH "Name" @@ -29,8 +29,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,8 +43,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .LP Options are mutually exclusive. Option, if used, should follow immediately after the command name. See OPTIONS. .LP @@ -78,16 +74,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jstack\fP prints Java stack traces of Java threads for a given Java process or core file or a remote debug server. For each Java frame, the full class name, method name, 'bci' (byte code index) and line number, if available, are printed. With the \-m option, jstack prints both Java and native frames of all threads along with the 'pc' (program counter). For each native frame, the closest native symbol to 'pc', if available, is printed. C++ mangled names are not demangled. To demangle C++ names, the output of this command may be piped to \f3c++filt\fP. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br .LP -.RS 3 - -.LP .nf \f3 .fl @@ -95,7 +86,6 @@ .fl \fP .fi -.RE .LP .LP @@ -106,8 +96,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-F @@ -118,7 +106,7 @@ .na \f2ownable synchronizers\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. +http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. .TP 3 \-m prints mixed mode (both Java and native C/C++ frames) stack trace. @@ -154,8 +142,6 @@ .LP .SH "KNOWN BUGS" .LP - -.LP .LP Mixed mode stack trace, the \-m option, does not work with the remote debug server. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jstat.1 --- a/jdk/src/solaris/doc/sun/man/man1/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "02 Jun 2010" +.TH jstat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 generalOption @@ -60,17 +56,15 @@ The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details. .TP 3 interval[s|ms] -Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds.\ Must be a positive integer.\ If specified, \f3jstat\fP will produce its output at each interval. +Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval. .TP 3 count -Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated.\ Must be a positive integer. +Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer. .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstat\fP tool displays performance statistics for an instrumented HotSpot Java virtual machine (JVM). The target JVM is identified by its virtual machine identifier, or \f2vmid\fP option described below. .LP @@ -82,9 +76,6 @@ .SS VIRTUAL MACHINE IDENTIFIER .LP -.RS 3 - -.LP .LP The syntax of the \f2vmid\fP string largely corresponds to the syntax of a URI: .LP @@ -115,11 +106,8 @@ .RE .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The \f3jstat\fP command supports two types of options, general options and output options. General options cause \f3jstat\fP to display simple usage and version information. Output options determine the content and format of the statistical output. .br @@ -150,14 +138,11 @@ .SS OUTPUT OPTIONS .LP -.RS 3 - +.LP +If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J). The \f2statOption\fP must come first. .LP .LP -If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J).\ The \f2statOption\fP must come first. -.LP -.LP -Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns.\ Use the \f3\-h\fP option to set the frequency at which the header is displayed.\ Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. +Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns. Use the \f3\-h\fP option to set the frequency at which the header is displayed. Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. .LP .LP Use the \f3\-t\fP option to display a time stamp column, labeled \f2Timestamp\fP as the first column of output. The \f2Timestamp\fP column contains the elapsed time, in seconds, since startup of the target JVM. The resolution of the time stamp is dependent on various factors and is subject to variation due to delayed thread scheduling on heavily loaded systems. @@ -171,7 +156,7 @@ .RS 3 .TP 3 \-statOption -Determines the statistics information that \f3jstat\fP displays. The following table lists the available options.\ Use the \f3\-options\fP general option to display the list of options for a particular platform installation. +Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation. .br .br .LP @@ -457,7 +442,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 230 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 215 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -697,13 +682,9 @@ .RE .LP -.RE .SS STATOPTIONS AND OUTPUT .LP -.RS 3 - -.LP .LP The following tables summarize the columns that \f3jstat\fP outputs for each \f2statOption\fP. .br @@ -825,7 +806,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 280 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 261 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1082,7 +1063,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 316 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 297 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1546,7 +1527,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 386 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 367 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2170,7 +2151,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 460 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 441 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2550,7 +2531,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 483 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 464 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2866,7 +2847,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 537 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 518 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3094,15 +3075,14 @@ .rm 80 81 .nr 34 \n(.lu .eo -.am 80 +.am 81 .br .di a+ .35 .ft \n(.f .ll \n(34u*1u/3u -.if \n(.l<\n(80 .ll \n(80u +.if \n(.l<\n(81 .ll \n(81u .in 0 -NGCMN\ \ \ \ \ \ \ \ \ T}~T{ Minimum new generation capacity (KB). .br .di @@ -3262,9 +3242,11 @@ .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \w\f3Column\fP .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGCMX \ \ \ +.nr 38 \wNGCMN .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGC \ \ \ +.nr 38 \wNGCMX +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \wNGC .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \wS0CMX .if \n(80<\n(38 .nr 80 \n(38 @@ -3284,8 +3266,6 @@ .if \n(80<\n(38 .nr 80 \n(38 .80 .rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 .nr 81 0 .nr 38 \w\f3Description\fP .if \n(81<\n(38 .nr 81 \n(38 @@ -3293,6 +3273,8 @@ .if \n(81<\n(38 .nr 81 \n(38 .81 .rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(b- .if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(c- @@ -3321,7 +3303,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 593 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 572 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3348,11 +3330,11 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'\h'|\n(41u' +\&\h'|\n(40u'NGCMN\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v -.nr 37 \n(40u +.nr 37 \n(41u .in +\n(37u .a+ .in -\n(37u @@ -3364,7 +3346,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGCMX \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGCMX\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3380,7 +3362,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGC \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGC\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3522,7 +3504,7 @@ .rm i+ .rm j+ .TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-49 +.if \n-(b.=0 .nr c. \n(.c-\n(d.-47 .LP .SS @@ -3717,7 +3699,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 635 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 614 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4062,7 +4044,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 677 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 656 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4407,7 +4389,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 719 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 698 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4792,7 +4774,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 769 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 748 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -5091,7 +5073,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 795 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 774 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -5176,10 +5158,7 @@ .if \n-(b.=0 .nr c. \n(.c-\n(d.-19 .LP -.SS - -.LP -.SH "" +.SH "EXAMPLES" .LP .LP This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891. @@ -5355,7 +5334,6 @@ .LP The \f2lvmid\fP is combined with the name of the remote host to construct a \f2vmid\fP of \f240496@remote.domain\fP. This \f2vmid\fP results in the use of the \f3rmi\fP protocol to communicate to the default \f3jstatd\fP server on the remote host. The \f3jstatd\fP server is located using the \f3rmiregistry\fP on \f2remote.domain\fP that is bound to the default \f3rmiregistry\fP port (port 1099). .LP -.RE .SH "SEE ALSO" .LP .RS 3 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jstatd.1 --- a/jdk/src/solaris/doc/sun/man/man1/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "02 Jun 2010" +.TH jstatd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -42,8 +40,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstatd\fP tool is an RMI server application that monitors for the creation and termination of instrumented HotSpot Java virtual machines (JVMs) and provides a interface to allow remote monitoring tools to attach to JVMs running on the local host. .LP @@ -66,8 +60,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jstatd\fP command supports the following options: .LP @@ -89,8 +81,6 @@ .LP .SH "SECURITY" .LP - -.LP .LP The \f3jstatd\fP server can only monitor JVMs for which it has the appropriate native access permissions. Therefor the \f3jstatd\fP process must be running with the same user credentials as the target JVMs. Some user credentials, such as the \f2root\fP user in UNIX(TM) based systems, have permission to access the instrumentation exported by any JVM on the system. A \f3jstatd\fP process running with such credentials can monitor any JVM on the system, but introduces additional security concerns. .LP @@ -102,7 +92,7 @@ .na \f2Policy File Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html. .LP .LP The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server. @@ -145,15 +135,11 @@ .LP .SH "REMOTE INTERFACE" .LP - -.LP .LP The interface exported by the \f3jstatd\fP process is proprietary and is guaranteed to change. Users and developers are discouraged from writing to this interface. .LP .SH "EXAMPLES" .LP - -.LP .LP Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background. .LP @@ -264,7 +250,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jvisualvm.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/doc/sun/man/man1/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,104 @@ +." Copyright (c) 2008, 2011, 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. +." +.TH jvisualvm 1 "10 May 2011" + +.LP +.SH "Name" +\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool +.LP +.SH "SYNOPSIS" +.LP +.nf +\f3 +.fl + \fP\f3jvisualvm\fP [ \f2options\fP ] +.fl +.fi + +.LP +.SH "PARAMETERS" +.LP +.LP +Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below. +.LP +.SH "DESCRIPTION" +.LP +.LP +Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP. +.LP +.LP +Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins. +.LP +.SH "OPTIONS" +.LP +.LP +The following option is possible when you launch Java VisualVM. +.LP +.RS 3 +.TP 3 +\-J<jvm_option>\ +Pass this \f2<jvm_option>\fP to the JVM software. +.RE + +.LP +.SH "USAGE" +.LP +.LP +Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus. +.LP +.LP +Start Java VisualVM with the following command: +.LP +.nf +\f3 +.fl +% jvisualvm \fP\f4<options>\fP\f3 +.fl +\fP +.fi + +.LP +.SH "SEE ALSO" +.LP +.LP +For more details about Java VisualVM see the following pages. +.LP +.RS 3 +.TP 2 +o +.na +\f2Java VisualVM developers' site\fP @ +.fi +http://visualvm.java.net +.TP 2 +o +.na +\f2Java VisualVM in Java SE platform documentation\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html +.RE + +.LP +.LP +\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/keytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,21 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "02 Jun 2010" +.TH keytool 1 "10 May 2011" .LP .SH "Name" keytool \- Key and Certificate Management Tool .LP -.RS 3 - .LP Manages a keystore (database) of cryptographic keys, X.509 certificate chains, and trusted certificates. -.RE +.LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP \f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers. .LP A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it. @@ -57,14 +51,12 @@ \f3keytool\fP also enables users to administer secret keys used in symmetric encryption/decryption (e.g. DES). .LP .LP -\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. +\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. .LP .SH "COMMAND AND OPTION NOTES" .LP - .LP -.LP -The various commands and their options are listed and described below . Note: +The various commands and their options are listed and described below. Note: .LP .RS 3 .TP 2 @@ -114,6 +106,7 @@ .fl \fP .fi +.LP is equivalent to .nf \f3 @@ -128,10 +121,9 @@ .SS Option Defaults .LP -.RS 3 - .LP -Below are the defaults for various option values. +Below are the defaults for various option values. +.LP .nf \f3 .fl @@ -153,12 +145,16 @@ .fl 1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA") .fl + 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC") +.fl 56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES") .fl 168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede") .fl .fl + +.fl \-validity 90 .fl @@ -169,7 +165,7 @@ .fl \-storetype the value of the "keystore.type" property in the security properties file, .fl - which is returned by the static \fP\f4getDefaultType\fP\f3 method in + which is returned by the static \fP\f4getDefaultType\fP\f3 method in .fl \fP\f4java.security.KeyStore\fP\f3 .fl @@ -181,25 +177,39 @@ .fl \-protected false .fl - -.fl \fP .fi .LP -In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA", and if the underlying private key is of type "RSA", \f2\-sigalg\fP defaults to "SHA256withRSA". Please consult the +.LP +In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: +.LP +.RS 3 +.TP 2 +o +If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA" +.TP 2 +o +If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA". +.TP 2 +o +If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA". +.RE + +.LP +.LP +Please consult the .na \f2Java Cryptography Architecture API Specification & Reference\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. +.LP .SS Common Options .LP -.RS 3 - .LP -The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +.LP .LP There is also a \f2\-J\fP\f2javaoption\fP option that may appear for any command. If it appears, the specified \f2javaoption\fP string is passed through directly to the Java interpreter. This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .LP @@ -209,39 +219,59 @@ .RS 3 .TP 3 \-storetype storetype -This qualifier specifies the type of keystore to be instantiated. +.LP +This qualifier specifies the type of keystore to be instantiated. .TP 3 \-keystore keystore +.LP The keystore location. .LP If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device). .TP 3 -\-storepass storepass +\-storepass[:env|:file] argument +.LP The password which is used to protect the integrity of the keystore. .LP -\f2storepass\fP must be at least 6 characters long. It must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +.LP +\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).) +.LP +The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. .LP When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed. .TP 3 \-providerName provider_name -Used to identify a cryptographic service provider's name when listed in the security properties file. +.LP +Used to identify a cryptographic service provider's name when listed in the security properties file. .TP 3 \-providerClass provider_class_name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. +.LP +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. .TP 3 \-providerArg provider_arg -Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. +.LP +Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. .TP 3 \-protected +.LP Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. .LP Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively. .TP 3 \-ext {name{:critical}{=value}} -Denotes an X.509 certificate extension. The option can be used in \f2\-genkeypair\fP and \f2\-gencert\fP to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2":critical"\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. -.RS 3 +.LP +Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP. +.RE .LP .LP @@ -478,7 +508,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 289 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 319 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -657,7 +687,7 @@ For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then. .LP .LP -A special name \f2"honored"\fP, used in \-gencert only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma\-seperated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. +A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. .LP .LP If, besides the \-ext honored option, another named or OID \-ext option is provided, this extension will be added to those already honored. However, if this name (or OID) also appears in the honored value, its value and criticality overrides the one in the request. @@ -668,32 +698,61 @@ .LP \f3Note:\fP Users should be aware that some combinations of extensions (and other certificate fields) may not conform to the Internet standard. See Warning Regarding Certificate Conformance for details. .LP -.RE -.RE -.RE .SH "COMMANDS" .LP - -.LP .SS Creating or Adding Data to the Keystore .LP .RS 3 - +.TP 3 +\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP -.RS 3 -.TP 3 -\-gencert {\-infile infile} {\-outfile outfile} {\-dname dname} {\-ext ext}* {\-rfc} {\-alias alias} {\-sigalg sigalg} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] [\-keypass keypass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. .LP -Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from infile (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into outfile (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. -.LP -\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. valDays tells the number of days for which the certificate should be considered valid. +\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid. .LP If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used. .LP -\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +.LP +The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain. +.LP +The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP: +.nf +\f3 +.fl +keytool \-alias ca \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca1 \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca2 \-dname CN=CA \-genkeypair +.fl +keytool \-alias e1 \-dname CN=E1 \-genkeypair +.fl +\fP +.fi +.LP +The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued: +.nf +\f3 +.fl +keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert +.fl +keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert +.fl +\fP +.fi +.LP +The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain: +.nf +\f3 +.fl +keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert +.fl +\fP +.fi .TP 3 -\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP. .LP @@ -704,30 +763,18 @@ \f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long. .LP \f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field. -.RS 3 - .LP -.LP -The option value can be set in one of these two forms: -.LP +The option value can be set in one of these two forms: .RS 3 .TP 3 1. -.LP -([+\-]\f2nnn\fP[ymdHMS])+ +([+\-]\f2nnn\fP[ymdHMS])+ .TP 3 2. -.LP -[yyyy/mm/dd] [HH:MM:SS] +[yyyy/mm/dd] [HH:MM:SS] .RE - -.LP .LP -With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: -.LP -.RS 3 - -.LP +With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: .nf \f3 .fl @@ -743,16 +790,10 @@ .fl \fP .fi -.RE - -.LP .LP -With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local timezone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. -.LP +With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. .LP -When the option is not provided, the start date is the current time. The option can be provided at most once. -.LP -.RE +When the option is not provided, the start date is the current time. The option can be provided at most once. .LP \f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid. .LP @@ -790,25 +831,17 @@ \f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply. .RE \f3Importing a New Trusted Certificate\fP -.RS 3 -.LP -Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. -.LP .LP -If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". +Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. .LP -.LP -If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. +If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". .LP -.RE +If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. \f3Importing a Certificate Reply\fP -.RS 3 .LP -When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). -.LP +When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). .LP -The methods of determining whether the certificate reply is trusted are described in the following: -.LP +The methods of determining whether the certificate reply is trusted are described in the following: .RS 3 .TP 2 o @@ -817,12 +850,8 @@ o \f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it. .RE - .LP -.LP -If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. -.LP -.RE +If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. .LP This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward. .TP 3 @@ -842,14 +871,12 @@ .LP Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input. .RE -.RE + +.LP .SS Exporting Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP @@ -879,14 +906,10 @@ .RE .LP -.RE .SS Displaying Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption} .LP @@ -896,27 +919,36 @@ .LP You cannot specify both \f2\-v\fP and \f2\-rfc\fP. .TP 3 -\-printcert {\-file cert_file | \-sslserver host[:port]} {\-rfc} {\-v} {\-Jjavaoption} +\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption} .LP +Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin. .LP If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard. .LP If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard .LP -If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the JSSE Reference Guide for more information. +If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the +.na +\f2JSSE Reference Guide\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information. +.LP +\f3Note\fP: This option can be used independently of a keystore. +.TP 3 +\-printcrl \-file crl_ {\-v} +.LP +Reads the certificate revocation list (CRL) from the file \f2crl_file\fP. +.LP +A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP. .LP \f3Note\fP: This option can be used independently of a keystore. .RE .LP -.RE .SS Managing the Keystore .LP .RS 3 - -.LP -.RS 3 .TP 3 \-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} .LP @@ -940,46 +972,45 @@ .RE .LP -.RE .SS Getting Help .LP .RS 3 - -.LP -.RS 3 .TP 3 \-help .LP -Lists the basic commands and their options. +Lists the basic commands and their options. +.LP +For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command: +.nf +\f3 +.fl + keytool \-\fP\f4command_name\fP\f3 \-help +.fl +\fP +.fi .RE .LP -.RE .SH "EXAMPLES" .LP - -.LP .LP Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust. .LP .SS Generating Your Key Pair .LP -.RS 3 - -.LP .LP The first thing you need to do is create a keystore and generate the key pair. You could use a command such as the following: .LP .nf \f3 .fl - keytool \-genkeypair \-dname "cn=Mark Jones, ou=JavaSoft, o=Sun, c=US" + keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180 .fl \fP .fi @@ -989,10 +1020,10 @@ (Please note: This must be typed as a single line. Multiple lines are used in the examples just for legibility purposes.) .LP .LP -This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password "ab987c". It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "JavaSoft", organization of "Sun" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. +This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password specified by \f2<new password for keystore>\fP. It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "Java", organization of "Oracle" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. .LP .LP -It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password "kpi135". +It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password specified by \f2<new password for private key>\fP. .LP .LP The command could be significantly shorter if option defaults were accepted. As a matter of fact, no options are required; defaults are used for unspecified options that have default values, and you are prompted for any required values. Thus, you could simply have the following: @@ -1006,17 +1037,15 @@ .fi .LP -In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. +.LP +In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. .LP -The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (a private key password of "kpi135", etc.) .LP -.RE +The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US"). +.LP .SS Requesting a Signed Certificate from a Certification Authority .LP -.RS 3 - -.LP .LP So far all we've got is a self\-signed certificate. A certificate is more likely to be trusted by others if it is signed by a Certification Authority (CA). To get such a signature, you first generate a Certificate Signing Request (CSR), via the following: .LP @@ -1029,14 +1058,12 @@ .fi .LP +.LP This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.) -.RE +.LP .SS Importing a Certificate for the CA .LP -.RS 3 - -.LP .LP You need to replace your self\-signed certificate with a certificate chain, where each certificate in the chain authenticates the public key of the signer of the previous certificate in the chain, up to a "root" CA. .LP @@ -1054,7 +1081,7 @@ .LP .LP -The "cacerts" keystore file ships with five VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". +The "cacerts" keystore file ships with several VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". .LP .LP A certificate from a CA is usually either self\-signed, or signed by another CA (in which case you also need a certificate authenticating that CA's public key). Suppose company ABC, Inc., is a CA, and you obtain a file named "ABCCA.cer" that is purportedly a self\-signed certificate from ABC, authenticating that CA's public key. @@ -1074,14 +1101,12 @@ .fi .LP +.LP This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry. -.RE +.LP .SS Importing the Certificate Reply from the CA .LP -.RS 3 - -.LP .LP Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file. .LP @@ -1095,16 +1120,14 @@ .fl \fP .fi -.RE .LP .SS Exporting a Certificate Authenticating Your Public Key .LP -.RS 3 - .LP -Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +.LP .LP One way they can do this is by first importing your public key certificate into their keystore as a "trusted" entry. You can export the certificate and supply it to your clients. As an example, you can copy your certificate to a file named \f2MJ.cer\fP via the following, assuming the entry is aliased by "mykey": .LP @@ -1117,14 +1140,12 @@ .fi .LP +.LP Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature. -.RE +.LP .SS Importing Keystore .LP -.RS 3 - -.LP .LP The command "importkeystore" is used to import an entire keystore into another keystore, which means all entries from the source keystore, including keys and certificates, are all imported to the destination keystore within a single command. You can use this command to import entries from a different type of keystore. During the import, all new entries in the destination keystore will have the same alias names and protection passwords (for secret keys and private keys). If \f3keytool\fP has difficulties recover the private keys or secret keys from the source keystore, it will prompt you for a password. If it detects alias duplication, it will ask you for a new one, you can specify a new alias or simply allow \f3keytool\fP to overwrite the existing one. .LP @@ -1134,128 +1155,108 @@ .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \fP .fi .LP .LP -The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the desination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. In this way, you can issue a \f3keytool\fP command that will never ask you a question. This makes it very convenient to include a \f3keytool\fP command into a script file, like this: +The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the destination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. The following command demonstrates this: .LP .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3 .fl \-noprompt .fl \fP .fi -.RE .LP .SS -Generating Certificates for a typical SSL Server -.LP -.RS 3 - +Generating Certificates for a Typical SSL Server .LP .LP -Keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermadiate CA (ca), and SSL server (server) are as follows: +The following are keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermediate CA (ca), and SSL server (server). Ensure that you store all the certificates in the same keystore. In these examples, it is recommended that you specify RSA as the key algorithm. .LP .nf \f3 .fl -keytool \-keystore root.jks \-genkeypair \-alias root \-ext bc:c +keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c .fl -keytool \-keystore ca.jks \-alias ca +keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c .fl -keytool \-keystore server.jks \-alias server +keytool \-genkeypair \-keystore server.jks \-alias server .fl - + .fl -keytool \-keystore root.jks \-alias root \-exportcert > root.pem +keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem .fl - + .fl -keytool \-keystore ca.jks \-certreq \-alias ca | keytool \-keystore root.jks \-gencert \-alias root \-ext BC=0 > ca.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem .fl keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem .fl - + .fl -keytool \-keystore server.jks \-certreq \-alias server | keytool \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE >server.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem .fl cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server .fl \fP .fi -.RE .LP .SH "TERMINOLOGY and WARNINGS" .LP - -.LP .SS KeyStore .LP -.RS 3 - .LP A keystore is a storage facility for cryptographic keys and certificates. -.RE +.LP .RS 3 .TP 2 o -.TP 2 -o \f3KeyStore Entries\fP -.RS 3 - .LP Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include: .RS 3 .TP 3 1. -\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types od entry, while \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. +\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. .TP 3 2. \f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate. .RE - -.LP -.RE .TP 2 o \f3KeyStore Aliases\fP -.RS 3 .LP -All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. -.LP +All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. .LP -An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. -.LP +An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. .LP -For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: -.LP +For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: .nf \f3 .fl @@ -1263,9 +1264,8 @@ .fl \fP .fi - .LP -This specifies an inital password of "dukekeypasswd" required by subsequent commands to access the private key assocated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: +This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: .nf \f3 .fl @@ -1273,49 +1273,37 @@ .fl \fP .fi - .LP This changes the password from "dukekeypasswd" to "newpass". .LP -Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. -.LP -.RE +Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. .TP 2 o \f3KeyStore Implementation\fP -.RS 3 +.LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP -Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. -.LP +Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. .LP -There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. -.LP +There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. .LP Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP -Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. -.LP +Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. -.LP +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP -For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. -.LP +For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. .LP -If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP +If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. -.LP +Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. .LP -The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): -.LP +The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): .nf \f3 .fl @@ -1323,11 +1311,8 @@ .fl \fP .fi - .LP -.LP -The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file: -.LP +The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file: .nf \f3 .fl @@ -1335,14 +1320,10 @@ .fl \fP .fi - -.LP .LP -To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. -.LP +To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. .LP -For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to -.LP +For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to .nf \f3 .fl @@ -1350,50 +1331,45 @@ .fl \fP .fi +.LP +Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". +.RE .LP -Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". -.RE -.RE .SS Certificate .LP +A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. .RS 3 - -.LP -A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. -.RE -.RS 3 -.TP 2 -o .TP 2 o \f3Certificate Terms\fP .RS 3 - -.LP -.RS 3 .TP 3 Public Keys -These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. +.LP +These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. .TP 3 Digitally Signed -If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. +.LP +If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. .TP 3 Identity -A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. +.LP +A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. .TP 3 Signature -A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). +.LP +A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). .TP 3 Private Keys -These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. +.LP +These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. .TP 3 Entity -An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. +.LP +An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. .RE - -.LP .LP Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as .na @@ -1407,26 +1383,22 @@ .na \f2Entrust\fP @ .fi -http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as the Netscape/Microsoft Certificate Servers or the Entrust CA product for your organization. -.LP -.LP -Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. +http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization. .LP +Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. .LP -\f3keytool\fP currently handles X.509 certificates. -.LP -.RE +\f3keytool\fP currently handles X.509 certificates. .TP 2 o \f3X.509 Certificates\fP -.RS 3 +.LP The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data. .LP -All X.509 certificates have the following data, in addition to the signature: -.LP +All X.509 certificates have the following data, in addition to the signature: .RS 3 .TP 3 Version +.LP This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates. .LP \f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic. @@ -1436,475 +1408,86 @@ \f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use. .TP 3 Serial Number -The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). +.LP +The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). .TP 3 Signature Algorithm Identifier -This identifies the algorithm used by the CA to sign the certificate. +.LP +This identifies the algorithm used by the CA to sign the certificate. .TP 3 Issuer Name -The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) +.LP +The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) .TP 3 Validity Period -Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. +.LP +Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. .TP 3 Subject Name +.LP The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example, .nf \f3 .fl - CN=Java Duke, OU=Java Software Division, O=Sun Microsystems Inc, C=US + CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US .fl \fP .fi -(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) +.LP +(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) .TP 3 Subject Public Key Information -This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. -.RE - .LP +This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. .RE .TP 2 o \f3Certificate Chains\fP -.RS 3 .LP -\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. -.LP +\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. .LP -When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. -.LP +When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. .LP -Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. -.LP +Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. .LP -In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. -.LP +In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. .LP -Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. -.LP +Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. .LP -A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. -.LP +A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. .LP -The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's webpage, etc.). -.LP -.RE +The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.). .TP 2 o \f3The cacerts Certificates File\fP -.RS 3 .LP -A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP -.LP -The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with several root CA certificates with the following aliases and X.500 owner distinguished names: +A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -.RS 3 -.TP 2 -* -\f3Alias\fP: thawtepersonalfreemailca -.br -\f3Owner DN\fP: EmailAddress=personal\-freemail@thawte.com, -.br -CN=Thawte Personal Freemail CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalbasicca -.br -\f3Owner DN\fP: EmailAddress=personal\-basic@thawte.com, -.br -CN=Thawte Personal Basic CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalpremiumca -.br -\f3Owner DN\fP: EmailAddress=personal\-premium@thawte.com, -.br -CN=Thawte Personal Premium CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawteserverca -.br -\f3Owner DN\fP: EmailAddress=server\-certs@thawte.com, -.br -CN=Thawte Server CA, OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepremiumserverca -.br -\f3Owner DN\fP: EmailAddress=premium\-server@thawte.com, -.br -CN=Thawte Premium Server CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: verisignclass1ca -.br -\f3Owner DN\fP: OU=Class 1 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2ca -.br -\f3Owner DN\fP: OU=Class 2 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3ca -.br -\f3Owner DN\fP: OU=Class 3 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignserverca -.br -\f3Owner DN\fP: OU=Secure Server Certification Authority, -.br -O="RSA Data Security, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 1 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 1 Public Primary Certification Authority \- G3, OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 2 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 2 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 3 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 3 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: baltimorecodesigningca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Code Signing Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrustglobalca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Global Root, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: baltimorecybertrustca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrust5ca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Root 5, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: entrustclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab., -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustglobalclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/GCCA_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrust2048ca -.br -\f3Owner DN\fP: CN=Entrust.net Certification Authority (2048), -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrustsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustgsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/SSL_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: godaddyclass2ca -.br -\f3Owner DN\fP: OU=Go Daddy Class 2 Certification Authority, -.br -O="The Go Daddy Group, Inc.", C=US -.TP 2 -* -\f3Alias\fP: starfieldclass2ca -.br -\f3Owner DN\fP: OU=Starfield Class 2 Certification Authority, -.br -O="Starfield Technologies, Inc.", C=US -.TP 2 -* -\f3Alias\fP: valicertclass2ca -.br -\f3Owner DN\fP: EMAILADDRESS=info@valicert.com, -.br -CN=http://www.valicert.com/, -.br -OU=ValiCert Class 2 Policy Validation Authority, -.br -O="ValiCert, Inc.", L=ValiCert Validation Network -.TP 2 -* -\f3Alias\fP: geotrustglobalca -.br -\f3Owner DN\fP: CN=GeoTrust Global CA, -.br -O=GeoTrust Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureca -.br -\f3Owner DN\fP: OU=Equifax Secure Certificate Authority, -.br -O=Equifax, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca2 -.br -\f3Owner DN\fP: OU=Equifax Secure eBusiness CA\-2, -.br -O=Equifax Secure, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureglobalebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure Global eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: soneraclass1ca -.br -\f3Owner DN\fP: CN=Sonera Class1 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: soneraclass2ca -.br -\f3Owner DN\fP: CN=Sonera Class2 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: comodoaaaca -.br -\f3Owner DN\fP: CN=AAA Certificate Services, -.br -O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB -.TP 2 -* -\f3Alias\fP: addtrustclass1ca -.br -\f3Owner DN\fP: CN=AddTrust Class 1 CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustexternalca -.br -\f3Owner DN\fP: CN=AddTrust External CA Root, -.br -OU=AddTrust External TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustqualifiedca -.br -\f3Owner DN\fP: CN=AddTrust Qualified CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: utnuserfirsthardwareca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Hardware, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstclientauthemailca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Client Authentication and Email, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utndatacorpsgcca -.br -\f3Owner DN\fP: CN=UTN \- DATACorp SGC, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstobjectca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Object, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.RE - +The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command: +.nf +\f3 +.fl +keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts +.fl +\fP +.fi .LP -.LP -The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. -.LP -.RS 3 - -.LP - +The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. .LP -\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP -.br - -.LP -Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. -.br - -.LP -.RE - -.LP -.RE +\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. .TP 2 o \f3The Internet RFC 1421 Certificate Encoding Standard\fP -.RS 3 -.LP -Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP +Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP -Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. -.LP +Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. .LP -The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. -.LP +The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. .LP -The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. -.LP +The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. .LP -In its printable encoding format, the encoded certificate is bounded at the beginning by -.LP +In its printable encoding format, the encoded certificate is bounded at the beginning by .nf \f3 .fl @@ -1912,11 +1495,8 @@ .fl \fP .fi - .LP -.LP -and at the end by -.LP +and at the end by .nf \f3 .fl @@ -1925,23 +1505,21 @@ \fP .fi .RE -.RE .LP .SS X.500 Distinguished Names .LP -.RS 3 - .LP -X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +.LP .RS 3 .TP 2 o \f2commonName\fP \- common name of a person, e.g., "Susan Jones" .TP 2 o -\f2organizationUnit\fP \- small organization (e.g, department or division) name, e.g., "Purchasing" +\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing" .TP 2 o \f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc." @@ -1975,7 +1553,7 @@ .nf \f3 .fl - CN=commonName + CN=commonName .fl OU=organizationUnit .fl @@ -1997,17 +1575,19 @@ .nf \f3 .fl -CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US +CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US .fl \fP .fi .LP -and a sample command using such a string is +.LP +and a sample command using such a string is +.LP .nf \f3 .fl -keytool \-genkeypair \-dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, +keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, .fl S=California, C=US" \-alias mark .fl @@ -2024,7 +1604,7 @@ .nf \f3 .fl -CN=Steve Meier, OU=SunSoft, O=Sun, C=US +CN=Steve Meier, OU=Java, O=Oracle, C=US .fl \fP .fi @@ -2036,7 +1616,7 @@ .nf \f3 .fl - cn=peter schuster, o=Sun Microsystems\\, Inc., o=sun, c=us + cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US .fl \fP .fi @@ -2045,14 +1625,12 @@ .LP It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\". .LP -.RE .SS WARNING Regarding Importing Trusted Certificates .LP -.RS 3 - .LP -IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +.LP .LP View it first (using the \f2\-printcert\fP command, or the \f2\-importcert\fP command without the \f2\-noprompt\fP option), and make sure that the displayed certificate fingerprint(s) match the expected ones. For example, suppose someone sends or emails you a certificate, and you put it in a file named \f2/tmp/cert\fP. Before you consider adding the certificate to your list of trusted certificates, you can execute a \f2\-printcert\fP command to view its fingerprints, as in .LP @@ -2083,17 +1661,15 @@ .fi .LP -Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP +Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP .LP Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user. .LP -.RE .SS Warning Regarding Passwords .LP -.RS 3 - -.LP .LP Most commands operating on a keystore require the store password. Some commands require a private/secret key password. .LP @@ -2103,13 +1679,9 @@ .LP If you don't specify a required password option on a command line, you will be prompted for it. .LP -.RE .SS Warning Regarding Certificate Conformance .LP -.RS 3 - -.LP .LP The Internet standard .na @@ -2117,39 +1689,31 @@ .fi http://tools.ietf.org/rfc/rfc5280.txt has defined a profile on conforming X.509 certificates, which includes what values and value combinations are valid for certificate fields and extensions. \f3keytool\fP has not enforced all these rules so it can generate certificates which do not conform to the standard, and these certificates might be rejected by JRE or other applications. Users should make sure that they provide the correct options for \f2\-dname\fP, \f2\-ext\fP, etc. .LP -.RE .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o -.LP -jar(1) tool documentation +jar(1) tool documentation .TP 2 o -.LP -jarsigner(1) tool documentation +jarsigner(1) tool documentation .TP 2 o -.LP the .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial for examples of the use of \f3keytool\fP +http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP .RE .LP .SH "CHANGES" .LP - -.LP .LP The command interface for keytool changed in Java SE 6. .LP @@ -2184,19 +1748,19 @@ .na \f2\-keyclone\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#keycloneCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd .TP 2 o .na \f2\-identitydb\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#identitydbCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd .TP 2 o .na \f2\-selfcert\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#selfcertCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/native2ascii.1 --- a/jdk/src/solaris/doc/sun/man/man1/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "02 Jun 2010" +.TH native2ascii 1 "10 May 2011" .LP .SH "Name" native2ascii \- Native\-to\-ASCII Converter .LP -.RS 3 - -.LP .LP -Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters. +Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -46,31 +40,29 @@ .LP .SH "DESCRIPTION" .LP - .LP -.LP -The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters. +\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion. .LP .LP If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-reverse -Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters. +Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment. .br .br .TP 3 \-encoding encoding_name -Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the +Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the .na \f4Supported Encodings\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document. +http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document. +.br +.br .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/orbd.1 --- a/jdk/src/solaris/doc/sun/man/man1/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,15 +19,12 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "02 Jun 2010" +.TH orbd 1 "10 May 2011" .LP .SH "Name" orbd \- The Object Request Broker Daemon .LP -.RS 3 - -.LP .LP \f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. .LP @@ -36,13 +33,10 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,8 +48,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages: .LP @@ -77,7 +69,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "OPTIONS" .LP @@ -141,11 +133,11 @@ .na \f2CORBA objects\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The .na \f2name binding\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. .LP .LP Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service. @@ -224,7 +216,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "Server Manager" .LP @@ -239,7 +231,7 @@ .na \f2sample tutorial\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: .LP .LP Start \f2orbd\fP. @@ -362,7 +354,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .br .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/pack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "02 Jun 2010" +.TH pack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line or in a properties file supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -51,11 +46,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f2pack200\fP tool is a Java application that transforms a JAR file into a compressed \f2pack200\fP file using the Java \f2gzip\fP compressor. The \f2pack200\fP files are highly compressed files that can be directly deployed, saving bandwidth and reducing download time. .LP @@ -65,83 +57,56 @@ .SS Typical usage: .LP -.RS 3 - -.LP .LP \f2% pack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, \f2myarchive.pack.gz\fP is produced using the default \f2pack200\fP settings. .LP .SH "OPTIONS" .LP - -.LP .LP \f4\-r \-\-repack\fP .LP -.RS 3 - -.LP .LP Produces a JAR file by packing the file \f2myarchive.jar\fP and unpacking it. The resulting file can be used as an input to the \f2jarsigner(1)\fP tool. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP .LP .LP \f2% pack200 \-\-repack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-g \-\-no\-gzip\fP .LP -.RS 3 - -.LP .LP Produces a \f2pack200\fP file. With this option a suitable compressor must be used, and the target system must use a corresponding decompresser. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-G \-\-strip\-debug\fP .LP -.RS 3 - -.LP .LP Strips attributes used for debugging from the output. These include \f2SourceFile\fP, \f2LineNumberTable\fP, \f2LocalVariableTable\fP and \f2LocalVariableTypeTable\fP. Removing these attributes reduces the size of both downloads and installations but reduces the usefulness of debuggers. .LP -.RE +.LP +\f4\-\-keep\-file\-order\fP +.LP +.LP +Preserve the order of files in the input file; this is the default behavior. +.LP .LP \f4\-O \-\-no\-keep\-file\-order\fP .LP -.RS 3 - -.LP .LP The packer will reorder and transmit all elements. Additionally, the packer may remove JAR directory names. This will reduce the download size; however, certain JAR file optimizations, such as indexing, may not work correctly. .LP -.RE .LP \f4\-Svalue \-\-segment\-limit=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The value is the estimated target size N (in bytes) of each archive segment. If a single input file requires .br @@ -151,31 +116,23 @@ The size of each segment is estimated by counting the size of each input file to be transmitted in the segment, along with the size of its name and other transmitted properties. .LP .LP -The default is \f21000000\fP (a million bytes). This allows input JAR files of moderate size to be transmitted in one segment. It also puts a limit on memory requirements for packers and unpackers. +The default is \-1, which means the packer will always create a single segment output file. In cases where extremely large output files are generated, users are strongly encouraged to use segmenting or break up the input file into smaller JARs. .LP .LP A 10MB JAR packed without this limit will typically pack about 10% smaller, but the packer may require a larger Java heap (about ten times the segment limit). .LP -.RE .LP \f4\-Evalue \-\-effort=\fP\f2value\fP .LP -.RS 3 - -.LP .LP If the value is set to a single decimal digit, the packer will use the indicated amount of effort in compressing the archive. Level \f21\fP may produce somewhat larger size and faster compression speed, while level \f29\fP will take much longer but may produce better compression. The special value \f20\fP instructs the packer to copy through the original JAR file directly with no compression. The JSR 200 standard requires any unpacker to understand this special case as a pass\-through of the entire archive. .LP .LP The default is \f25\fP, investing a modest amount of time to produce reasonable compression. .LP -.RE .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Overrides the default, which preserves the input information, but may cause the transmitted archive to be larger. The possible values are: .LP @@ -195,13 +152,9 @@ .RE .LP -.RE .LP \f4\-mvalue \-\-modification\-time=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The possible values are: .LP @@ -215,23 +168,15 @@ .RE .LP -.RE .LP \f4\-Pfile \-\-pass\-file=\fP\f2file\fP .LP -.RS 3 - -.LP .LP Indicates that a file should be passed through bytewise with no compression. By repeating the option, multiple files may be specified. There is no pathname transformation, except that the system file separator is replaced by the JAR file separator "\f2/\fP". The resulting file names must match exactly as strings with their occurrences in the JAR file. If file is a directory name, all files under that directory will be passed. .LP -.RE .LP \f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP .LP -.RS 3 - -.LP .LP Overrides the default behavior; i.e., the classfile containing the unknown attribute will be passed through with the specified action. The possible values for actions are: .LP @@ -248,7 +193,6 @@ .RE .LP -.RE .LP \f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP .br @@ -258,9 +202,6 @@ .br \f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP .LP -.RS 3 - -.LP .LP With the above four options, the attribute layout can be specified for a class entity, such as Class attribute, Field attribute, Method attribute, and Code attribute. The attribute\-name is the name of the attribute for which the layout or action is being defined. The possible values for action are: .LP @@ -282,19 +223,12 @@ .LP Example: \f2\-\-class\-attribute=CompilationID=pass\fP will cause the class file containing this attribute to be passed through without further action by the packer. .LP -.RE .LP \f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP .LP -.RS 3 - -.LP .LP A configuration file, containing Java properties to initialize the packer, may be specified on the command line. .LP -.RS 3 - -.LP .LP \f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP .br @@ -318,69 +252,53 @@ .br \f2segment.limit=\-1\fP .LP -.RE -.RE -.RS 3 - -.LP .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP .LP -\f4\-Joption\fP +Prints help information about this command. .LP -.RS 3 - +.LP +\f4\-V \-\-version\fP .LP .LP -Passes option to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP .LP -.RE -.RE +.LP +Passes \f2option\fP to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP for successful completion; .LP .LP \f2>0\fP if an error occurs. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -392,13 +310,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -413,8 +331,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2pack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/policytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "02 Jun 2010" +.TH policytool 1 "10 May 2011" .LP .SH "Name" @@ -28,8 +28,6 @@ \f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 \ @@ -57,7 +55,7 @@ .na \f2the Policytool Users Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html. .SH "OPTIONS" .RS 3 .TP 3 @@ -67,22 +65,22 @@ .na \f2Default Policy Implementation and Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html .br .na \f2Policy Tool Users' Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html .br .na \f2Security Permissions\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html .br .na \f2Security Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html .br .RE .RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/rmic.1 --- a/jdk/src/solaris/doc/sun/man/man1/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "02 Jun 2010" +.TH rmic 1 "10 May 2011" .LP .SH "Name" rmic \- The Java RMI Compiler .LP -.RS 3 - -.LP .LP \f3rmic\fP generates stub, skeleton, and tie classes for remote objects using either the JRMP or IIOP protocols. Also generates OMG IDL. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmic\fP compiler generates stub and skeleton class files (JRMP protocol) and stub and tie class files (IIOP protocol) for remote objects. These classes files are generated from compiled Java programming language classes that are remote object implementation classes. A remote implementation class is a class that implements the interface \f2java.rmi.Remote\fP. The class names in the \f3rmic\fP command must be for classes that have been compiled successfully with the \f3javac\fP command and must be fully package qualified. For example, running \f3rmic\fP on the class file name \f2HelloImpl\fP as shown here: .LP @@ -81,8 +73,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-bootclasspath path @@ -90,9 +80,6 @@ .TP 3 \-classpath path Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.RS 3 - -.LP .nf \f3 .fl @@ -100,11 +87,7 @@ .fl \fP .fi -.RE For example: -.RS 3 - -.LP .nf \f3 .fl @@ -112,13 +95,9 @@ .fl \fP .fi -.RE .TP 3 \-d directory Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command -.RS 3 - -.LP .nf \f3 .fl @@ -126,7 +105,6 @@ .fl \fP .fi -.RE would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.) .br \ @@ -136,16 +114,16 @@ .TP 3 \-g Enables generation of all debugging information, including local variables. By default, only line number information is generated. -.LP .TP 3 \-idl Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the .na \f2Java Language to IDL Mapping\fP @ .fi -http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. -.LP -When the \f2\-idl\fP option is used, other options also include: +http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. +.br +.br +When the \f2\-idl\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -160,31 +138,22 @@ \-idlFile\ fromJavaPackage[.class]\ toIDLFile Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\ .RE -.LP .TP 3 \-iiop -Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. -.LP +Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. +.br +.br Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention: -.RS 3 - -.LP .nf \f3 .fl _<implementationName>_stub.class .fl -\fP -.br -\f3 -.fl _<interfaceName>_tie.class .fl \fP .fi -.RE -.LP -When the \f2\-iiop\fP option is used, other options also include: +When the \f2\-iiop\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -197,13 +166,11 @@ Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option. .TP 3 \-poa -Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. -.LP -The \f2PortableServer\fP module for the +Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the .na \f2Portable Object Adapter\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. .RE .TP 3 \-J @@ -214,18 +181,18 @@ .TP 3 \-nowarn Turns off warnings. If used the compiler does not print out any warnings. -.LP +.TP 3 +\-nowrite +Does not write compiled classes to the file system. .TP 3 \-vcompat Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation. .TP 3 \-verbose Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded. -.LP .TP 3 \-v1.1 Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used). -.LP .TP 3 \-v1.2 (default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine. @@ -234,15 +201,10 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example, -.RS 3 - -.LP .nf \f3 .fl @@ -251,18 +213,15 @@ \fP .fi .RE -.RE .LP .SH "SEE ALSO" .LP - -.LP .LP java(1), javac(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/rmid.1 --- a/jdk/src/solaris/doc/sun/man/man1/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "02 Jun 2010" +.TH rmid 1 "10 May 2011" .LP .SH "Name" rmid \- The Java RMI Activation System Daemon .LP -.RS 3 - -.LP .LP \f3rmid\fP starts the activation system daemon that allows objects to be registered and activated in a virtual machine (VM). .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,18 +41,16 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the .na \f2Java RMI Specification\fP @ .fi -http://java.sun.com/javase/6/docs/platform/rmi/spec/rmiTOC.html and +http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and .na \f2Activation tutorials\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. .LP .LP The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows: @@ -133,8 +125,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-C<someCommandLineOption> @@ -169,7 +159,6 @@ .TP 3 \-J\-Dsun.rmi.activation.execPolicy=<policy> Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP: -.LP .RS 3 .TP 2 o @@ -255,17 +244,9 @@ The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups. .LP To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example: -.RS 3 - .LP -.LP -\f2rmid \-J\-Djava.security.policy=rmid.policy\fP -.LP +\f2rmid \-J\-Djava.security.policy=rmid.policy\fP .RE -.RE -.TP 2 -o -.LP .TP 2 o \f4<policyClassName>\fP @@ -285,7 +266,6 @@ \fP .fi Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object. -.LP .TP 2 o \f3none\fP @@ -318,9 +298,9 @@ \-stop Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098. .RE -.SH "ENVIRONMENT VARIABLES" + .LP - +.SH "ENVIRONMENT VARIABLES" .LP .RS 3 .TP 3 @@ -338,13 +318,11 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP rmic(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath, java(1) +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 --- a/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,19 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "02 Jun 2010" +.TH rmiregistry 1 "10 May 2011" .LP .SH "Name" rmiregistry \- The Java Remote Object Registry .LP .RS 3 +The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. +.RE .LP -.LP -The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. -.LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmiregistry\fP command creates and starts a remote object registry on the specified \f2port\fP on the current host. If \f2port\fP is omitted, the registry is started on port 1099. The \f3rmiregistry\fP command produces no output and is typically run in the background. For example: .LP @@ -69,8 +63,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-J @@ -80,17 +72,12 @@ .LP .SH "SEE ALSO" .LP - -.LP -.LP java(1), .na \f2java.rmi.registry.LocateRegistry\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/registry/LocateRegistry.html and +http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and .na \f2java.rmi.Naming\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/Naming.html -.LP - +http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/schemagen.1 --- a/jdk/src/solaris/doc/sun/man/man1/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "02 Jun 2010" +.TH schemagen 1 "10 May 2011" .LP .SH "Name" @@ -30,8 +30,7 @@ .br \f3Implementation Version:\fP 2.1.3 .LP -.SS -Launching schemagen +.SH "Launching schemagen" .LP .LP The schema generator can be launched using the appropriate \f2schemagen\fP shell script in the \f2bin\fP directory for your platform. @@ -46,9 +45,6 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -58,19 +54,13 @@ .fl \fP .fi -.RE .LP .LP If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema. .LP -.RS 3 - -.LP -\f3Command Line Options\fP -.LP -.RS 3 - +.SS +Command Line Options .LP .nf \f3 @@ -79,24 +69,29 @@ .fl .fl -Options: +Options: +.fl + \-d <path> : specify where to place processor and javac generated class files .fl - \-d <path> : Specify where to place processor and javac generated class files + \-cp <path> : specify where to find user specified files +.fl + \-classpath <path> : specify where to find user specified files .fl - \-cp <path> : Specify where to find user specified files + \-encoding <encoding> : specify encoding to be used for apt/javac invocation +.fl + .fl - \-classpath <path> : Specify where to find user specified files + \-episode <file> : generate episode file for separate compilation .fl - \-help : Display this usage message + \-version : display version information +.fl + \-help : display this usage message .fl \fP .fi -.RE .LP -.RE -.SS -Generated Resource Files +.SH "Generated Resource Files" .LP .LP The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use @@ -105,7 +100,8 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.SH "See Also" +.SH "Name" +See Also .LP .RS 3 .TP 2 @@ -124,7 +120,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/serialver.1 --- a/jdk/src/solaris/doc/sun/man/man1/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "02 Jun 2010" +.TH serialver 1 "10 May 2011" .LP .SH "Name" serialver \- The Serial Version Command .LP -.RS 3 - -.LP .LP The \f3serialver\fP command returns the \f2serialVersionUID\fP. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified in this document. @@ -57,18 +48,13 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f3serialver\fP returns the \f2serialVersionUID\fP for one or more classes in a form suitable for copying into an evolving class. When invoked with no arguments it prints a usage line. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath <directories and zip/jar files separated by :> @@ -88,36 +74,24 @@ .LP .SH "NOTES" .LP - -.LP .LP The \f3serialver\fP command loads and initializes the specified classes in its virtual machine, and by default, it does not set a security manager. If \f3serialver\fP is to be run with untrusted classes, a security manager can be set with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.manager\fP .LP -.RE .LP and, if necessary, a security policy can be specified with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.policy=<policy file>\fP .LP -.RE .SH "SEE ALSO" .LP - -.LP .LP .na \f2java.io.ObjectStreamClass\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/io/ObjectStreamClass.html +http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/servertool.1 --- a/jdk/src/solaris/doc/sun/man/man1/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "02 Jun 2010" +.TH servertool 1 "10 May 2011" .LP .SH "Name" servertool \- The Java(TM) IDL Server Tool .LP -.RS 3 - -.LP -\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. -.RE +\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,15 +48,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f2servertool\fP provides the command\-line interface for the application programmers to register, unregister, startup, and shutdown a persistent server. Other commands are provided to obtain various statistical information about the server. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-ORBInitialHost nameserverhost @@ -75,8 +65,6 @@ .LP .SH "COMMANDS" .LP - -.LP .RS 3 .TP 3 register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ] @@ -122,6 +110,4 @@ .LP .SH "SEE ALSO" .LP - -.LP orbd(1) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/tnameserv.1 --- a/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "02 Jun 2010" +.TH tnameserv 1 "10 May 2011" .LP .SH "Name" @@ -30,7 +30,7 @@ .na \f2Java IDL Naming Service Included with ORBD\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html topic. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic. .LP .LP Topics in this section include: @@ -120,11 +120,11 @@ .na \f2The Hello World Example Using RMI\-IIOP\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. .na \f2Java IDL: Running the Hello World Example on TWO Machines\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. .LP .LP For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP. @@ -170,16 +170,12 @@ .LP This command\-line option is available for use with \f2tnameserve\fP: .RS 3 - -.LP -.RS 3 .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine. .RE .LP -.RE .SH "Stopping the Java\ IDL Transient Naming Service" .LP .LP @@ -190,28 +186,27 @@ .LP The following sample program illustrates how to add names to the namespace. It is a self\-contained Transient Naming Service client that creates the following simple tree. .LP -.nf -\f3 -.fl -\fP\f3 -.fl - \fP\f4Initial\fP\f3 -.fl - \fP\f4Naming Context\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - plans \fP\f4Personal\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - calendar schedule\fP -.fl -.fi +.RS 3 +.TP 2 +o +\f4Initial Naming Context\fP +.RS 3 +.TP 2 +* +\f3plans\fP +.TP 2 +* +\f4Personal\fP +.RS 3 +.TP 2 +- +\f3calendar\fP +.TP 2 +- +\f3schedule\fP +.RE +.RE +.RE .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/unpack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "02 Jun 2010" +.TH unpack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 input\-file Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker. @@ -48,107 +43,78 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage: .LP -.RS 3 - -.LP .LP \f2% unpack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings. .LP .SH "OPTIONS" .LP -.SS -Standard Options -.LP -.RS 3 - -.LP .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file. .LP -.RE -.RE -.SS -Non\-Standard Options -.LP -.RS 3 - -.LP .LP \f4\-r \-\-remove\-pack\-file\fP .LP -.RS 3 - -.LP .LP Removes the input packed file. .LP -.RE .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP +.LP +Prints help information about this command. +.LP +.LP +\f4\-V \-\-version\fP +.LP +.LP +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP +.LP +.LP +Passes \f2option\fP to the Java launcher called by \f2unpack200\fP. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP if successful completion; .LP .LP \f2>0\fP if an error occurred. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -160,13 +126,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -181,8 +147,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/wsgen.1 --- a/jdk/src/solaris/doc/sun/man/man1/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "02 Jun 2010" +.TH wsgen 1 "10 May 2011" .SH "Name" wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 -.RS 3 - -.LP .LP \f3Specification Version:\fP 2.1 .br \f3Implementation Version:\fP 2.1.1 .LP -.LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation -.LP -.RE .SH "Overview" .LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see @@ -354,7 +348,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 139 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 133 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/wsimport.1 --- a/jdk/src/solaris/doc/sun/man/man1/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "02 Jun 2010" +.TH wsimport 1 "10 May 2011" .SH "Name" wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 .LP @@ -685,14 +685,295 @@ .fi https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html. .LP +The following table lists \f2wsimport\fP non\-standard options: +.LP +.TS +.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 +.de 35 +.ps \n(.s +.vs \n(.vu +.in \n(.iu +.if \n(.u .fi +.if \n(.j .ad +.if \n(.j=0 .na +.. +.nf +.nr #~ 0 +.if n .nr #~ 0.6n +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.fc +.nr 33 \n(.s +.rm 80 81 +.nr 34 \n(.lu +.eo +.am 81 +.br +.di a+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Map headers not bound to request or response message to Java method parameters. +.br +.di +.nr a| \n(dn +.nr a- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di b+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +WSDL URI that specifies the file that contains authorization information; this URI is in the following format: http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl +.br +.di +.nr b| \n(dn +.nr b- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di c+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Print debugging information. +.br +.di +.nr c| \n(dn +.nr c- \n(dl +.. +.ec \ +.eo +.am 80 +.br +.di d+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(80 .ll \n(80u +.in 0 +\f3\-Xno\-addressing\-databinding\fP +.br +.di +.nr d| \n(dn +.nr d- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di e+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Enable binding of W3C \f2EndpointReferenceType\fP to Java. +.br +.di +.nr e| \n(dn +.nr e- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di f+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Do not compile generated Java files. +.br +.di +.nr f| \n(dn +.nr f- \n(dl +.. +.ec \ +.35 +.nf +.ll \n(34u +.nr 80 0 +.nr 38 \w\f3Option\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-XadditionalHeaders\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xauthfile <file>\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xdebug\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xnocompile\fP +.if \n(80<\n(38 .nr 80 \n(38 +.80 +.rm 80 +.nr 38 \n(d- +.if \n(80<\n(38 .nr 80 \n(38 +.nr 81 0 +.nr 38 \w\f3Description\fP +.if \n(81<\n(38 .nr 81 \n(38 +.81 +.rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(b- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(c- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(e- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(f- +.if \n(81<\n(38 .nr 81 \n(38 +.35 +.nf +.ll \n(34u +.nr 38 1n +.nr 79 0 +.nr 40 \n(79+(0*\n(38) +.nr 80 +\n(40 +.nr 41 \n(80+(3*\n(38) +.nr 81 +\n(41 +.nr TW \n(81 +.if t .if \n(TW>\n(.li .tm Table at line 193 file Input is too wide - \n(TW units +.fc +.nr #T 0-1 +.nr #a 0-1 +.eo +.de T# +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.mk ## +.nr ## -1v +.ls 1 +.ls +.. +.ec +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP +.ne \n(a|u+\n(.Vu +.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.a+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(b|u+\n(.Vu +.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.b+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(c|u+\n(.Vu +.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.c+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(d|u+\n(.Vu +.ne \n(e|u+\n(.Vu +.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v) +.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(40u +.in +\n(37u +.d+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.e+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(f|u+\n(.Vu +.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.f+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.fc +.nr T. 1 +.T# 1 +.35 +.rm a+ +.rm b+ +.rm c+ +.rm d+ +.rm e+ +.rm f+ +.TE +.if \n-(b.=0 .nr c. \n(.c-\n(d.-26 + +.LP .SH "Example" .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -This will generate the Java artifacts and compile them by importing the \f2http://stockquote.xyz/quote?wsdl\fP. +This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP. .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/xjc.1 --- a/jdk/src/solaris/doc/sun/man/man1/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,19 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "02 Jun 2010" +.TH xjc 1 "10 May 2011" .LP -.ad c .SH "Name" xjc \- Java(TM) Architecture for XML Binding .br -Binding Compiler +Binding Compiler +.LP .LP \f3Specification Version:\fP 2.1 .br -\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l - +\f3Reference Implementation (RI) Version:\fP 2.1.3 .LP .SH "Launching xjc" .LP @@ -42,84 +41,87 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html. .LP -.RS 3 - -.LP .LP \f2% xjc \-help\fP .LP -.RE -\f3Output\fP -.LP -.RS 3 - +.SS +Output .LP .nf \f3 .fl -Usage: xjc [\-options ...] <schema_file/URL/dir> ... [\-b <bindinfo>] ... +Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ... +.fl +If dir is specified, all schema files in it will be compiled. +.fl +If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled. .fl Options: .fl - \-nv : do not perform strict validation of the input schema(s) + \-nv : do not perform strict validation of the input schema(s) .fl - \-extension : allow vendor extensions \- do not strictly follow the + \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec .fl - Compatibility Rules and App E.2 from the JAXB Spec + \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched .fl - \-b <file/dir> : specify external bindings files (each <file> must have its own \-b) + \-d <dir> : generated files will go into this directory +.fl + \-p <pkg> : specifies the target package .fl - If a directory is given, **/*.xjb is searched + \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort .fl - \-d <dir> : generated files will go into this directory + \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password .fl - \-p <pkg> : specifies the target package + \-classpath <arg> : specify where to find user class files .fl - \-httpproxy <proxy> : set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort + \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format .fl - \-httpproxyfile <file>: set the proxy string (same format as above). + \-readOnly : generated files will be in read\-only mode .fl - \-classpath <arg> : specify where to find user class files + \-npa : suppress generation of package level annotations (**/package\-info.java) +.fl + \-no\-header : suppress generation of a file header with timestamp .fl - \-catalog <file> : specify catalog files to resolve external entity references + \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features .fl - support TR9401, XCatalog, and OASIS XML Catalog format. + \-xmlschema : treat input as W3C XML Schema (default) .fl - \-readOnly : generated files will be in read\-only mode + \-relaxng : treat input as RELAX NG (experimental,unsupported) .fl - \-npa : suppress generation of package level annotations (**/package\-info.java) + \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) .fl - \-no\-header : suppress generation of a file header with timestamp + \-dtd : treat input as XML DTD (experimental,unsupported) .fl - \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features. + \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +.fl + \-verbose : be extra verbose .fl - \-xmlschema : treat input as W3C XML Schema (default) + \-quiet : suppress compiler output .fl - \-relaxng : treat input as RELAX NG (experimental,unsupported) + \-help : display this help message .fl - \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) + \-version : display version information +.fl + .fl - \-dtd : treat input as XML DTD (experimental,unsupported) + .fl - \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +Extensions: .fl - \-verbose : be extra verbose + \-Xlocator : enable source location support for generated code .fl - \-quiet : suppress compiler output + \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword .fl - \-help : display this help message + \-mark\-generated : mark the generated code as @javax.annotation.Generated .fl - \-version : display version information + \-episode <FILE> : generate the episode file for separate compilation .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-nv @@ -129,15 +131,9 @@ By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions .TP 3 \-b <file> -Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: -.RS 3 - -.LP -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP +Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP .br -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP -.RE -In addition, the ordering of the schema files and binding files on the command line does not matter. +\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter. .TP 3 \-d <dir> By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you. @@ -199,12 +195,30 @@ <schema file/URL/dir> Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them. .RE + +.LP .SS -Summary of Deprecated and Removed Command Line Options +Non\-Standard Command Line Options .LP .RS 3 +.TP 3 +\-Xlocator +Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling. +.TP 3 +\-Xsync\-methods +Causes all of the generated method signatures to include the \f2synchronized\fP keyword. +.TP 3 +\-mark\-generated +Mark the generated code with the annotation \f2@javax.annotation.Generated\fP. +.TP 3 +\-episode <file> +Generate the specified episode file for separate compilation. +.RE .LP +.SS +Deprecated and Removed Command Line Options +.LP .RS 3 .TP 3 \-host & \-port @@ -215,13 +229,9 @@ .TP 3 \-source The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase. -.TP 3 -\-Xlocator & \-Xsync\-methods -These switches have been disabled for now. We plan on releasing this functionality as a separate download in the future. .RE .LP -.RE .SS Compiler Restrictions .LP @@ -280,7 +290,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,332 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include <stdio.h> +#include <stdint.h> +#include <stdarg.h> +#include <unistd.h> +#include <errno.h> +#include <string.h> +#include <sys/resource.h> +#include <sys/types.h> +#include <dirent.h> +#include <stdlib.h> +#include <dlfcn.h> +#include <pthread.h> +#include "com_sun_management_UnixOperatingSystem.h" + +struct ticks { + uint64_t used; + uint64_t usedKernel; + uint64_t total; +}; + +typedef struct ticks ticks; + +typedef enum { + CPU_LOAD_VM_ONLY, + CPU_LOAD_GLOBAL, +} CpuLoadTarget; + +static struct perfbuf { + int nProcs; + ticks jvmTicks; + ticks cpuTicks; + ticks *cpus; +} counters; + +#define DEC_64 "%lld" + +static void next_line(FILE *f) { + while (fgetc(f) != '\n'); +} + +/** + * Return the total number of ticks since the system was booted. + * If the usedTicks parameter is not NULL, it will be filled with + * the number of ticks spent on actual processes (user, system or + * nice processes) since system boot. Note that this is the total number + * of "executed" ticks on _all_ CPU:s, that is on a n-way system it is + * n times the number of ticks that has passed in clock time. + * + * Returns a negative value if the reading of the ticks failed. + */ +static int get_totalticks(int which, ticks *pticks) { + FILE *fh; + uint64_t userTicks, niceTicks, systemTicks, idleTicks; + int n; + + if((fh = fopen("/proc/stat", "r")) == NULL) { + return -1; + } + + n = fscanf(fh, "cpu " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, + &userTicks, &niceTicks, &systemTicks, &idleTicks); + + // Move to next line + next_line(fh); + + //find the line for requested cpu faster to just iterate linefeeds? + if (which != -1) { + int i; + for (i = 0; i < which; i++) { + if (fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, &userTicks, &niceTicks, &systemTicks, &idleTicks) != 4) { + fclose(fh); + return -2; + } + next_line(fh); + } + n = fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64 "\n", + &userTicks, &niceTicks, &systemTicks, &idleTicks); + } + + fclose(fh); + if (n != 4) { + return -2; + } + + pticks->used = userTicks + niceTicks; + pticks->usedKernel = systemTicks; + pticks->total = userTicks + niceTicks + systemTicks + idleTicks; + + return 0; +} + +static int vread_statdata(const char *procfile, const char *fmt, va_list args) { + FILE *f; + int n; + char buf[2048]; + + if ((f = fopen(procfile, "r")) == NULL) { + return -1; + } + + if ((n = fread(buf, 1, sizeof(buf), f)) != -1) { + char *tmp; + + buf[n-1] = '\0'; + /** skip through pid and exec name. the exec name _could be wacky_ (renamed) and + * make scanf go mupp. + */ + if ((tmp = strrchr(buf, ')')) != NULL) { + // skip the ')' and the following space but check that the buffer is long enough + tmp += 2; + if (tmp < buf + n) { + n = vsscanf(tmp, fmt, args); + } + } + } + + fclose(f); + + return n; +} + +static int read_statdata(const char *procfile, const char *fmt, ...) { + int n; + va_list args; + + va_start(args, fmt); + n = vread_statdata(procfile, fmt, args); + va_end(args); + return n; +} + +/** read user and system ticks from a named procfile, assumed to be in 'stat' format then. */ +static int read_ticks(const char *procfile, uint64_t *userTicks, uint64_t *systemTicks) { + return read_statdata(procfile, "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "DEC_64" "DEC_64, + userTicks, systemTicks + ); +} + +/** + * Return the number of ticks spent in any of the processes belonging + * to the JVM on any CPU. + */ +static int get_jvmticks(ticks *pticks) { + uint64_t userTicks; + uint64_t systemTicks; + + if (read_ticks("/proc/self/stat", &userTicks, &systemTicks) < 0) { + return -1; + } + + // get the total + if (get_totalticks(-1, pticks) < 0) { + return -1; + } + + pticks->used = userTicks; + pticks->usedKernel = systemTicks; + + return 0; +} + +/** + * This method must be called first, before any data can be gathererd. + */ +int perfInit() { + static int initialized=1; + + if (!initialized) { + int i; + + int n = sysconf(_SC_NPROCESSORS_ONLN); + if (n <= 0) { + n = 1; + } + + counters.cpus = calloc(n,sizeof(ticks)); + if (counters.cpus != NULL) { + // For the CPU load + get_totalticks(-1, &counters.cpuTicks); + + for (i = 0; i < n; i++) { + get_totalticks(i, &counters.cpus[i]); + } + // For JVM load + get_jvmticks(&counters.jvmTicks); + initialized = 1; + } + } + + return initialized ? 0 : -1; +} + +#define MAX(a,b) (a>b?a:b) +#define MIN(a,b) (a<b?a:b) + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + +/** + * Return the load of the CPU as a double. 1.0 means the CPU process uses all + * available time for user or system processes, 0.0 means the CPU uses all time + * being idle. + * + * Returns a negative value if there is a problem in determining the CPU load. + */ + +static double get_cpuload_internal(int which, double *pkernelLoad, CpuLoadTarget target) { + uint64_t udiff, kdiff, tdiff; + ticks *pticks, tmp; + double user_load = -1.0; + int failed = 0; + + *pkernelLoad = 0.0; + + pthread_mutex_lock(&lock); + + if(perfInit() == 0) { + + if (target == CPU_LOAD_VM_ONLY) { + pticks = &counters.jvmTicks; + } else if (which == -1) { + pticks = &counters.cpuTicks; + } else { + pticks = &counters.cpus[which]; + } + + tmp = *pticks; + + if (target == CPU_LOAD_VM_ONLY) { + if (get_jvmticks(pticks) != 0) { + failed = 1; + } + } else if (get_totalticks(which, pticks) < 0) { + failed = 1; + } + + if(!failed) { + // seems like we sometimes end up with less kernel ticks when + // reading /proc/self/stat a second time, timing issue between cpus? + if (pticks->usedKernel < tmp.usedKernel) { + kdiff = 0; + } else { + kdiff = pticks->usedKernel - tmp.usedKernel; + } + tdiff = pticks->total - tmp.total; + udiff = pticks->used - tmp.used; + + if (tdiff == 0) { + user_load = 0; + } else { + if (tdiff < (udiff + kdiff)) { + tdiff = udiff + kdiff; + } + *pkernelLoad = (kdiff / (double)tdiff); + // BUG9044876, normalize return values to sane values + *pkernelLoad = MAX(*pkernelLoad, 0.0); + *pkernelLoad = MIN(*pkernelLoad, 1.0); + + user_load = (udiff / (double)tdiff); + user_load = MAX(user_load, 0.0); + user_load = MIN(user_load, 1.0); + } + } + } + pthread_mutex_unlock(&lock); + return user_load; +} + +double get_cpu_load(int which) { + double u, s; + u = get_cpuload_internal(which, &s, CPU_LOAD_GLOBAL); + if (u < 0) { + return -1.0; + } + // Cap total systemload to 1.0 + return MIN((u + s), 1.0); +} + +double get_process_load() { + double u, s; + u = get_cpuload_internal(-1, &s, CPU_LOAD_VM_ONLY); + if (u < 0) { + return -1.0; + } + return u + s; +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + if(perfInit() == 0) { + return get_cpu_load(-1); + } else { + return -1.0; + } +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + if(perfInit() == 0) { + return get_process_load(); + } else { + return -1.0; + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include <fcntl.h> +#include <kstat.h> +#include <procfs.h> +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/sysinfo.h> +#include <sys/lwp.h> +#include <pthread.h> +#include <utmpx.h> +#include <dlfcn.h> +#include <sys/loadavg.h> +#include <jni.h> +#include "jvm.h" +#include "com_sun_management_UnixOperatingSystem.h" + +typedef struct { + kstat_t *kstat; + uint64_t last_idle; + uint64_t last_total; + double last_ratio; +} cpuload_t; + +static cpuload_t *cpu_loads = NULL; +static unsigned int num_cpus; +static kstat_ctl_t *kstat_ctrl = NULL; + +static void map_cpu_kstat_counters() { + kstat_t *kstat; + int i; + + // Get number of CPU(s) + if ((num_cpus = sysconf(_SC_NPROCESSORS_ONLN)) == -1) { + num_cpus = 1; + } + + // Data structure for saving CPU load + if ((cpu_loads = calloc(num_cpus,sizeof(cpuload_t))) == NULL) { + return; + } + + // Get kstat cpu_stat counters for every CPU + // (loop over kstat to find our cpu_stat(s) + i = 0; + for (kstat = kstat_ctrl->kc_chain; kstat != NULL; kstat = kstat->ks_next) { + if (strncmp(kstat->ks_module, "cpu_stat", 8) == 0) { + + if (kstat_read(kstat_ctrl, kstat, NULL) == -1) { + // Failed to initialize kstat for this CPU so ignore it + continue; + } + + if (i == num_cpus) { + // Found more cpu_stats than reported CPUs + break; + } + + cpu_loads[i++].kstat = kstat; + } + } +} + +static int init_cpu_kstat_counters() { + static int initialized = 0; + + // Concurrence in this method is prevented by the lock in + // the calling method get_cpu_load(); + if(!initialized) { + if ((kstat_ctrl = kstat_open()) != NULL) { + map_cpu_kstat_counters(); + initialized = 1; + } + } + return initialized ? 0 : -1; +} + +static void update_cpu_kstat_counters() { + if(kstat_chain_update(kstat_ctrl) != 0) { + free(cpu_loads); + map_cpu_kstat_counters(); + } +} + +int read_cpustat(cpuload_t *load, cpu_stat_t *cpu_stat) { + if (load->kstat == NULL) { + // no handle. + return -1; + } + if (kstat_read(kstat_ctrl, load->kstat, cpu_stat) == -1) { + // disabling for now, a kstat chain update is likely to happen next time + load->kstat = NULL; + return -1; + } + return 0; +} + +double get_single_cpu_load(unsigned int n) { + cpuload_t *load; + cpu_stat_t cpu_stat; + uint_t *usage; + uint64_t c_idle; + uint64_t c_total; + uint64_t d_idle; + uint64_t d_total; + int i; + + if (n >= num_cpus) { + return -1.0; + } + + load = &cpu_loads[n]; + if (read_cpustat(load, &cpu_stat) < 0) { + return -1.0; + } + + usage = cpu_stat.cpu_sysinfo.cpu; + c_idle = usage[CPU_IDLE]; + + for (c_total = 0, i = 0; i < CPU_STATES; i++) { + c_total += usage[i]; + } + + // Calculate diff against previous snapshot + d_idle = c_idle - load->last_idle; + d_total = c_total - load->last_total; + + /** update if weve moved */ + if (d_total > 0) { + // Save current values for next time around + load->last_idle = c_idle; + load->last_total = c_total; + load->last_ratio = (double) (d_total - d_idle) / d_total; + } + + return load->last_ratio; +} + +int get_info(const char *path, void *info, size_t s, off_t o) { + int fd; + int ret = 0; + if ((fd = open(path, O_RDONLY)) < 0) { + return -1; + } + if (pread(fd, info, s, o) != s) { + ret = -1; + } + close(fd); + return ret; +} + +#define MIN(a, b) ((a < b) ? a : b) + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + +/** + * Return the cpu load (0-1) for proc number 'which' (or average all if which == -1) + */ +double get_cpu_load(int which) { + double load =.0; + + pthread_mutex_lock(&lock); + if(init_cpu_kstat_counters()==0) { + + update_cpu_kstat_counters(); + + if (which == -1) { + unsigned int i; + double t; + + for (t = .0, i = 0; i < num_cpus; i++) { + t += get_single_cpu_load(i); + } + + // Cap total systemload to 1.0 + load = MIN((t / num_cpus), 1.0); + } else { + load = MIN(get_single_cpu_load(which), 1.0); + } + } else { + load = -1.0; + } + pthread_mutex_unlock(&lock); + + return load; +} + +/** + * Return the cpu load (0-1) for the current process (i.e the JVM) + * or -1.0 if the get_info() call failed + */ +double get_process_load(void) { + psinfo_t info; + + // Get the percentage of "recent cpu usage" from all the lwp:s in the JVM:s + // process. This is returned as a value between 0.0 and 1.0 multiplied by 0x8000. + if (get_info("/proc/self/psinfo",&info.pr_pctcpu, sizeof(info.pr_pctcpu), offsetof(psinfo_t, pr_pctcpu)) == 0) { + return (double) info.pr_pctcpu / 0x8000; + } + return -1.0; +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + return get_cpu_load(-1); +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + return get_process_load(); +} + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c --- a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat May 14 11:52:15 2011 -0700 @@ -239,6 +239,13 @@ snd_pcm_close(handle); } +/** Workaround for cr 7033899, 7030629: + * dmix plugin doesn't like flush (snd_pcm_drop) when the buffer is empty + * (just opened, underruned or already flushed). + * Sometimes it causes PCM falls to -EBADFD error, + * sometimes causes bufferSize change. + * To prevent unnecessary flushes AlsaPcmInfo::isRunning & isFlushed are used. + */ /* ******* ALSA PCM INFO ******************** */ typedef struct tag_AlsaPcmInfo { snd_pcm_t* handle; @@ -248,6 +255,8 @@ int frameSize; // storage size in Bytes unsigned int periods; snd_pcm_uframes_t periodSize; + short int isRunning; // see comment above + short int isFlushed; // see comment above #ifdef GET_POSITION_METHOD2 // to be used exclusively by getBytePosition! snd_pcm_status_t* positionStatus; @@ -432,6 +441,9 @@ return NULL; } memset(info, 0, sizeof(AlsaPcmInfo)); + // initial values are: stopped, flushed + info->isRunning = 0; + info->isFlushed = 1; ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/); if (ret == 0) { @@ -587,6 +599,14 @@ || (state == SND_PCM_STATE_RUNNING) || (state == SND_PCM_STATE_XRUN) || (state == SND_PCM_STATE_SUSPENDED); + if (ret) { + info->isRunning = 1; + // source line should keep isFlushed value until Write() is called; + // for target data line reset it right now. + if (!isSource) { + info->isFlushed = 0; + } + } TRACE1("< DAUDIO_Start %s\n", ret?"success":"error"); return ret?TRUE:FALSE; } @@ -606,6 +626,7 @@ ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret)); return FALSE; } + info->isRunning = 0; TRACE0("< DAUDIO_Stop success\n"); return TRUE; } @@ -651,8 +672,7 @@ return -1; } return 1; - } - else if (err == -ESTRPIPE) { + } else if (err == -ESTRPIPE) { TRACE0("xrun_recovery: suspended.\n"); ret = snd_pcm_resume(info->handle); if (ret < 0) { @@ -667,11 +687,11 @@ return -1; } return 1; - } - else if (err == -EAGAIN) { + } else if (err == -EAGAIN) { TRACE0("xrun_recovery: EAGAIN try again flag.\n"); return 0; } + TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err)); return -1; } @@ -691,6 +711,7 @@ TRACE0("< DAUDIO_Write returning -1\n"); return -1; } + count = 2; // maximum number of trials to recover from underrun //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize); frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize); @@ -712,6 +733,12 @@ } } while (TRUE); //ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames); + + if (writtenFrames > 0) { + // reset "flushed" flag + info->isFlushed = 0; + } + ret = (int) (writtenFrames * info->frameSize); TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret); return ret; @@ -736,6 +763,11 @@ TRACE0("< DAUDIO_Read returning -1\n"); return -1; } + if (!info->isRunning && info->isFlushed) { + // PCM has nothing to read + return 0; + } + count = 2; // maximum number of trials to recover from error //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize); frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize); @@ -784,12 +816,22 @@ int ret; TRACE0("DAUDIO_Flush\n"); + + if (info->isFlushed) { + // nothing to drop + return 1; + } + ret = snd_pcm_drop(info->handle); if (ret != 0) { ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret)); return FALSE; } - ret = DAUDIO_Start(id, isSource); + + info->isFlushed = 1; + if (info->isRunning) { + ret = DAUDIO_Start(id, isSource); + } return ret; } @@ -800,7 +842,7 @@ int ret; state = snd_pcm_state(info->handle); - if (state == SND_PCM_STATE_XRUN) { + if (info->isFlushed || state == SND_PCM_STATE_XRUN) { // if in xrun state then we have the entire buffer available, // not 0 as alsa reports ret = info->bufferSizeInBytes; @@ -841,7 +883,7 @@ snd_pcm_state_t state; state = snd_pcm_state(info->handle); - if (state != SND_PCM_STATE_XRUN) { + if (!info->isFlushed && state != SND_PCM_STATE_XRUN) { #ifdef GET_POSITION_METHOD2 snd_timestamp_t* ts; snd_pcm_uframes_t framesAvail; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/sun/nio/ch/EPoll.c --- a/jdk/src/solaris/native/sun/nio/ch/EPoll.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/native/sun/nio/ch/EPoll.c Sat May 14 11:52:15 2011 -0700 @@ -34,55 +34,7 @@ #include <dlfcn.h> #include <unistd.h> #include <sys/types.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* epoll_wait(2) man page */ - -typedef union epoll_data { - void *ptr; - int fd; - __uint32_t u32; - __uint64_t u64; -} epoll_data_t; - -struct epoll_event { - __uint32_t events; /* Epoll events */ - epoll_data_t data; /* User data variable */ -} __attribute__ ((__packed__)); - -#ifdef __cplusplus -} -#endif - -/* - * epoll event notification is new in 2.6 kernel. As the offical build - * platform for the JDK is on a 2.4-based distribution then we must - * obtain the addresses of the epoll functions dynamically. - */ -typedef int (*epoll_create_t)(int size); -typedef int (*epoll_ctl_t) (int epfd, int op, int fd, struct epoll_event *event); -typedef int (*epoll_wait_t) (int epfd, struct epoll_event *events, int maxevents, int timeout); - -static epoll_create_t epoll_create_func; -static epoll_ctl_t epoll_ctl_func; -static epoll_wait_t epoll_wait_func; - - -JNIEXPORT void JNICALL -Java_sun_nio_ch_EPoll_init(JNIEnv *env, jclass this) -{ - epoll_create_func = (epoll_create_t) dlsym(RTLD_DEFAULT, "epoll_create"); - epoll_ctl_func = (epoll_ctl_t) dlsym(RTLD_DEFAULT, "epoll_ctl"); - epoll_wait_func = (epoll_wait_t) dlsym(RTLD_DEFAULT, "epoll_wait"); - - if ((epoll_create_func == NULL) || (epoll_ctl_func == NULL) || - (epoll_wait_func == NULL)) { - JNU_ThrowInternalError(env, "unable to get address of epoll functions, pre-2.6 kernel?"); - } -} +#include <sys/epoll.h> JNIEXPORT jint JNICALL Java_sun_nio_ch_EPoll_eventSize(JNIEnv* env, jclass this) @@ -108,7 +60,7 @@ * epoll_create expects a size as a hint to the kernel about how to * dimension internal structures. We can't predict the size in advance. */ - int epfd = (*epoll_create_func)(256); + int epfd = epoll_create(256); if (epfd < 0) { JNU_ThrowIOExceptionWithLastError(env, "epoll_create failed"); } @@ -125,7 +77,7 @@ event.events = events; event.data.fd = fd; - RESTARTABLE((*epoll_ctl_func)(epfd, (int)opcode, (int)fd, &event), res); + RESTARTABLE(epoll_ctl(epfd, (int)opcode, (int)fd, &event), res); return (res == 0) ? 0 : errno; } @@ -137,7 +89,7 @@ struct epoll_event *events = jlong_to_ptr(address); int res; - RESTARTABLE((*epoll_wait_func)(epfd, events, numfds, -1), res); + RESTARTABLE(epoll_wait(epfd, events, numfds, -1), res); if (res < 0) { JNU_ThrowIOExceptionWithLastError(env, "epoll_wait failed"); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c Sat May 14 11:52:15 2011 -0700 @@ -33,33 +33,10 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/poll.h> +#include <sys/inotify.h> #include "sun_nio_fs_LinuxWatchService.h" -/* inotify.h may not be available at build time */ -#ifdef __cplusplus -extern "C" { -#endif -struct inotify_event -{ - int wd; - uint32_t mask; - uint32_t cookie; - uint32_t len; - char name __flexarr; -}; -#ifdef __cplusplus -} -#endif - -typedef int inotify_init_func(void); -typedef int inotify_add_watch_func(int fd, const char* path, uint32_t mask); -typedef int inotify_rm_watch_func(int fd, uint32_t wd); - -inotify_init_func* my_inotify_init_func = NULL; -inotify_add_watch_func* my_inotify_add_watch_func = NULL; -inotify_rm_watch_func* my_inotify_rm_watch_func = NULL; - static void throwUnixException(JNIEnv* env, int errnum) { jobject x = JNU_NewObjectByName(env, "sun/nio/fs/UnixException", "(I)V", errnum); @@ -68,22 +45,6 @@ } } -JNIEXPORT void JNICALL -Java_sun_nio_fs_LinuxWatchService_init(JNIEnv *env, jclass clazz) -{ - my_inotify_init_func = (inotify_init_func*) - dlsym(RTLD_DEFAULT, "inotify_init"); - my_inotify_add_watch_func = - (inotify_add_watch_func*) dlsym(RTLD_DEFAULT, "inotify_add_watch"); - my_inotify_rm_watch_func = - (inotify_rm_watch_func*) dlsym(RTLD_DEFAULT, "inotify_rm_watch"); - - if ((my_inotify_init_func == NULL) || (my_inotify_add_watch_func == NULL) || - (my_inotify_rm_watch_func == NULL)) { - JNU_ThrowInternalError(env, "unable to get address of inotify functions"); - } -} - JNIEXPORT jint JNICALL Java_sun_nio_fs_LinuxWatchService_eventSize(JNIEnv *env, jclass clazz) { @@ -111,7 +72,7 @@ Java_sun_nio_fs_LinuxWatchService_inotifyInit (JNIEnv* env, jclass clazz) { - int ifd = (*my_inotify_init_func)(); + int ifd = inotify_init(); if (ifd == -1) { throwUnixException(env, errno); } @@ -125,7 +86,7 @@ int wfd = -1; const char* path = (const char*)jlong_to_ptr(address); - wfd = (*my_inotify_add_watch_func)((int)fd, path, mask); + wfd = inotify_add_watch((int)fd, path, mask); if (wfd == -1) { throwUnixException(env, errno); } @@ -136,7 +97,7 @@ Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch (JNIEnv* env, jclass clazz, jint fd, jint wd) { - int err = (*my_inotify_rm_watch_func)((int)fd, (int)wd); + int err = inotify_rm_watch((int)fd, (int)wd); if (err == -1) throwUnixException(env, errno); } @@ -166,7 +127,6 @@ res[1] = (jint)sp[1]; (*env)->SetIntArrayRegion(env, sv, 0, 2, &res[0]); } - } JNIEXPORT jint JNICALL @@ -190,6 +150,4 @@ } } return (jint)n; - - } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/com/sun/management/OperatingSystem.java --- a/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Sat May 14 11:52:15 2011 -0700 @@ -58,6 +58,8 @@ public native long getProcessCpuTime(); public native long getFreePhysicalMemorySize(); public native long getTotalPhysicalMemorySize(); + public native double getSystemCpuLoad(); + public native double getProcessCpuLoad(); static { initialize(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/java/lang/ProcessEnvironment.java --- a/jdk/src/windows/classes/java/lang/ProcessEnvironment.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/java/lang/ProcessEnvironment.java Sat May 14 11:52:15 2011 -0700 @@ -143,7 +143,7 @@ public void remove() { i.remove();} }; } - private static Map.Entry<String,String> checkedEntry (Object o) { + private static Map.Entry<String,String> checkedEntry(Object o) { Map.Entry<String,String> e = (Map.Entry<String,String>) o; nonNullString(e.getKey()); nonNullString(e.getValue()); @@ -285,7 +285,7 @@ return (Map<String,String>) theEnvironment.clone(); } - // Only for use by Runtime.exec(...String[]envp...) + // Only for use by ProcessBuilder.environment(String[] envp) static Map<String,String> emptyEnvironment(int capacity) { return new ProcessEnvironment(capacity); } @@ -299,19 +299,46 @@ Collections.sort(list, entryComparator); StringBuilder sb = new StringBuilder(size()*30); - for (Map.Entry<String,String> e : list) - sb.append(e.getKey()) - .append('=') - .append(e.getValue()) - .append('\u0000'); - // Ensure double NUL termination, - // even if environment is empty. - if (sb.length() == 0) + int cmp = -1; + + // Some versions of MSVCRT.DLL require SystemRoot to be set. + // So, we make sure that it is always set, even if not provided + // by the caller. + final String SYSTEMROOT = "SystemRoot"; + + for (Map.Entry<String,String> e : list) { + String key = e.getKey(); + String value = e.getValue(); + if (cmp < 0 && (cmp = nameComparator.compare(key, SYSTEMROOT)) > 0) { + // Not set, so add it here + addToEnvIfSet(sb, SYSTEMROOT); + } + addToEnv(sb, key, value); + } + if (cmp < 0) { + // Got to end of list and still not found + addToEnvIfSet(sb, SYSTEMROOT); + } + if (sb.length() == 0) { + // Environment was empty and SystemRoot not set in parent sb.append('\u0000'); + } + // Block is double NUL terminated sb.append('\u0000'); return sb.toString(); } + // add the environment variable to the child, if it exists in parent + private static void addToEnvIfSet(StringBuilder sb, String name) { + String s = getenv(name); + if (s != null) + addToEnv(sb, name, s); + } + + private static void addToEnv(StringBuilder sb, String name, String val) { + sb.append(name).append('=').append(val).append('\u0000'); + } + static String toEnvironmentBlock(Map<String,String> map) { return map == null ? null : ((ProcessEnvironment)map).toEnvironmentBlock(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java --- a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java Sat May 14 11:52:15 2011 -0700 @@ -830,7 +830,14 @@ if( -1 == iStartOffset ){ throw new IOException(FAILURE_MSG + "invalid HTML format."); } - iReadCount = bufferedStream.skip(iStartOffset); + + int curOffset = 0; + while (curOffset < iStartOffset){ + curOffset += bufferedStream.skip(iStartOffset - curOffset); + } + + iReadCount = curOffset; + if( iStartOffset != iReadCount ){ throw new IOException(FAILURE_MSG + "Byte stream ends in description."); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java --- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -30,12 +30,15 @@ package sun.security.krb5.internal.tools; +import java.io.File; import sun.security.krb5.*; import sun.security.krb5.internal.*; import sun.security.krb5.internal.ccache.*; import java.io.IOException; import java.util.Arrays; +import javax.security.auth.kerberos.KerberosPrincipal; import sun.security.util.Password; +import javax.security.auth.kerberos.KeyTab; /** * Kinit tool for obtaining Kerberos v5 tickets. @@ -153,7 +156,6 @@ System.out.println("Principal is " + principal); } char[] psswd = options.password; - EncryptionKey[] skeys = null; boolean useKeytab = options.useKeytabFile(); if (!useKeytab) { if (princName == null) { @@ -186,17 +188,9 @@ } } - // assert princName and principal are nonnull - skeys = EncryptionKey.acquireSecretKeys(principal, ktabName); - - if (skeys == null || skeys.length == 0) { - String msg = "No supported key found in keytab"; - if (princName != null) { - msg += " for principal " + princName; - } - throw new KrbException(msg); - } - builder = new KrbAsReqBuilder(principal, skeys); + builder = new KrbAsReqBuilder(principal, ktabName == null + ? KeyTab.getInstance() + : KeyTab.getInstance(new File(ktabName))); } KDCOptions opt = new KDCOptions(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java --- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,16 +95,15 @@ } break; case 'k': - if (klist.name == null) { - klist.target = KeyTab.getInstance(); - klist.name = KeyTab.tabName(); - } else klist.target = KeyTab.getInstance(klist.name); - if (klist.target != null) { - klist.displayTab(); - } else { + try { + KeyTab ktab = KeyTab.getInstance(klist.name); + klist.target = ktab; + klist.name = ktab.tabName(); + } catch (Exception e) { klist.displayMessage("KeyTab"); System.exit(-1); } + klist.displayTab(); break; default: if (klist.name != null) { @@ -295,9 +294,10 @@ void displayMessage(String target) { if (name == null) { - name = ""; + System.out.println("Default " + target + " not found."); + } else { + System.out.println(target + " " + name + " not found."); } - System.out.println(target + " " + name + " not found."); } /** * Reformats the date from the form - diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java --- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -321,7 +321,7 @@ * Lists key table name and entries in it. */ void listKt() { - System.out.println("Keytab name: " + KeyTab.tabName()); + System.out.println("Keytab name: " + table.tabName()); KeyTabEntry[] entries = table.getEntries(); if ((entries != null) && (entries.length > 0)) { String[][] output = new String[entries.length+1][showTime?3:2]; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/KeyStore.java --- a/jdk/src/windows/classes/sun/security/mscapi/KeyStore.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/KeyStore.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -31,6 +31,7 @@ import java.io.OutputStream; import java.math.BigInteger; import java.security.AccessController; +import java.security.InvalidKeyException; import java.security.KeyStoreSpi; import java.security.KeyStoreException; import java.security.UnrecoverableKeyException; @@ -123,6 +124,7 @@ * Sets the private key for the keystore entry. */ void setPrivateKey(RSAPrivateCrtKey key) + throws InvalidKeyException, KeyStoreException { byte[] modulusBytes = key.getModulus().toByteArray(); @@ -158,7 +160,7 @@ * Sets the certificate chain for the keystore entry. */ void setCertificateChain(X509Certificate[] chain) - throws CertificateException + throws CertificateException, KeyStoreException { for (int i = 0; i < chain.length; i++) { byte[] encoding = chain[i].getEncoded(); @@ -404,13 +406,16 @@ } entry.setAlias(alias); - entry.setPrivateKey((RSAPrivateCrtKey) key); try { + entry.setPrivateKey((RSAPrivateCrtKey) key); entry.setCertificateChain((X509Certificate[]) chain); } catch (CertificateException ce) { throw new KeyStoreException(ce); + + } catch (InvalidKeyException ike) { + throw new KeyStoreException(ike); } } else { @@ -537,7 +542,7 @@ removeCertificate(getName(), alias, encoding, encoding.length); - } catch (CertificateEncodingException e) { + } catch (CertificateException e) { throw new KeyStoreException("Cannot remove entry: " + e); } @@ -754,8 +759,14 @@ // Clear all key entries entries.clear(); - // Load keys and/or certificate chains - loadKeysOrCertificateChains(getName(), entries); + try { + + // Load keys and/or certificate chains + loadKeysOrCertificateChains(getName(), entries); + + } catch (KeyStoreException e) { + throw new IOException(e); + } } /** @@ -868,7 +879,7 @@ * @param entries Collection of key/certificate. */ private native void loadKeysOrCertificateChains(String name, - Collection<KeyEntry> entries); + Collection<KeyEntry> entries) throws KeyStoreException; /** * Stores a DER-encoded certificate into the certificate store @@ -879,7 +890,7 @@ */ private native void storeCertificate(String name, String alias, byte[] encoding, int encodingLength, long hCryptProvider, - long hCryptKey); + long hCryptKey) throws CertificateException, KeyStoreException; /** * Removes the certificate from the certificate store @@ -889,14 +900,16 @@ * @param encoding DER-encoded certificate. */ private native void removeCertificate(String name, String alias, - byte[] encoding, int encodingLength); + byte[] encoding, int encodingLength) + throws CertificateException, KeyStoreException; /** * Destroys the key container. * * @param keyContainerName The name of the key container. */ - private native void destroyKeyContainer(String keyContainerName); + private native void destroyKeyContainer(String keyContainerName) + throws KeyStoreException; /** * Generates a private-key BLOB from a key's components. @@ -910,8 +923,8 @@ byte[] primeQ, byte[] exponentP, byte[] exponentQ, - byte[] crtCoefficient); + byte[] crtCoefficient) throws InvalidKeyException; private native RSAPrivateKey storePrivateKey(byte[] keyBlob, - String keyContainerName, int keySize); + String keyContainerName, int keySize) throws KeyStoreException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSACipher.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -25,6 +25,7 @@ package sun.security.mscapi; +import java.math.BigInteger; import java.security.*; import java.security.Key; import java.security.interfaces.*; @@ -33,6 +34,8 @@ import javax.crypto.*; import javax.crypto.spec.*; +import sun.security.rsa.RSAKeyFactory; + /** * RSA cipher implementation using the Microsoft Crypto API. * Supports RSA en/decryption and signing/verifying using PKCS#1 v1.5 padding. @@ -189,8 +192,43 @@ default: throw new InvalidKeyException("Unknown mode: " + opmode); } + if (!(key instanceof sun.security.mscapi.Key)) { - throw new InvalidKeyException("Unsupported key type: " + key); + if (key instanceof java.security.interfaces.RSAPublicKey) { + java.security.interfaces.RSAPublicKey rsaKey = + (java.security.interfaces.RSAPublicKey) key; + + // Convert key to MSCAPI format + + BigInteger modulus = rsaKey.getModulus(); + BigInteger exponent = rsaKey.getPublicExponent(); + + // Check against the local and global values to make sure + // the sizes are ok. Round up to the nearest byte. + RSAKeyFactory.checkKeyLengths(((modulus.bitLength() + 7) & ~7), + exponent, -1, RSAKeyPairGenerator.KEY_SIZE_MAX); + + byte[] modulusBytes = modulus.toByteArray(); + byte[] exponentBytes = exponent.toByteArray(); + + // Adjust key length due to sign bit + int keyBitLength = (modulusBytes[0] == 0) + ? (modulusBytes.length - 1) * 8 + : modulusBytes.length * 8; + + byte[] keyBlob = RSASignature.generatePublicKeyBlob( + keyBitLength, modulusBytes, exponentBytes); + + try { + key = RSASignature.importPublicKey(keyBlob, keyBitLength); + + } catch (KeyStoreException e) { + throw new InvalidKeyException(e); + } + + } else { + throw new InvalidKeyException("Unsupported key type: " + key); + } } if (key instanceof PublicKey) { @@ -358,6 +396,10 @@ if (key instanceof sun.security.mscapi.Key) { return ((sun.security.mscapi.Key) key).bitLength(); + + } else if (key instanceof RSAKey) { + return ((RSAKey) key).getModulus().bitLength(); + } else { throw new InvalidKeyException("Unsupported key type: " + key); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -105,14 +105,20 @@ // generate the keypair. See JCA doc public KeyPair generateKeyPair() { - // Generate each keypair in a unique key container - RSAKeyPair keys = - generateRSAKeyPair(keySize, - "{" + UUID.randomUUID().toString() + "}"); + try { - return new KeyPair(keys.getPublic(), keys.getPrivate()); + // Generate each keypair in a unique key container + RSAKeyPair keys = + generateRSAKeyPair(keySize, + "{" + UUID.randomUUID().toString() + "}"); + + return new KeyPair(keys.getPublic(), keys.getPrivate()); + + } catch (KeyException e) { + throw new ProviderException(e); + } } private static native RSAKeyPair generateRSAKeyPair(int keySize, - String keyContainerName); + String keyContainerName) throws KeyException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,9 @@ import java.math.BigInteger; import java.security.InvalidKeyException; +import java.security.KeyException; import java.security.KeyRep; +import java.security.ProviderException; import java.security.PublicKey; import sun.security.rsa.RSAPublicKeyImpl; @@ -89,9 +91,14 @@ public BigInteger getPublicExponent() { if (exponent == null) { - publicKeyBlob = getPublicKeyBlob(hCryptKey); - exponent = new BigInteger(getExponent(publicKeyBlob)); + try { + publicKeyBlob = getPublicKeyBlob(hCryptKey); + exponent = new BigInteger(1, getExponent(publicKeyBlob)); + + } catch (KeyException e) { + throw new ProviderException(e); + } } return exponent; @@ -103,8 +110,14 @@ public BigInteger getModulus() { if (modulus == null) { - publicKeyBlob = getPublicKeyBlob(hCryptKey); - modulus = new BigInteger(getModulus(publicKeyBlob)); + + try { + publicKeyBlob = getPublicKeyBlob(hCryptKey); + modulus = new BigInteger(1, getModulus(publicKeyBlob)); + + } catch (KeyException e) { + throw new ProviderException(e); + } } return modulus; @@ -147,7 +160,7 @@ encoding = new RSAPublicKeyImpl(getModulus(), getPublicExponent()).getEncoded(); - } catch (InvalidKeyException e) { + } catch (KeyException e) { // ignore } } @@ -164,15 +177,15 @@ /* * Returns the Microsoft CryptoAPI representation of the key. */ - private native byte[] getPublicKeyBlob(long hCryptKey); + private native byte[] getPublicKeyBlob(long hCryptKey) throws KeyException; /* * Returns the key's public exponent (in big-endian 2's complement format). */ - private native byte[] getExponent(byte[] keyBlob); + private native byte[] getExponent(byte[] keyBlob) throws KeyException; /* * Returns the key's modulus (in big-endian 2's complement format). */ - private native byte[] getModulus(byte[] keyBlob); + private native byte[] getModulus(byte[] keyBlob) throws KeyException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSASignature.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -31,6 +31,7 @@ import java.security.InvalidKeyException; import java.security.InvalidParameterException; import java.security.InvalidAlgorithmParameterException; +import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.ProviderException; import java.security.MessageDigest; @@ -48,11 +49,20 @@ * Objects should be instantiated by calling Signature.getInstance() using the * following algorithm names: * + * . "NONEwithRSA" * . "SHA1withRSA" + * . "SHA256withRSA" + * . "SHA384withRSA" + * . "SHA512withRSA" * . "MD5withRSA" * . "MD2withRSA" * - * Note: RSA keys must be at least 512 bits long + * NOTE: RSA keys must be at least 512 bits long. + * + * NOTE: NONEwithRSA must be supplied with a pre-computed message digest. + * Only the following digest algorithms are supported: MD5, SHA-1, + * SHA-256, SHA-384, SHA-512 and a special-purpose digest algorithm + * which is a concatenation of SHA-1 and MD5 digests. * * @since 1.6 * @author Stanley Man-Kit Ho @@ -62,7 +72,10 @@ // message digest implementation we use private final MessageDigest messageDigest; - // flag indicating whether the digest is reset + // message digest name + private String messageDigestAlgorithm; + + // flag indicating whether the digest has been reset private boolean needsReset; // the signing key @@ -71,11 +84,23 @@ // the verification key private Key publicKey = null; + /** + * Constructs a new RSASignature. Used by Raw subclass. + */ + RSASignature() { + messageDigest = null; + messageDigestAlgorithm = null; + } + /** + * Constructs a new RSASignature. Used by subclasses. + */ RSASignature(String digestName) { try { messageDigest = MessageDigest.getInstance(digestName); + // Get the digest's canonical name + messageDigestAlgorithm = messageDigest.getAlgorithm(); } catch (NoSuchAlgorithmException e) { throw new ProviderException(e); @@ -84,12 +109,118 @@ needsReset = false; } + // Nested class for NONEwithRSA signatures + public static final class Raw extends RSASignature { + + // the longest supported digest is 512 bits (SHA-512) + private static final int RAW_RSA_MAX = 64; + + private final byte[] precomputedDigest; + private int offset = 0; + + public Raw() { + precomputedDigest = new byte[RAW_RSA_MAX]; + } + + // Stores the precomputed message digest value. + @Override + protected void engineUpdate(byte b) throws SignatureException { + if (offset >= precomputedDigest.length) { + offset = RAW_RSA_MAX + 1; + return; + } + precomputedDigest[offset++] = b; + } + + // Stores the precomputed message digest value. + @Override + protected void engineUpdate(byte[] b, int off, int len) + throws SignatureException { + if (offset + len > precomputedDigest.length) { + offset = RAW_RSA_MAX + 1; + return; + } + System.arraycopy(b, off, precomputedDigest, offset, len); + offset += len; + } + + // Stores the precomputed message digest value. + @Override + protected void engineUpdate(ByteBuffer byteBuffer) { + int len = byteBuffer.remaining(); + if (len <= 0) { + return; + } + if (offset + len > precomputedDigest.length) { + offset = RAW_RSA_MAX + 1; + return; + } + byteBuffer.get(precomputedDigest, offset, len); + offset += len; + } + + @Override + protected void resetDigest(){ + offset = 0; + } + + // Returns the precomputed message digest value. + @Override + protected byte[] getDigestValue() throws SignatureException { + if (offset > RAW_RSA_MAX) { + throw new SignatureException("Message digest is too long"); + } + + // Determine the digest algorithm from the digest length + if (offset == 20) { + setDigestName("SHA1"); + } else if (offset == 36) { + setDigestName("SHA1+MD5"); + } else if (offset == 32) { + setDigestName("SHA-256"); + } else if (offset == 48) { + setDigestName("SHA-384"); + } else if (offset == 64) { + setDigestName("SHA-512"); + } else if (offset == 16) { + setDigestName("MD5"); + } else { + throw new SignatureException( + "Message digest length is not supported"); + } + + byte[] result = new byte[offset]; + System.arraycopy(precomputedDigest, 0, result, 0, offset); + offset = 0; + + return result; + } + } + public static final class SHA1 extends RSASignature { public SHA1() { super("SHA1"); } } + public static final class SHA256 extends RSASignature { + public SHA256() { + super("SHA-256"); + } + } + + public static final class SHA384 extends RSASignature { + public SHA384() { + super("SHA-384"); + } + } + + public static final class SHA512 extends RSASignature { + public SHA512() { + super("SHA-512"); + } + } + public static final class MD5 extends RSASignature { public MD5() { super("MD5"); @@ -102,16 +233,7 @@ } } - /** - * Initializes this signature object with the specified - * public key for verification operations. - * - * @param publicKey the public key of the identity whose signature is - * going to be verified. - * - * @exception InvalidKeyException if the key is improperly - * encoded, parameters are missing, and so on. - */ + // initialize for signing. See JCA doc protected void engineInitVerify(PublicKey key) throws InvalidKeyException { @@ -146,30 +268,23 @@ byte[] keyBlob = generatePublicKeyBlob( keyBitLength, modulusBytes, exponentBytes); - publicKey = importPublicKey(keyBlob, keyBitLength); + try { + publicKey = importPublicKey(keyBlob, keyBitLength); + + } catch (KeyStoreException e) { + throw new InvalidKeyException(e); + } } else { publicKey = (sun.security.mscapi.RSAPublicKey) key; } - if (needsReset) { - messageDigest.reset(); - needsReset = false; - } + this.privateKey = null; + resetDigest(); } - /** - * Initializes this signature object with the specified - * private key for signing operations. - * - * @param privateKey the private key of the identity whose signature - * will be generated. - * - * @exception InvalidKeyException if the key is improperly - * encoded, parameters are missing, and so on. - */ - protected void engineInitSign(PrivateKey key) - throws InvalidKeyException + // initialize for signing. See JCA doc + protected void engineInitSign(PrivateKey key) throws InvalidKeyException { // This signature accepts only RSAPrivateKey if ((key instanceof sun.security.mscapi.RSAPrivateKey) == false) { @@ -183,12 +298,29 @@ null, RSAKeyPairGenerator.KEY_SIZE_MIN, RSAKeyPairGenerator.KEY_SIZE_MAX); + this.publicKey = null; + resetDigest(); + } + + /** + * Resets the message digest if needed. + */ + protected void resetDigest() { if (needsReset) { messageDigest.reset(); needsReset = false; } } + protected byte[] getDigestValue() throws SignatureException { + needsReset = false; + return messageDigest.digest(); + } + + protected void setDigestName(String name) { + messageDigestAlgorithm = name; + } + /** * Updates the data to be signed or verified * using the specified byte. @@ -248,13 +380,15 @@ */ protected byte[] engineSign() throws SignatureException { - byte[] hash = messageDigest.digest(); - needsReset = false; + byte[] hash = getDigestValue(); + + // Omit the hash OID when generating a Raw signature + boolean noHashOID = this instanceof Raw; // Sign hash using MS Crypto APIs - byte[] result = signHash(hash, hash.length, - messageDigest.getAlgorithm(), privateKey.getHCryptProvider(), + byte[] result = signHash(noHashOID, hash, hash.length, + messageDigestAlgorithm, privateKey.getHCryptProvider(), privateKey.getHCryptKey()); // Convert signature array from little endian to big endian @@ -282,8 +416,8 @@ * Sign hash using Microsoft Crypto API with HCRYPTKEY. * The returned data is in little-endian. */ - private native static byte[] signHash(byte[] hash, int hashSize, - String hashAlgorithm, long hCryptProv, long hCryptKey) + private native static byte[] signHash(boolean noHashOID, byte[] hash, + int hashSize, String hashAlgorithm, long hCryptProv, long hCryptKey) throws SignatureException; /** @@ -308,11 +442,10 @@ protected boolean engineVerify(byte[] sigBytes) throws SignatureException { - byte[] hash = messageDigest.digest(); - needsReset = false; + byte[] hash = getDigestValue(); return verifySignedHash(hash, hash.length, - messageDigest.getAlgorithm(), convertEndianArray(sigBytes), + messageDigestAlgorithm, convertEndianArray(sigBytes), sigBytes.length, publicKey.getHCryptProvider(), publicKey.getHCryptKey()); } @@ -379,11 +512,15 @@ /** * Generates a public-key BLOB from a key's components. */ - private native byte[] generatePublicKeyBlob( - int keyBitLength, byte[] modulus, byte[] publicExponent); + // used by RSACipher + static native byte[] generatePublicKeyBlob( + int keyBitLength, byte[] modulus, byte[] publicExponent) + throws InvalidKeyException; /** * Imports a public-key BLOB. */ - private native RSAPublicKey importPublicKey(byte[] keyBlob, int keySize); + // used by RSACipher + static native RSAPublicKey importPublicKey(byte[] keyBlob, int keySize) + throws KeyStoreException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java --- a/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -79,22 +79,40 @@ /* * Signature engines */ + // NONEwithRSA must be supplied with a pre-computed message digest. + // Only the following digest algorithms are supported: MD5, SHA-1, + // SHA-256, SHA-384, SHA-512 and a special-purpose digest algorithm + // which is a concatenation of SHA-1 and MD5 digests. + map.put("Signature.NONEwithRSA", + "sun.security.mscapi.RSASignature$Raw"); map.put("Signature.SHA1withRSA", "sun.security.mscapi.RSASignature$SHA1"); + map.put("Signature.SHA256withRSA", + "sun.security.mscapi.RSASignature$SHA256"); + map.put("Signature.SHA384withRSA", + "sun.security.mscapi.RSASignature$SHA384"); + map.put("Signature.SHA512withRSA", + "sun.security.mscapi.RSASignature$SHA512"); map.put("Signature.MD5withRSA", "sun.security.mscapi.RSASignature$MD5"); map.put("Signature.MD2withRSA", "sun.security.mscapi.RSASignature$MD2"); // supported key classes + map.put("Signature.NONEwithRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); map.put("Signature.SHA1withRSA SupportedKeyClasses", "sun.security.mscapi.Key"); + map.put("Signature.SHA256withRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); + map.put("Signature.SHA384withRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); + map.put("Signature.SHA512withRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); map.put("Signature.MD5withRSA SupportedKeyClasses", "sun.security.mscapi.Key"); map.put("Signature.MD2withRSA SupportedKeyClasses", "sun.security.mscapi.Key"); - map.put("Signature.NONEwithRSA SupportedKeyClasses", - "sun.security.mscapi.Key"); /* * Key Pair Generator engines diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/com/sun/management/OperatingSystem_md.c --- a/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -34,9 +34,27 @@ #include <errno.h> #include <stdlib.h> +#include <malloc.h> +#pragma warning (push,0) +#include <windows.h> +#pragma warning (pop) +#include <stdio.h> +#include <time.h> +#include <stdint.h> +#include <assert.h> + +/* Disable warnings due to broken header files from Microsoft... */ +#pragma warning(push, 3) +#include <pdh.h> +#include <pdhmsg.h> +#include <process.h> +#pragma warning(pop) + typedef unsigned __int32 juint; typedef unsigned __int64 julong; +typedef enum boolean_values { false=0, true=1}; + static void set_low(jlong* value, jint low) { *value &= (jlong)0xffffffff << 32; *value |= (jlong)(julong)(juint)low; @@ -56,11 +74,14 @@ static HANDLE main_process; +int perfiInit(void); + JNIEXPORT void JNICALL Java_com_sun_management_OperatingSystem_initialize (JNIEnv *env, jclass cls) { main_process = GetCurrentProcess(); + perfiInit(); } JNIEXPORT jlong JNICALL @@ -132,3 +153,788 @@ GlobalMemoryStatus(&ms); return ms.dwTotalPhys; } + +// Seems WinXP PDH returns PDH_MORE_DATA whenever we send in a NULL buffer. +// Let's just ignore it, since we make sure we have enough buffer anyway. +static int +pdh_fail(PDH_STATUS pdhStat) { + return pdhStat != ERROR_SUCCESS && pdhStat != PDH_MORE_DATA; +} + +// INFO: Using PDH APIs Correctly in a Localized Language (Q287159) +// http://support.microsoft.com/default.aspx?scid=kb;EN-US;q287159 +// The index value for the base system counters and objects like processor, +// process, thread, memory, and so forth are always the same irrespective +// of the localized version of the operating system or service pack installed. +#define PDH_PROCESSOR_IDX ((DWORD) 238) +#define PDH_PROCESSOR_TIME_IDX ((DWORD) 6) +#define PDH_PRIV_PROCESSOR_TIME_IDX ((DWORD) 144) +#define PDH_PROCESS_IDX ((DWORD) 230) +#define PDH_ID_PROCESS_IDX ((DWORD) 784) +#define PDH_CONTEXT_SWITCH_RATE_IDX ((DWORD) 146) +#define PDH_SYSTEM_IDX ((DWORD) 2) +#define PDH_VIRTUAL_BYTES_IDX ((DWORD) 174) + +typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)( + HQUERY hQuery, + LPCSTR szFullCounterPath, + DWORD dwUserData, + HCOUNTER *phCounter + ); +typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)( + LPCWSTR szDataSource, + DWORD dwUserData, + HQUERY *phQuery + ); +typedef DWORD (WINAPI *PdhCloseQueryFunc)( + HQUERY hQuery + ); +typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)( + HQUERY hQuery + ); +typedef DWORD (WINAPI *PdhGetFormattedCounterValueFunc)( + HCOUNTER hCounter, + DWORD dwFormat, + LPDWORD lpdwType, + PPDH_FMT_COUNTERVALUE pValue + ); +typedef PDH_STATUS (WINAPI *PdhEnumObjectItemsFunc)( + LPCTSTR szDataSource, + LPCTSTR szMachineName, + LPCTSTR szObjectName, + LPTSTR mszCounterList, + LPDWORD pcchCounterListLength, + LPTSTR mszInstanceList, + LPDWORD pcchInstanceListLength, + DWORD dwDetailLevel, + DWORD dwFlags + ); +typedef PDH_STATUS (WINAPI *PdhRemoveCounterFunc)( + HCOUNTER hCounter + ); +typedef PDH_STATUS (WINAPI *PdhLookupPerfNameByIndexFunc)( + LPCSTR szMachineName, + DWORD dwNameIndex, + LPSTR szNameBuffer, + LPDWORD pcchNameBufferSize + ); +typedef PDH_STATUS (WINAPI *PdhMakeCounterPathFunc)( + PDH_COUNTER_PATH_ELEMENTS *pCounterPathElements, + LPTSTR szFullPathBuffer, + LPDWORD pcchBufferSize, + DWORD dwFlags + ); + +static PdhAddCounterFunc PdhAddCounter_i; +static PdhOpenQueryFunc PdhOpenQuery_i; +static PdhCloseQueryFunc PdhCloseQuery_i; +static PdhCollectQueryDataFunc PdhCollectQueryData_i; +static PdhGetFormattedCounterValueFunc PdhGetFormattedCounterValue_i; +static PdhEnumObjectItemsFunc PdhEnumObjectItems_i; +static PdhRemoveCounterFunc PdhRemoveCounter_i; +static PdhLookupPerfNameByIndexFunc PdhLookupPerfNameByIndex_i; +static PdhMakeCounterPathFunc PdhMakeCounterPath_i; + +static HANDLE thisProcess; +static double cpuFactor; +static DWORD num_cpus; + +#define FT2JLONG(X) ((((jlong)X.dwHighDateTime) << 32) | ((jlong)X.dwLowDateTime)) +#define COUNTER_BUF_SIZE 256 +// Min time between query updates. +#define MIN_UPDATE_INTERVAL 500 +#define CONFIG_SUCCESSFUL 0 + +/** + * Struct for PDH queries. + */ +typedef struct { + HQUERY query; + uint64_t lastUpdate; // Last time query was updated (current millis). +} UpdateQueryS, *UpdateQueryP; + +/** + * Struct for the processor load counters. + */ +typedef struct { + UpdateQueryS query; + HCOUNTER* counters; + int noOfCounters; +} MultipleCounterQueryS, *MultipleCounterQueryP; + +/** + * Struct for the jvm process load counter. + */ +typedef struct { + UpdateQueryS query; + HCOUNTER counter; +} SingleCounterQueryS, *SingleCounterQueryP; + +static char* getProcessPDHHeader(void); + +/** + * Currently available counters. + */ +static SingleCounterQueryS cntCtxtSwitchRate; +static SingleCounterQueryS cntVirtualSize; +static SingleCounterQueryS cntProcLoad; +static SingleCounterQueryS cntProcSystemLoad; +static MultipleCounterQueryS multiCounterCPULoad; + +static CRITICAL_SECTION processHeaderLock; +static CRITICAL_SECTION initializationLock; + +/** + * Initialize the perf module at startup. + */ +int +perfiInit(void) +{ + InitializeCriticalSection(&processHeaderLock); + InitializeCriticalSection(&initializationLock); + return 0; +} + +/** + * Dynamically sets up function pointers to the PDH library. + * + * @return CONFIG_SUCCESSFUL on success, negative on failure. + */ +static int +get_functions(HMODULE h, char *ebuf, size_t elen) { + // The 'A' at the end means the ANSI (not the UNICODE) vesions of the methods + PdhAddCounter_i = (PdhAddCounterFunc)GetProcAddress(h, "PdhAddCounterA"); + PdhOpenQuery_i = (PdhOpenQueryFunc)GetProcAddress(h, "PdhOpenQueryA"); + PdhCloseQuery_i = (PdhCloseQueryFunc)GetProcAddress(h, "PdhCloseQuery"); + PdhCollectQueryData_i = (PdhCollectQueryDataFunc)GetProcAddress(h, "PdhCollectQueryData"); + PdhGetFormattedCounterValue_i = (PdhGetFormattedCounterValueFunc)GetProcAddress(h, "PdhGetFormattedCounterValue"); + PdhEnumObjectItems_i = (PdhEnumObjectItemsFunc)GetProcAddress(h, "PdhEnumObjectItemsA"); + PdhRemoveCounter_i = (PdhRemoveCounterFunc)GetProcAddress(h, "PdhRemoveCounter"); + PdhLookupPerfNameByIndex_i = (PdhLookupPerfNameByIndexFunc)GetProcAddress(h, "PdhLookupPerfNameByIndexA"); + PdhMakeCounterPath_i = (PdhMakeCounterPathFunc)GetProcAddress(h, "PdhMakeCounterPathA"); + + if (PdhAddCounter_i == NULL || PdhOpenQuery_i == NULL || + PdhCloseQuery_i == NULL || PdhCollectQueryData_i == NULL || + PdhGetFormattedCounterValue_i == NULL || PdhEnumObjectItems_i == NULL || + PdhRemoveCounter_i == NULL || PdhLookupPerfNameByIndex_i == NULL || PdhMakeCounterPath_i == NULL) + { + _snprintf(ebuf, elen, "Required method could not be found."); + return -1; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Returns the counter value as a double for the specified query. + * Will collect the query data and update the counter values as necessary. + * + * @param query the query to update (if needed). + * @param c the counter to read. + * @param value where to store the formatted value. + * @param format the format to use (i.e. PDH_FMT_DOUBLE, PDH_FMT_LONG etc) + * @return CONFIG_SUCCESSFUL if no error + * -1 if PdhCollectQueryData fails + * -2 if PdhGetFormattedCounterValue fails + */ +static int +getPerformanceData(UpdateQueryP query, HCOUNTER c, PDH_FMT_COUNTERVALUE* value, DWORD format) { + clock_t now; + now = clock(); + + // Need to limit how often we update the query + // to mimise the heisenberg effect. + // (PDH behaves erratically if the counters are + // queried too often, especially counters that + // store and use values from two consecutive updates, + // like cpu load.) + if (now - query->lastUpdate > MIN_UPDATE_INTERVAL) { + if (PdhCollectQueryData_i(query->query) != ERROR_SUCCESS) { + return -1; + } + query->lastUpdate = now; + } + + if (PdhGetFormattedCounterValue_i(c, format, NULL, value) != ERROR_SUCCESS) { + return -2; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Places the resolved counter name of the counter at the specified index in the + * supplied buffer. There must be enough space in the buffer to hold the counter name. + * + * @param index the counter index as specified in the registry. + * @param buf the buffer in which to place the counter name. + * @param size the size of the counter name buffer. + * @param ebuf the error message buffer. + * @param elen the length of the error buffer. + * @return CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +find_name(DWORD index, char *buf, DWORD size) { + PDH_STATUS res; + + if ((res = PdhLookupPerfNameByIndex_i(NULL, index, buf, &size)) != ERROR_SUCCESS) { + + /* printf("Could not open counter %d: error=0x%08x", index, res); */ + /* if (res == PDH_CSTATUS_NO_MACHINE) { */ + /* printf("User probably does not have sufficient privileges to use"); */ + /* printf("performance counters. If you are running on Windows 2003"); */ + /* printf("or Windows Vista, make sure the user is in the"); */ + /* printf("Performance Logs user group."); */ + /* } */ + return -1; + } + + if (size == 0) { + /* printf("Failed to get counter name for %d: empty string", index); */ + return -1; + } + + // windows vista does not null-terminate the string (allthough the docs says it will) + buf[size - 1] = '\0'; + return CONFIG_SUCCESSFUL; +} + +/** + * Sets up the supplied SingleCounterQuery to listen for the specified counter. + * initPDH() must have been run prior to calling this function! + * + * @param counterQuery the counter query to set up. + * @param counterString the string specifying the path to the counter. + * @param ebuf the error buffer. + * @param elen the length of the error buffer. + * @returns CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +initSingleCounterQuery(SingleCounterQueryP counterQuery, char *counterString) { + if (PdhOpenQuery_i(NULL, 0, &counterQuery->query.query) != ERROR_SUCCESS) { + /* printf("Could not open query for %s", counterString); */ + return -1; + } + if (PdhAddCounter_i(counterQuery->query.query, counterString, 0, &counterQuery->counter) != ERROR_SUCCESS) { + /* printf("Could not add counter %s for query", counterString); */ + if (counterQuery->counter != NULL) { + PdhRemoveCounter_i(counterQuery->counter); + } + if (counterQuery->query.query != NULL) { + PdhCloseQuery_i(counterQuery->query.query); + } + memset(counterQuery, 0, sizeof(SingleCounterQueryS)); + return -1; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Sets up the supplied SingleCounterQuery to listen for the time spent + * by the HotSpot process. + * + * @param counterQuery the counter query to set up as a process counter. + * @param ebuf the error buffer. + * @param elen the length of the error buffer. + * @returns CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +initProcLoadCounter(void) { + char time[COUNTER_BUF_SIZE]; + char counter[COUNTER_BUF_SIZE*2]; + + if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) { + return -1; + } + _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time); + return initSingleCounterQuery(&cntProcLoad, counter); +} + +static int +initProcSystemLoadCounter(void) { + char time[COUNTER_BUF_SIZE]; + char counter[COUNTER_BUF_SIZE*2]; + + if (find_name(PDH_PRIV_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) { + return -1; + } + _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time); + return initSingleCounterQuery(&cntProcSystemLoad, counter); +} + +/** + * Sets up the supplied MultipleCounterQuery to check on the processors. + * (Comment: Refactor and prettify as with the the SingleCounter queries + * if more MultipleCounterQueries are discovered.) + * + * initPDH() must have been run prior to calling this function. + * + * @param multiQuery a pointer to a MultipleCounterQueryS, will be filled in with + * the necessary info to check the PDH processor counters. + * @return CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +initProcessorCounters(void) { + char processor[COUNTER_BUF_SIZE]; //'Processor' == #238 + char time[COUNTER_BUF_SIZE]; //'Time' == 6 + DWORD c_size, i_size; + HQUERY tmpQuery; + DWORD i, p_count; + BOOL error; + char *instances, *tmp; + PDH_STATUS pdhStat; + + c_size = i_size = 0; + tmpQuery = NULL; + error = false; + + // This __try / __except stuff is there since Windows 2000 beta (or so) sometimes triggered + // an access violation when the user had insufficient privileges to use the performance + // counters. This was previously guarded by a very ugly piece of code which disabled the + // global trap handling in JRockit. Don't know if this really is needed anymore, but otoh, + // if we keep it we don't crash on Win2k beta. /Ihse, 2005-05-30 + __try { + if (find_name(PDH_PROCESSOR_IDX, processor, sizeof(processor)-1) < 0) { + return -1; + } + } __except (EXCEPTION_EXECUTE_HANDLER) { // We'll catch all exceptions here. + /* printf("User does not have sufficient privileges to use performance counters"); */ + return -1; + } + + if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) { + return -1; + } + //ok, now we have enough to enumerate all processors. + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processor, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + NULL, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + if (pdh_fail(pdhStat)) { + /* printf("could not enumerate processors (1) error=%d", pdhStat); */ + return -1; + } + + // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will) + instances = calloc(i_size, 1); + if (instances == NULL) { + /* printf("could not allocate memory (1) %d bytes", i_size); */ + error = true; + goto end; + } + + c_size = 0; + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processor, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + instances, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + + if (pdh_fail(pdhStat)) { + /* printf("could not enumerate processors (2) error=%d", pdhStat); */ + error = true; + goto end; + } + //count perf count instances. + for (p_count = 0, tmp = instances; *tmp != 0; tmp = &tmp[lstrlen(tmp)+1], p_count++); + + //is this correct for HT? + assert(p_count == num_cpus+1); + + //ok, have number of perf counters. + multiCounterCPULoad.counters = calloc(p_count, sizeof(HCOUNTER)); + if (multiCounterCPULoad.counters == NULL) { + /* printf("could not allocate memory (2) count=%d", p_count); */ + error = true; + goto end; + } + + multiCounterCPULoad.noOfCounters = p_count; + + if (PdhOpenQuery_i(NULL, 0, &multiCounterCPULoad.query.query) != ERROR_SUCCESS) { + /* printf("could not create query"); */ + error = true; + goto end; + } + //now, fetch the counters. + for (i = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[lstrlen(tmp)+1], i++) { + char counter[2*COUNTER_BUF_SIZE]; + + _snprintf(counter, sizeof(counter)-1, "\\%s(%s)\\%s", processor, tmp, time); + + if (PdhAddCounter_i(multiCounterCPULoad.query.query, counter, 0, &multiCounterCPULoad.counters[i]) != ERROR_SUCCESS) { + /* printf("error adding processor counter %s", counter); */ + error = true; + goto end; + } + } + + free(instances); + instances = NULL; + + // Query once to initialize the counters needing at least two queries + // (like the % CPU usage) to calculate correctly. + if (PdhCollectQueryData_i(multiCounterCPULoad.query.query) != ERROR_SUCCESS) + error = true; + + end: + if (instances != NULL) { + free(instances); + } + if (tmpQuery != NULL) { + PdhCloseQuery_i(tmpQuery); + } + if (error) { + int i; + + if (multiCounterCPULoad.counters != NULL) { + for (i = 0; i < multiCounterCPULoad.noOfCounters; i++) { + if (multiCounterCPULoad.counters[i] != NULL) { + PdhRemoveCounter_i(multiCounterCPULoad.counters[i]); + } + } + free(multiCounterCPULoad.counters[i]); + } + if (multiCounterCPULoad.query.query != NULL) { + PdhCloseQuery_i(multiCounterCPULoad.query.query); + } + memset(&multiCounterCPULoad, 0, sizeof(MultipleCounterQueryS)); + return -1; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Help function that initializes the PDH process header for the JRockit process. + * (You should probably use getProcessPDHHeader() instead!) + * + * initPDH() must have been run prior to calling this function. + * + * @param ebuf the error buffer. + * @param elen the length of the error buffer. + * + * @return the PDH instance description corresponding to the JVM process. + */ +static char* +initProcessPDHHeader(void) { + static char hotspotheader[2*COUNTER_BUF_SIZE]; + + char counter[2*COUNTER_BUF_SIZE]; + char processes[COUNTER_BUF_SIZE]; //'Process' == #230 + char pid[COUNTER_BUF_SIZE]; //'ID Process' == 784 + char module_name[MAX_PATH]; + PDH_STATUS pdhStat; + DWORD c_size = 0, i_size = 0; + HQUERY tmpQuery = NULL; + int i, myPid = _getpid(); + BOOL error = false; + char *instances, *tmp, *instance_name, *dot_pos; + + tmpQuery = NULL; + myPid = _getpid(); + error = false; + + if (find_name(PDH_PROCESS_IDX, processes, sizeof(processes) - 1) < 0) { + return NULL; + } + + if (find_name(PDH_ID_PROCESS_IDX, pid, sizeof(pid) - 1) < 0) { + return NULL; + } + //time is same. + + c_size = 0; + i_size = 0; + + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processes, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + NULL, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + + //ok, now we have enough to enumerate all processes + if (pdh_fail(pdhStat)) { + /* printf("Could not enumerate processes (1) error=%d", pdhStat); */ + return NULL; + } + + // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will) + if ((instances = calloc(i_size, 1)) == NULL) { + /* printf("Could not allocate memory %d bytes", i_size); */ + error = true; + goto end; + } + + c_size = 0; + + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processes, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + instances, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + + // ok, now we have enough to enumerate all processes + if (pdh_fail(pdhStat)) { + /* printf("Could not enumerate processes (2) error=%d", pdhStat); */ + error = true; + goto end; + } + + if (PdhOpenQuery_i(NULL, 0, &tmpQuery) != ERROR_SUCCESS) { + /* printf("Could not create temporary query"); */ + error = true; + goto end; + } + + // Find our module name and use it to extract the instance name used by PDH + if (GetModuleFileName(NULL, module_name, MAX_PATH) >= MAX_PATH-1) { + /* printf("Module name truncated"); */ + error = true; + goto end; + } + instance_name = strrchr(module_name, '\\'); //drop path + instance_name++; //skip slash + dot_pos = strchr(instance_name, '.'); //drop .exe + dot_pos[0] = '\0'; + + //now, fetch the counters. + for (tmp = instances; *tmp != 0 && !error; tmp = &tmp[lstrlen(tmp)+1]) { + HCOUNTER hc = NULL; + BOOL done = false; + + // Skip until we find our own process name + if (strcmp(tmp, instance_name) != 0) { + continue; + } + + // iterate over all instance indexes and try to find our own pid + for (i = 0; !done && !error; i++){ + PDH_STATUS res; + _snprintf(counter, sizeof(counter)-1, "\\%s(%s#%d)\\%s", processes, tmp, i, pid); + + if (PdhAddCounter_i(tmpQuery, counter, 0, &hc) != ERROR_SUCCESS) { + /* printf("Failed to create process id query"); */ + error = true; + goto end; + } + + res = PdhCollectQueryData_i(tmpQuery); + + if (res == PDH_INVALID_HANDLE) { + /* printf("Failed to query process id"); */ + res = -1; + done = true; + } else if (res == PDH_NO_DATA) { + done = true; + } else { + PDH_FMT_COUNTERVALUE cv; + + PdhGetFormattedCounterValue_i(hc, PDH_FMT_LONG, NULL, &cv); + /* + * This check seems to be needed for Win2k SMP boxes, since + * they for some reason don't return PDH_NO_DATA for non existing + * counters. + */ + if (cv.CStatus != PDH_CSTATUS_VALID_DATA) { + done = true; + } else if (cv.longValue == myPid) { + _snprintf(hotspotheader, sizeof(hotspotheader)-1, "\\%s(%s#%d)\0", processes, tmp, i); + PdhRemoveCounter_i(hc); + goto end; + } + } + PdhRemoveCounter_i(hc); + } + } + end: + if (instances != NULL) { + free(instances); + } + if (tmpQuery != NULL) { + PdhCloseQuery_i(tmpQuery); + } + if (error) { + return NULL; + } + return hotspotheader; +} + +/** + * Returns the PDH string prefix identifying the HotSpot process. Use this prefix when getting + * counters from the PDH process object representing HotSpot. + * + * Note: this call may take some time to complete. + * + * @param ebuf error buffer. + * @param elen error buffer length. + * + * @return the header to be used when retrieving PDH counters from the HotSpot process. + * Will return NULL if the call failed. + */ +static char * +getProcessPDHHeader(void) { + static char *processHeader = NULL; + + EnterCriticalSection(&processHeaderLock); { + if (processHeader == NULL) { + processHeader = initProcessPDHHeader(); + } + } LeaveCriticalSection(&processHeaderLock); + return processHeader; +} + +int perfInit(void); + +double +perfGetCPULoad(int which) +{ + PDH_FMT_COUNTERVALUE cv; + HCOUNTER c; + + if (perfInit() < 0) { + // warn? + return -1.0; + } + + if (multiCounterCPULoad.query.query == NULL) { + // warn? + return -1.0; + } + + if (which == -1) { + c = multiCounterCPULoad.counters[multiCounterCPULoad.noOfCounters - 1]; + } else { + if (which < multiCounterCPULoad.noOfCounters) { + c = multiCounterCPULoad.counters[which]; + } else { + return -1.0; + } + } + if (getPerformanceData(&multiCounterCPULoad.query, c, &cv, PDH_FMT_DOUBLE ) == CONFIG_SUCCESSFUL) { + return cv.doubleValue / 100; + } + return -1.0; +} + +double +perfGetProcessLoad(void) +{ + PDH_FMT_COUNTERVALUE cv; + + if (perfInit() < 0) { + // warn? + return -1.0; + } + + if (cntProcLoad.query.query == NULL) { + // warn? + return -1.0; + } + + if (getPerformanceData(&cntProcLoad.query, cntProcLoad.counter, &cv, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100) == CONFIG_SUCCESSFUL) { + double d = cv.doubleValue / cpuFactor; + d = min(1, d); + d = max(0, d); + return d; + } + return -1.0; +} + +/** + * Helper to initialize the PDH library. Loads the library and sets up the functions. + * Note that once loaded, we will never unload the PDH library. + * + * @return CONFIG_SUCCESSFUL if successful, negative on failure. + */ +int +perfInit(void) { + static HMODULE h; + static BOOL running, inited; + + int error; + + if (running) { + return CONFIG_SUCCESSFUL; + } + + error = CONFIG_SUCCESSFUL; + + // this is double checked locking again, but we try to bypass the worst by + // implicit membar at end of lock. + EnterCriticalSection(&initializationLock); { + if (!inited) { + char buf[64] = ""; + SYSTEM_INFO si; + + // CMH. But windows will not care about our affinity when giving + // us measurements. Need the real, raw num cpus. + + GetSystemInfo(&si); + num_cpus = si.dwNumberOfProcessors; + // Initialize the denominator for the jvm load calculations + cpuFactor = num_cpus * 100; + + /** + * Do this dynamically, so we don't fail to start on systems without pdh. + */ + if ((h = LoadLibrary("pdh.dll")) == NULL) { + /* printf("Could not load pdh.dll (%d)", GetLastError()); */ + error = -2; + } else if (get_functions(h, buf, sizeof(buf)) < 0) { + FreeLibrary(h); + h = NULL; + error = -2; + /* printf("Failed to init pdh functions: %s.\n", buf); */ + } else { + if (initProcessorCounters() != 0) { + /* printf("Failed to init system load counters.\n"); */ + } else if (initProcLoadCounter() != 0) { + /* printf("Failed to init process load counter.\n"); */ + } else if (initProcSystemLoadCounter() != 0) { + /* printf("Failed to init process system load counter.\n"); */ + } else { + inited = true; + } + } + } + } LeaveCriticalSection(&initializationLock); + + if (inited && error == CONFIG_SUCCESSFUL) { + running = true; + } + + return error; +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_OperatingSystem_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + return perfGetCPULoad(-1); +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_OperatingSystem_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + return perfGetProcessLoad(); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp --- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp Sat May 14 11:52:15 2011 -0700 @@ -187,6 +187,7 @@ } JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); + RETURN_IF_NULL(env); pMgr = D3DPipelineManager::GetInstance(); RETURN_IF_NULL(pMgr); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/security/mscapi/security.cpp --- a/jdk/src/windows/native/sun/security/mscapi/security.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/security/mscapi/security.cpp Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -40,6 +40,8 @@ #define CERTIFICATE_PARSING_EXCEPTION \ "java/security/cert/CertificateParsingException" +#define INVALID_KEY_EXCEPTION \ + "java/security/InvalidKeyException" #define KEY_EXCEPTION "java/security/KeyException" #define KEYSTORE_EXCEPTION "java/security/KeyStoreException" #define PROVIDER_EXCEPTION "java/security/ProviderException" @@ -79,6 +81,8 @@ (strcmp("SHA-1", pszHashAlgorithm) == 0)) { algId = CALG_SHA1; + } else if (strcmp("SHA1+MD5", pszHashAlgorithm) == 0) { + algId = CALG_SSL3_SHAMD5; // a 36-byte concatenation of SHA-1 and MD5 } else if (strcmp("SHA-256", pszHashAlgorithm) == 0) { algId = CALG_SHA_256; } else if (strcmp("SHA-384", pszHashAlgorithm) == 0) { @@ -471,16 +475,18 @@ /* * Class: sun_security_mscapi_RSASignature * Method: signHash - * Signature: ([BILjava/lang/String;JJ)[B + * Signature: (Z[BILjava/lang/String;JJ)[B */ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSASignature_signHash - (JNIEnv *env, jclass clazz, jbyteArray jHash, jint jHashSize, - jstring jHashAlgorithm, jlong hCryptProv, jlong hCryptKey) + (JNIEnv *env, jclass clazz, jboolean noHashOID, jbyteArray jHash, + jint jHashSize, jstring jHashAlgorithm, jlong hCryptProv, + jlong hCryptKey) { HCRYPTHASH hHash = NULL; jbyte* pHashBuffer = NULL; jbyte* pSignedHashBuffer = NULL; jbyteArray jSignedHash = NULL; + HCRYPTPROV hCryptProvAlt = NULL; __try { @@ -490,8 +496,32 @@ // Acquire a hash object handle. if (::CryptCreateHash(HCRYPTPROV(hCryptProv), algId, 0, 0, &hHash) == FALSE) { - ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); - __leave; + // Failover to using the PROV_RSA_AES CSP + + DWORD cbData = 256; + BYTE pbData[256]; + pbData[0] = '\0'; + + // Get name of the key container + ::CryptGetProvParam((HCRYPTPROV)hCryptProv, PP_CONTAINER, + (BYTE *)pbData, &cbData, 0); + + // Acquire an alternative CSP handle + if (::CryptAcquireContext(&hCryptProvAlt, LPCSTR(pbData), NULL, + PROV_RSA_AES, 0) == FALSE) + { + + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } + + // Acquire a hash object handle. + if (::CryptCreateHash(HCRYPTPROV(hCryptProvAlt), algId, 0, 0, + &hHash) == FALSE) + { + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } } // Copy hash from Java to native buffer @@ -521,14 +551,20 @@ // Determine size of buffer DWORD dwBufLen = 0; - if (::CryptSignHash(hHash, dwKeySpec, NULL, NULL, NULL, &dwBufLen) == FALSE) + DWORD dwFlags = 0; + + if (noHashOID == JNI_TRUE) { + dwFlags = CRYPT_NOHASHOID; // omit hash OID in NONEwithRSA signature + } + + if (::CryptSignHash(hHash, dwKeySpec, NULL, dwFlags, NULL, &dwBufLen) == FALSE) { ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); __leave; } pSignedHashBuffer = new jbyte[dwBufLen]; - if (::CryptSignHash(hHash, dwKeySpec, NULL, NULL, (BYTE*)pSignedHashBuffer, &dwBufLen) == FALSE) + if (::CryptSignHash(hHash, dwKeySpec, NULL, dwFlags, (BYTE*)pSignedHashBuffer, &dwBufLen) == FALSE) { ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); __leave; @@ -544,6 +580,9 @@ } __finally { + if (hCryptProvAlt) + ::CryptReleaseContext(hCryptProvAlt, 0); + if (pSignedHashBuffer) delete [] pSignedHashBuffer; @@ -572,6 +611,7 @@ jbyte* pSignedHashBuffer = NULL; DWORD dwSignedHashBufferLen = jSignedHashSize; jboolean result = JNI_FALSE; + HCRYPTPROV hCryptProvAlt = NULL; __try { @@ -582,8 +622,32 @@ if (::CryptCreateHash(HCRYPTPROV(hCryptProv), algId, 0, 0, &hHash) == FALSE) { - ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); - __leave; + // Failover to using the PROV_RSA_AES CSP + + DWORD cbData = 256; + BYTE pbData[256]; + pbData[0] = '\0'; + + // Get name of the key container + ::CryptGetProvParam((HCRYPTPROV)hCryptProv, PP_CONTAINER, + (BYTE *)pbData, &cbData, 0); + + // Acquire an alternative CSP handle + if (::CryptAcquireContext(&hCryptProvAlt, LPCSTR(pbData), NULL, + PROV_RSA_AES, 0) == FALSE) + { + + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } + + // Acquire a hash object handle. + if (::CryptCreateHash(HCRYPTPROV(hCryptProvAlt), algId, 0, 0, + &hHash) == FALSE) + { + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } } // Copy hash and signedHash from Java to native buffer @@ -614,6 +678,9 @@ __finally { + if (hCryptProvAlt) + ::CryptReleaseContext(hCryptProvAlt, 0); + if (pSignedHashBuffer) delete [] pSignedHashBuffer; @@ -646,15 +713,27 @@ pszKeyContainerName = env->GetStringUTFChars(keyContainerName, NULL); // Acquire a CSP context (create a new key container). + // Prefer a PROV_RSA_AES CSP, when available, due to its support + // for SHA-2-based signatures. if (::CryptAcquireContext( &hCryptProv, pszKeyContainerName, NULL, - PROV_RSA_FULL, + PROV_RSA_AES, CRYPT_NEWKEYSET) == FALSE) { - ThrowException(env, KEY_EXCEPTION, GetLastError()); - __leave; + // Failover to using the default CSP (PROV_RSA_FULL) + + if (::CryptAcquireContext( + &hCryptProv, + pszKeyContainerName, + NULL, + PROV_RSA_FULL, + CRYPT_NEWKEYSET) == FALSE) + { + ThrowException(env, KEY_EXCEPTION, GetLastError()); + __leave; + } } // Generate an RSA keypair @@ -1398,7 +1477,7 @@ jbyteArray blob = NULL; DWORD dwBlobLen; - BYTE* pbKeyBlob; + BYTE* pbKeyBlob = NULL; __try { @@ -1656,7 +1735,7 @@ // Sanity check jsize jPublicExponentLength = env->GetArrayLength(jPublicExponent); if (jPublicExponentLength > sizeof(pRsaPubKey->pubexp)) { - ThrowException(env, KEY_EXCEPTION, NTE_BAD_TYPE); + ThrowException(env, INVALID_KEY_EXCEPTION, NTE_BAD_TYPE); __leave; } // The length argument must be the smaller of jPublicExponentLength @@ -1847,15 +1926,27 @@ pbKeyBlob = (BYTE *) env->GetByteArrayElements(keyBlob, 0); // Acquire a CSP context (create a new key container). + // Prefer a PROV_RSA_AES CSP, when available, due to its support + // for SHA-2-based signatures. if (::CryptAcquireContext( &hCryptProv, NULL, NULL, - PROV_RSA_FULL, + PROV_RSA_AES, CRYPT_VERIFYCONTEXT) == FALSE) { - ThrowException(env, KEYSTORE_EXCEPTION, GetLastError()); - __leave; + // Failover to using the default CSP (PROV_RSA_FULL) + + if (::CryptAcquireContext( + &hCryptProv, + NULL, + NULL, + PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT) == FALSE) + { + ThrowException(env, KEYSTORE_EXCEPTION, GetLastError()); + __leave; + } } // Import the public key diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/ObjectList.cpp --- a/jdk/src/windows/native/sun/windows/ObjectList.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/ObjectList.cpp Sat May 14 11:52:15 2011 -0700 @@ -48,7 +48,7 @@ m_head = item; } -void AwtObjectList::Remove(AwtObject* obj) +BOOL AwtObjectList::Remove(AwtObject* obj) { CriticalSection::Lock l(m_lock); @@ -64,11 +64,14 @@ } DASSERT(item != NULL); delete item; - return; + return TRUE; } lastItem = item; item = item->next; } + + return FALSE; + // DASSERT(FALSE); // should never get here... // even if it does it shouldn't be fatal. } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/ObjectList.h --- a/jdk/src/windows/native/sun/windows/ObjectList.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/ObjectList.h Sat May 14 11:52:15 2011 -0700 @@ -46,7 +46,7 @@ AwtObjectList(); void Add(AwtObject* obj); - void Remove(AwtObject* obj); + BOOL Remove(AwtObject* obj); #ifdef DEBUG /* Used for sanity checks only. */ AwtObject* LookUp(AwtObject* obj); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Clipboard.cpp --- a/jdk/src/windows/native/sun/windows/awt_Clipboard.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Clipboard.cpp Sat May 14 11:52:15 2011 -0700 @@ -294,7 +294,7 @@ if (format == CF_HDROP) { DROPFILES *dropfiles = (DROPFILES *)dataout; dropfiles->pFiles = sizeof(DROPFILES); - dropfiles->fWide = FALSE; // good guess! + dropfiles->fWide = TRUE; // we publish only Unicode dataout += sizeof(DROPFILES); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Component.cpp --- a/jdk/src/windows/native/sun/windows/awt_Component.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp Sat May 14 11:52:15 2011 -0700 @@ -549,8 +549,6 @@ m_hwnd = hwnd; - ImmAssociateContext(NULL); - SetDrawState((jint)JAWT_LOCK_SURFACE_CHANGED | (jint)JAWT_LOCK_BOUNDS_CHANGED | (jint)JAWT_LOCK_CLIP_CHANGED); @@ -1203,7 +1201,7 @@ WIN_MSG(WM_IME_COMPOSITIONFULL) WIN_MSG(WM_IME_SELECT) WIN_MSG(WM_IME_CHAR) - FMT_MSG(0x0288, "WM_IME_REQUEST") + FMT_MSG(WM_IME_REQUEST) WIN_MSG(WM_IME_KEYDOWN) WIN_MSG(WM_IME_KEYUP) FMT_MSG(0x02A1, "WM_MOUSEHOVER") @@ -1733,7 +1731,7 @@ case WM_IME_SELECT: case WM_IME_KEYUP: case WM_IME_KEYDOWN: - case 0x0288: // WM_IME_REQUEST + case WM_IME_REQUEST: CallProxyDefWindowProc(message, wParam, lParam, retValue, mr); break; case WM_CHAR: @@ -1969,7 +1967,9 @@ { // fix for 6259348: we should enter the SyncCall critical section before // disposing the native object, that is value 1 of lParam is intended for - AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)this, (LPARAM)1); + if(m_peerObject != NULL) { // is not being terminating + AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)m_peerObject, (LPARAM)1); + } return mrConsume; } @@ -2020,25 +2020,6 @@ MsgRouting AwtComponent::WmShowWindow(BOOL show, UINT status) { - // NULL-InputContext is associated to all window just after they created. - // ( see CreateHWnd() ) - // But to TextField and TextArea on Win95, valid InputContext is associated - // by system after that. This is not happen on NT4.0 - // For workaround, force context to NULL here. - - // Fix for 4730228 - // Check if we already have Java-associated input method - HIMC context = 0; - if (m_InputMethod != NULL) { - // If so get the appropriate context from it and use it instead of empty context - JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - context = (HIMC)(UINT_PTR)(JNU_GetFieldByName(env, NULL, m_InputMethod, "context", "I").i); - } - - if (ImmGetContext() != 0 && ImmGetContext() != context) { - ImmAssociateContext(context); - } - return mrDoDefault; } @@ -4655,10 +4636,6 @@ ret: if (c && ::IsWindow(c->GetHWnd())) { sm_focusOwner = c->GetHWnd(); - AwtFrame *owner = (AwtFrame*)GetComponent(c->GetProxyToplevelContainer()); - if (owner) { - owner->SetLastProxiedFocusOwner(sm_focusOwner); - } } else { sm_focusOwner = NULL; } @@ -6534,8 +6511,7 @@ { TRY_NO_HANG; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_DnDDS.cpp --- a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Sat May 14 11:52:15 2011 -0700 @@ -843,7 +843,7 @@ dropfiles->pt.x = m_dropPoint.x; dropfiles->pt.y = m_dropPoint.y; dropfiles->fNC = m_fNC; - dropfiles->fWide = TRUE; // good guess! + dropfiles->fWide = TRUE; // we publish only Unicode dataout += sizeof(DROPFILES); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Frame.cpp --- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp Sat May 14 11:52:15 2011 -0700 @@ -109,7 +109,7 @@ m_isMenuDropped = FALSE; m_isInputMethodWindow = FALSE; m_isUndecorated = FALSE; - m_lastProxiedFocusOwner = NULL; + m_imeTargetComponent = NULL; m_actualFocusedWindow = NULL; m_iconic = FALSE; m_zoomed = FALSE; @@ -311,6 +311,8 @@ LRESULT retValue = 0L; AwtComponent *focusOwner = NULL; + AwtComponent *imeTargetComponent = NULL; + // IME and input language related messages need to be sent to a window // which has the Java input focus switch (message) { @@ -323,15 +325,29 @@ case WM_IME_COMPOSITIONFULL: case WM_IME_SELECT: case WM_IME_CHAR: - case 0x0288: // WM_IME_REQUEST + case WM_IME_REQUEST: case WM_IME_KEYDOWN: case WM_IME_KEYUP: case WM_INPUTLANGCHANGEREQUEST: case WM_INPUTLANGCHANGE: + if (message == WM_IME_STARTCOMPOSITION) { + SetImeTargetComponent(sm_focusOwner); + } + imeTargetComponent = AwtComponent::GetComponent(GetImeTargetComponent()); + if (imeTargetComponent != NULL && + imeTargetComponent != this) // avoid recursive calls + { + retValue = imeTargetComponent->WindowProc(message, wParam, lParam); + mr = mrConsume; + } + if (message == WM_IME_ENDCOMPOSITION) { + SetImeTargetComponent(NULL); + } + break; // TODO: when a Choice's list is dropped down and we're scrolling in // the list WM_MOUSEWHEEL messages come to the poxy, not to the list. Why? case WM_MOUSEWHEEL: - focusOwner = AwtComponent::GetComponent(GetLastProxiedFocusOwner()); + focusOwner = AwtComponent::GetComponent(sm_focusOwner); if (focusOwner != NULL && focusOwner != this) // avoid recursive calls { @@ -340,12 +356,16 @@ } break; case WM_SETFOCUS: + if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain + if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) { AwtSetActiveWindow(); } mr = mrConsume; break; case WM_KILLFOCUS: + if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain + if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) { AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Frame.h --- a/jdk/src/windows/native/sun/windows/awt_Frame.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Frame.h Sat May 14 11:52:15 2011 -0700 @@ -150,8 +150,8 @@ void CheckRetainActualFocusedWindow(HWND activatedOpositeHWnd); BOOL CheckActivateActualFocusedWindow(HWND deactivatedOpositeHWnd); - INLINE HWND GetLastProxiedFocusOwner() { return m_lastProxiedFocusOwner; } - INLINE void SetLastProxiedFocusOwner(HWND hwnd) { m_lastProxiedFocusOwner = hwnd; } + INLINE HWND GetImeTargetComponent() { return m_imeTargetComponent; } + INLINE void SetImeTargetComponent(HWND hwnd) { m_imeTargetComponent = hwnd; } protected: /* The frame is undecorated. */ @@ -179,9 +179,8 @@ /* The frame is an InputMethodWindow */ BOOL m_isInputMethodWindow; - /* Retains the last/current sm_focusOwner proxied. Actually, it should be - * a component of an owned window last/currently active. */ - HWND m_lastProxiedFocusOwner; + // retains the target component for the IME messages + HWND m_imeTargetComponent; /* * Fix for 4823903. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_MenuItem.cpp --- a/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp Sat May 14 11:52:15 2011 -0700 @@ -974,8 +974,7 @@ { TRY_NO_HANG; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Object.cpp --- a/jdk/src/windows/native/sun/windows/awt_Object.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Object.cpp Sat May 14 11:52:15 2011 -0700 @@ -60,11 +60,20 @@ void AwtObject::Dispose() { - theAwtObjectList.Remove(this); + AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0); +} + +void AwtObject::_Dispose(jobject self) +{ + TRY_NO_VERIFY; + + CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS()); // value 0 of lParam means that we should not attempt to enter the // SyncCall critical section, as it was entered someshere earlier - AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0); + AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)self, (LPARAM)0); + + CATCH_BAD_ALLOC; } void AwtObject::_Dispose(PDATA pData) @@ -73,14 +82,10 @@ CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS()); - if (pData != NULL) { - AwtObject *o = (AwtObject *)pData; - AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)o, (LPARAM)0); - } + AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSEPDATA, (WPARAM)pData, (LPARAM)0); CATCH_BAD_ALLOC; } - /* * Return the peer associated with some target. This information is * maintained in a hashtable at the java level. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Object.h --- a/jdk/src/windows/native/sun/windows/awt_Object.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Object.h Sat May 14 11:52:15 2011 -0700 @@ -67,6 +67,10 @@ virtual void Dispose(); // Static method to be called from JNI methods to dispose AwtObject + // specified by jobject + static void _Dispose(jobject self); + + // Static method to be called from JNI methods to dispose AwtObject // specified by pData static void _Dispose(PDATA pData); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Robot.cpp --- a/jdk/src/windows/native/sun/windows/awt_Robot.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Robot.cpp Sat May 14 11:52:15 2011 -0700 @@ -353,8 +353,7 @@ { TRY_NO_VERIFY; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_TextComponent.cpp --- a/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Sat May 14 11:52:15 2011 -0700 @@ -191,8 +191,11 @@ { HIMC hIMC = ImmGetContext(); // rc is not used for text component. - COMPOSITIONFORM cf = { CFS_POINT, {0,0}, {0,0,0,0} }; + COMPOSITIONFORM cf = { CFS_FORCE_POSITION, {0,0}, {0,0,0,0} }; GetCaretPos(&(cf.ptCurrentPos)); + // the proxy is the native focus owner and it contains the composition window + // let's convert the position to a coordinate space relative to proxy + ::MapWindowPoints(GetHWnd(), GetProxyFocusOwner(), (LPPOINT)&cf.ptCurrentPos, 1); ImmSetCompositionWindow(hIMC, &cf); LOGFONT lf; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Toolkit.cpp --- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Sat May 14 11:52:15 2011 -0700 @@ -740,18 +740,34 @@ canDispose = syncCS.TryEnter(); } if (canDispose) { - AwtObject *o = (AwtObject *)wParam; - o->Dispose(); - if (shouldEnterCriticalSection) { - syncCS.Leave(); + if(wParam != NULL) { + AwtObject *o = (AwtObject *) JNI_GET_PDATA((jobject)wParam); + if(o != NULL && theAwtObjectList.Remove(o)) { + o->Dispose(); + } + if (shouldEnterCriticalSection) { + syncCS.Leave(); + } } } else { AwtToolkit::GetInstance().PostMessage(WM_AWT_DISPOSE, wParam, lParam); } return 0; } + case WM_AWT_DISPOSEPDATA: { + /* + * NOTE: synchronization routine (like in WM_AWT_DISPOSE) was omitted because + * this handler is called ONLY while disposing Cursor and Font objects where + * synchronization takes place. + */ + AwtObject *o = (AwtObject *) wParam; + if(o != NULL && theAwtObjectList.Remove(o)) { + o->Dispose(); + } + return 0; + } case WM_AWT_DELETEOBJECT: { - AwtObject *p = (AwtObject *)wParam; + AwtObject *p = (AwtObject *) wParam; if (p->CanBeDeleted()) { // all the messages for this component are processed, so // it can be deleted diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp --- a/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Sat May 14 11:52:15 2011 -0700 @@ -926,8 +926,7 @@ { TRY; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awtmsg.h --- a/jdk/src/windows/native/sun/windows/awtmsg.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awtmsg.h Sat May 14 11:52:15 2011 -0700 @@ -219,6 +219,7 @@ WM_AWT_ENDCOMPOSITION, WM_AWT_DISPOSE, + WM_AWT_DISPOSEPDATA, WM_AWT_DELETEOBJECT, WM_AWT_SETCONVERSIONSTATUS, WM_AWT_GETCONVERSIONSTATUS, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011, 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 7028071 + * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad() + * + * @run main GetProcessCpuLoad + */ + +import java.lang.management.*; +import com.sun.management.OperatingSystemMXBean; + +public class GetProcessCpuLoad { + public static void main(String[] argv) throws Exception { + OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean) + ManagementFactory.getOperatingSystemMXBean(); + double load; + for(int i=0; i<10; i++) { + load = mbean.getProcessCpuLoad(); + if((load<0.0 || load>1.0) && load != -1.0) { + throw new RuntimeException("getProcessCpuLoad() returns " + load + + " which is not in the [0.0,1.0] interval"); + } + try { + Thread.sleep(200); + } catch(InterruptedException e) { + e.printStackTrace(); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011, 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 7028071 + * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad() + * + * @run main GetSystemCpuLoad + */ + +import java.lang.management.*; +import com.sun.management.OperatingSystemMXBean; + +public class GetSystemCpuLoad { + public static void main(String[] argv) throws Exception { + OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean) + ManagementFactory.getOperatingSystemMXBean(); + double load; + for(int i=0; i<10; i++) { + load = mbean.getSystemCpuLoad(); + if((load<0.0 || load>1.0) && load != -1.0) { + throw new RuntimeException("getSystemCpuLoad() returns " + load + + " which is not in the [0.0,1.0] interval"); + } + try { + Thread.sleep(200); + } catch(InterruptedException e) { + e.printStackTrace(); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/Component/Revalidate/Revalidate.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/Component/Revalidate/Revalidate.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2011, 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 7036669 + @summary Test Component.revalidate() method + @author anthony.petrov@oracle.com: area=awt.component + @run main Revalidate +*/ + +import java.awt.*; + +public class Revalidate { + private static Frame frame = new Frame(); + private static Panel panel = new Panel() { + @Override + public boolean isValidateRoot() { + return true; + } + }; + private static Button button = new Button("Test"); + + private static void sleep() { + try { Thread.sleep(500); } catch (Exception e) {} + } + + private static void printState(String str) { + System.out.println(str + " isValid state: "); + System.out.println(" frame: " + frame.isValid()); + System.out.println(" panel: " + panel.isValid()); + System.out.println(" button: " + button.isValid()); + } + + private static void fail(String msg) { + frame.dispose(); + throw new RuntimeException(msg); + } + + private static void check(String n, Component c, boolean v) { + if (c.isValid() != v) { + fail(n + ".isValid() = " + c.isValid() + "; expected: " + v); + } + } + private static void check(String str, boolean f, boolean p, boolean b) { + printState(str); + + check("frame", frame, f); + check("panel", panel, p); + check("button", button, b); + } + + public static void main(String[] args) { + // setup + frame.add(panel); + panel.add(button); + frame.setBounds(200, 200, 300, 200); + frame.setVisible(true); + sleep(); + check("Upon showing", true, true, true); + + button.setBounds(1, 1, 30, 30); + sleep(); + check("button.setBounds():", true, false, false); + + button.revalidate(); + sleep(); + check("button.revalidate():", true, true, true); + + button.setBounds(1, 1, 30, 30); + sleep(); + check("button.setBounds():", true, false, false); + + panel.revalidate(); + sleep(); + // because the panel's validate root is actually OK + check("panel.revalidate():", true, false, false); + + button.revalidate(); + sleep(); + check("button.revalidate():", true, true, true); + + panel.setBounds(2, 2, 125, 130); + sleep(); + check("panel.setBounds():", false, false, true); + + button.revalidate(); + sleep(); + check("button.revalidate():", false, true, true); + + panel.setBounds(3, 3, 152, 121); + sleep(); + check("panel.setBounds():", false, false, true); + + panel.revalidate(); + sleep(); + check("panel.revalidate():", true, true, true); + + // cleanup + frame.dispose(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/List/ScrollOutside/ScrollOut.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/List/ScrollOutside/ScrollOut.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2011 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 7036733 + @summary Regression : NullPointerException when scrolling horizontally on AWT List + @author Andrei Dmitriev area=awt-list + @library ../../regtesthelpers + @build Util + @run main ScrollOut +*/ + +import java.awt.*; +import java.awt.event.*; +import sun.awt.SunToolkit; +import test.java.awt.regtesthelpers.Util; + +public class ScrollOut +{ + public static final void main(String args[]) + { + final Frame frame = new Frame(); + final List list = new List(); + Robot robot = null; + + for (int i = 0; i < 5; i++){ + list.add("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"); + } + + frame.add(list); + + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + try{ + robot = new Robot(); + }catch(AWTException e){ + throw new RuntimeException(e); + } + + //Drag from center to the outside on left + Point from = new Point(list.getLocationOnScreen().x + list.getWidth()/2, + list.getLocationOnScreen().y + list.getHeight()/2); + Point to = new Point(list.getLocationOnScreen().x - 30, + from.y); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + Util.drag(robot, from, to, InputEvent.BUTTON1_MASK); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + //Drag from center to the outside on up + to = new Point(from.x, + list.getLocationOnScreen().y - 50); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + Util.drag(robot, from, to, InputEvent.BUTTON1_MASK); + + }//End init() +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 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 @@ -50,6 +50,11 @@ public class InfiniteRecursion { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; + static int actualEvents = 0; public static void main(String []s) @@ -96,8 +101,10 @@ Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 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 @@ -50,6 +50,9 @@ public class InfiniteRecursion_1 { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; static int actualEvents = 0; public static void main(String []s) @@ -95,8 +98,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -56,6 +56,9 @@ public class InfiniteRecursion_2 extends Applet { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; static int actualEvents = 0; public void init() @@ -107,8 +110,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } }// start() } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 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 @@ -50,6 +50,9 @@ public class InfiniteRecursion_3 extends Applet { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; static int actualEvents = 0; public void init() @@ -91,8 +94,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } }// start() } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,8 @@ public class InfiniteRecursion_4 { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions over a single frame without any siblings + final static int EXPECTED_COUNT = MOVE_COUNT * 2; static int actualEvents = 0; public static void main(String []s) @@ -80,8 +82,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011, 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 6799551 + @library ../../regtesthelpers + @build Util Sysout + @summary Extended key codes for small letters undefined + @author Andrei Dmitriev: area=awt.keyboard + @run main EqualKeyCode +*/ + + +import sun.awt.*; +import java.awt.*; +import test.java.awt.regtesthelpers.Util; +import test.java.awt.regtesthelpers.Sysout; + +public class EqualKeyCode { + + final static String LETTERS = "abcdefghijklmnopqrstuvwxyz"; + + public static void main(String []s) { + for (int i = 0; i < LETTERS.length(); i++){ + char cSmall = LETTERS.charAt(i); + char cLarge = Character.toUpperCase(cSmall); + + int iSmall = ExtendedKeyCodes.getExtendedKeyCodeForChar(cSmall); + int iLarge = ExtendedKeyCodes.getExtendedKeyCodeForChar(cLarge); + + System.out.print(" " + cSmall + ":" + iSmall + " ---- "); + System.out.println(" " + cLarge + " : " + iLarge); + if (ExtendedKeyCodes.getExtendedKeyCodeForChar(cSmall) != + ExtendedKeyCodes.getExtendedKeyCodeForChar(cLarge)) + { + throw new RuntimeException("ExtendedKeyCode doesn't exist or doesn't match between capital and small letters."); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/beans/XMLEncoder/java_io_File.java --- a/jdk/test/java/beans/XMLEncoder/java_io_File.java Wed May 11 16:12:01 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008, 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 6708550 - * @summary Tests File encoding - * @author Sergey Malenkov - */ - -import java.io.File; - -public final class java_io_File extends AbstractTest<File> { - public static void main(String[] args) { - new java_io_File().test(true); - } - - @Override - protected File getObject() { - return new File("test.txt"); // NON-NLS: local file - } - - @Override - protected File getAnotherObject() { - return new File("/pub/demo/"); // NON-NLS: path - } -} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Character/CheckProp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/Character/CheckProp.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2011, 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 7037261 + * @summary Check j.l.Character.isLowerCase/isUppercase/isAlphabetic/isIdeographic + */ + +import java.util.regex.*; +import java.util.*; +import java.io.*; +import static java.lang.Character.*; + +public class CheckProp { + + public static void main(String[] args) throws IOException { + File fPropList = new File(System.getProperty("test.src", "."), "PropList.txt"); + int i, j; + BufferedReader sbfr = new BufferedReader(new FileReader(fPropList)); + Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher(""); + Map<String, ArrayList<Integer>> propMap = new LinkedHashMap<>(); + + String line = null; + int lineNo = 0; + while ((line = sbfr.readLine()) != null) { + lineNo++; + if (line.length() <= 1 || line.charAt(0) == '#') { + continue; + } + m.reset(line); + if (m.matches()) { + int start = Integer.parseInt(m.group(1), 16); + int end = (m.group(2)==null)?start + :Integer.parseInt(m.group(2), 16); + String name = m.group(3); + + ArrayList<Integer> list = propMap.get(name); + if (list == null) { + list = new ArrayList<Integer>(); + propMap.put(name, list); + } + while (start <= end) + list.add(start++); + } else { + System.out.printf("Warning: Unrecognized line %d <%s>%n", lineNo, line); + } + } + sbfr.close(); + //for (String name: propMap.keySet()) { + // System.out.printf("%s %d%n", name, propMap.get(name).size()); + //} + + Integer[] otherLowercase = propMap.get("Other_Lowercase").toArray(new Integer[0]); + Integer[] otherUppercase = propMap.get("Other_Uppercase").toArray(new Integer[0]); + Integer[] otherAlphabetic = propMap.get("Other_Alphabetic").toArray(new Integer[0]); + Integer[] ideographic = propMap.get("Ideographic").toArray(new Integer[0]); + + int fails = 0; + for (int cp = MIN_CODE_POINT; cp < MAX_CODE_POINT; cp++) { + int type = getType(cp); + if (isLowerCase(cp) != + (type == LOWERCASE_LETTER || + Arrays.binarySearch(otherLowercase, cp) >= 0)) + { + fails++; + System.err.printf("Wrong isLowerCase(U+%04x)\n", cp); + } + if (isUpperCase(cp) != + (type == UPPERCASE_LETTER || + Arrays.binarySearch(otherUppercase, cp) >= 0)) + { + fails++; + System.err.printf("Wrong isUpperCase(U+%04x)\n", cp); + } + if (isAlphabetic(cp) != + (type == UPPERCASE_LETTER || type == LOWERCASE_LETTER || + type == TITLECASE_LETTER || type == MODIFIER_LETTER || + type == OTHER_LETTER || type == OTHER_LETTER || + type == LETTER_NUMBER || + Arrays.binarySearch(otherAlphabetic, cp) >=0)) + { + fails++; + System.err.printf("Wrong isAlphabetic(U+%04x)\n", cp); + } + if (isIdeographic(cp) != + (Arrays.binarySearch(ideographic, cp) >= 0)) + { + fails++; + System.err.printf("Wrong isIdeographic(U+%04x)\n", cp); + } + } + if (fails != 0) + throw new RuntimeException("CheckProp failed=" + fails); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Character/PropList.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/Character/PropList.txt Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,1296 @@ +# PropList-6.0.0.txt +# Date: 2010-08-19, 00:48:28 GMT [MD] +# +# Unicode Character Database +# Copyright (c) 1991-2010 Unicode, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# For documentation, see http://www.unicode.org/reports/tr44/ + +# ================================================ + +0009..000D ; White_Space # Cc [5] <control-0009>..<control-000D> +0020 ; White_Space # Zs SPACE +0085 ; White_Space # Cc <control-0085> +00A0 ; White_Space # Zs NO-BREAK SPACE +1680 ; White_Space # Zs OGHAM SPACE MARK +180E ; White_Space # Zs MONGOLIAN VOWEL SEPARATOR +2000..200A ; White_Space # Zs [11] EN QUAD..HAIR SPACE +2028 ; White_Space # Zl LINE SEPARATOR +2029 ; White_Space # Zp PARAGRAPH SEPARATOR +202F ; White_Space # Zs NARROW NO-BREAK SPACE +205F ; White_Space # Zs MEDIUM MATHEMATICAL SPACE +3000 ; White_Space # Zs IDEOGRAPHIC SPACE + +# Total code points: 26 + +# ================================================ + +200E..200F ; Bidi_Control # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK +202A..202E ; Bidi_Control # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE + +# Total code points: 7 + +# ================================================ + +200C..200D ; Join_Control # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER + +# Total code points: 2 + +# ================================================ + +002D ; Dash # Pd HYPHEN-MINUS +058A ; Dash # Pd ARMENIAN HYPHEN +05BE ; Dash # Pd HEBREW PUNCTUATION MAQAF +1400 ; Dash # Pd CANADIAN SYLLABICS HYPHEN +1806 ; Dash # Pd MONGOLIAN TODO SOFT HYPHEN +2010..2015 ; Dash # Pd [6] HYPHEN..HORIZONTAL BAR +2053 ; Dash # Po SWUNG DASH +207B ; Dash # Sm SUPERSCRIPT MINUS +208B ; Dash # Sm SUBSCRIPT MINUS +2212 ; Dash # Sm MINUS SIGN +2E17 ; Dash # Pd DOUBLE OBLIQUE HYPHEN +2E1A ; Dash # Pd HYPHEN WITH DIAERESIS +301C ; Dash # Pd WAVE DASH +3030 ; Dash # Pd WAVY DASH +30A0 ; Dash # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +FE31..FE32 ; Dash # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE58 ; Dash # Pd SMALL EM DASH +FE63 ; Dash # Pd SMALL HYPHEN-MINUS +FF0D ; Dash # Pd FULLWIDTH HYPHEN-MINUS + +# Total code points: 25 + +# ================================================ + +002D ; Hyphen # Pd HYPHEN-MINUS +00AD ; Hyphen # Cf SOFT HYPHEN +058A ; Hyphen # Pd ARMENIAN HYPHEN +1806 ; Hyphen # Pd MONGOLIAN TODO SOFT HYPHEN +2010..2011 ; Hyphen # Pd [2] HYPHEN..NON-BREAKING HYPHEN +2E17 ; Hyphen # Pd DOUBLE OBLIQUE HYPHEN +30FB ; Hyphen # Po KATAKANA MIDDLE DOT +FE63 ; Hyphen # Pd SMALL HYPHEN-MINUS +FF0D ; Hyphen # Pd FULLWIDTH HYPHEN-MINUS +FF65 ; Hyphen # Po HALFWIDTH KATAKANA MIDDLE DOT + +# Total code points: 11 + +# ================================================ + +0022 ; Quotation_Mark # Po QUOTATION MARK +0027 ; Quotation_Mark # Po APOSTROPHE +00AB ; Quotation_Mark # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00BB ; Quotation_Mark # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +2018 ; Quotation_Mark # Pi LEFT SINGLE QUOTATION MARK +2019 ; Quotation_Mark # Pf RIGHT SINGLE QUOTATION MARK +201A ; Quotation_Mark # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; Quotation_Mark # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; Quotation_Mark # Pf RIGHT DOUBLE QUOTATION MARK +201E ; Quotation_Mark # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; Quotation_Mark # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2039 ; Quotation_Mark # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Quotation_Mark # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +300C ; Quotation_Mark # Ps LEFT CORNER BRACKET +300D ; Quotation_Mark # Pe RIGHT CORNER BRACKET +300E ; Quotation_Mark # Ps LEFT WHITE CORNER BRACKET +300F ; Quotation_Mark # Pe RIGHT WHITE CORNER BRACKET +301D ; Quotation_Mark # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Quotation_Mark # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +FE41 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE42 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE43 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE44 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FF02 ; Quotation_Mark # Po FULLWIDTH QUOTATION MARK +FF07 ; Quotation_Mark # Po FULLWIDTH APOSTROPHE +FF62 ; Quotation_Mark # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; Quotation_Mark # Pe HALFWIDTH RIGHT CORNER BRACKET + +# Total code points: 29 + +# ================================================ + +0021 ; Terminal_Punctuation # Po EXCLAMATION MARK +002C ; Terminal_Punctuation # Po COMMA +002E ; Terminal_Punctuation # Po FULL STOP +003A..003B ; Terminal_Punctuation # Po [2] COLON..SEMICOLON +003F ; Terminal_Punctuation # Po QUESTION MARK +037E ; Terminal_Punctuation # Po GREEK QUESTION MARK +0387 ; Terminal_Punctuation # Po GREEK ANO TELEIA +0589 ; Terminal_Punctuation # Po ARMENIAN FULL STOP +05C3 ; Terminal_Punctuation # Po HEBREW PUNCTUATION SOF PASUQ +060C ; Terminal_Punctuation # Po ARABIC COMMA +061B ; Terminal_Punctuation # Po ARABIC SEMICOLON +061F ; Terminal_Punctuation # Po ARABIC QUESTION MARK +06D4 ; Terminal_Punctuation # Po ARABIC FULL STOP +0700..070A ; Terminal_Punctuation # Po [11] SYRIAC END OF PARAGRAPH..SYRIAC CONTRACTION +070C ; Terminal_Punctuation # Po SYRIAC HARKLEAN METOBELUS +07F8..07F9 ; Terminal_Punctuation # Po [2] NKO COMMA..NKO EXCLAMATION MARK +0830..083E ; Terminal_Punctuation # Po [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU +085E ; Terminal_Punctuation # Po MANDAIC PUNCTUATION +0964..0965 ; Terminal_Punctuation # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0E5A..0E5B ; Terminal_Punctuation # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0F08 ; Terminal_Punctuation # Po TIBETAN MARK SBRUL SHAD +0F0D..0F12 ; Terminal_Punctuation # Po [6] TIBETAN MARK SHAD..TIBETAN MARK RGYA GRAM SHAD +104A..104B ; Terminal_Punctuation # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION +1361..1368 ; Terminal_Punctuation # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +166D..166E ; Terminal_Punctuation # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +16EB..16ED ; Terminal_Punctuation # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +17D4..17D6 ; Terminal_Punctuation # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17DA ; Terminal_Punctuation # Po KHMER SIGN KOOMUUT +1802..1805 ; Terminal_Punctuation # Po [4] MONGOLIAN COMMA..MONGOLIAN FOUR DOTS +1808..1809 ; Terminal_Punctuation # Po [2] MONGOLIAN MANCHU COMMA..MONGOLIAN MANCHU FULL STOP +1944..1945 ; Terminal_Punctuation # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK +1AA8..1AAB ; Terminal_Punctuation # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B5A..1B5B ; Terminal_Punctuation # Po [2] BALINESE PANTI..BALINESE PAMADA +1B5D..1B5F ; Terminal_Punctuation # Po [3] BALINESE CARIK PAMUNGKAH..BALINESE CARIK PAREREN +1C3B..1C3F ; Terminal_Punctuation # Po [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK +1C7E..1C7F ; Terminal_Punctuation # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +203C..203D ; Terminal_Punctuation # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +2047..2049 ; Terminal_Punctuation # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2E2E ; Terminal_Punctuation # Po REVERSED QUESTION MARK +3001..3002 ; Terminal_Punctuation # Po [2] IDEOGRAPHIC COMMA..IDEOGRAPHIC FULL STOP +A4FE..A4FF ; Terminal_Punctuation # Po [2] LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP +A60D..A60F ; Terminal_Punctuation # Po [3] VAI COMMA..VAI QUESTION MARK +A6F3..A6F7 ; Terminal_Punctuation # Po [5] BAMUM FULL STOP..BAMUM QUESTION MARK +A876..A877 ; Terminal_Punctuation # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD +A8CE..A8CF ; Terminal_Punctuation # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA +A92F ; Terminal_Punctuation # Po KAYAH LI SIGN SHYA +A9C7..A9C9 ; Terminal_Punctuation # Po [3] JAVANESE PADA PANGKAT..JAVANESE PADA LUNGSI +AA5D..AA5F ; Terminal_Punctuation # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA +AADF ; Terminal_Punctuation # Po TAI VIET SYMBOL KOI KOI +ABEB ; Terminal_Punctuation # Po MEETEI MAYEK CHEIKHEI +FE50..FE52 ; Terminal_Punctuation # Po [3] SMALL COMMA..SMALL FULL STOP +FE54..FE57 ; Terminal_Punctuation # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK +FF01 ; Terminal_Punctuation # Po FULLWIDTH EXCLAMATION MARK +FF0C ; Terminal_Punctuation # Po FULLWIDTH COMMA +FF0E ; Terminal_Punctuation # Po FULLWIDTH FULL STOP +FF1A..FF1B ; Terminal_Punctuation # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON +FF1F ; Terminal_Punctuation # Po FULLWIDTH QUESTION MARK +FF61 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF64 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC COMMA +1039F ; Terminal_Punctuation # Po UGARITIC WORD DIVIDER +103D0 ; Terminal_Punctuation # Po OLD PERSIAN WORD DIVIDER +10857 ; Terminal_Punctuation # Po IMPERIAL ARAMAIC SECTION SIGN +1091F ; Terminal_Punctuation # Po PHOENICIAN WORD SEPARATOR +10B3A..10B3F ; Terminal_Punctuation # Po [6] TINY TWO DOTS OVER ONE DOT PUNCTUATION..LARGE ONE RING OVER TWO RINGS PUNCTUATION +11047..1104D ; Terminal_Punctuation # Po [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS +110BE..110C1 ; Terminal_Punctuation # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA +12470..12473 ; Terminal_Punctuation # Po [4] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON + +# Total code points: 169 + +# ================================================ + +005E ; Other_Math # Sk CIRCUMFLEX ACCENT +03D0..03D2 ; Other_Math # L& [3] GREEK BETA SYMBOL..GREEK UPSILON WITH HOOK SYMBOL +03D5 ; Other_Math # L& GREEK PHI SYMBOL +03F0..03F1 ; Other_Math # L& [2] GREEK KAPPA SYMBOL..GREEK RHO SYMBOL +03F4..03F5 ; Other_Math # L& [2] GREEK CAPITAL THETA SYMBOL..GREEK LUNATE EPSILON SYMBOL +2016 ; Other_Math # Po DOUBLE VERTICAL LINE +2032..2034 ; Other_Math # Po [3] PRIME..TRIPLE PRIME +2040 ; Other_Math # Pc CHARACTER TIE +2061..2064 ; Other_Math # Cf [4] FUNCTION APPLICATION..INVISIBLE PLUS +207D ; Other_Math # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; Other_Math # Pe SUPERSCRIPT RIGHT PARENTHESIS +208D ; Other_Math # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; Other_Math # Pe SUBSCRIPT RIGHT PARENTHESIS +20D0..20DC ; Other_Math # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE +20E1 ; Other_Math # Mn COMBINING LEFT RIGHT ARROW ABOVE +20E5..20E6 ; Other_Math # Mn [2] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING DOUBLE VERTICAL STROKE OVERLAY +20EB..20EF ; Other_Math # Mn [5] COMBINING LONG DOUBLE SOLIDUS OVERLAY..COMBINING RIGHT ARROW BELOW +2102 ; Other_Math # L& DOUBLE-STRUCK CAPITAL C +2107 ; Other_Math # L& EULER CONSTANT +210A..2113 ; Other_Math # L& [10] SCRIPT SMALL G..SCRIPT SMALL L +2115 ; Other_Math # L& DOUBLE-STRUCK CAPITAL N +2119..211D ; Other_Math # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +2124 ; Other_Math # L& DOUBLE-STRUCK CAPITAL Z +2128 ; Other_Math # L& BLACK-LETTER CAPITAL Z +2129 ; Other_Math # So TURNED GREEK SMALL LETTER IOTA +212C..212D ; Other_Math # L& [2] SCRIPT CAPITAL B..BLACK-LETTER CAPITAL C +212F..2131 ; Other_Math # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F +2133..2134 ; Other_Math # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O +2135..2138 ; Other_Math # Lo [4] ALEF SYMBOL..DALET SYMBOL +213C..213F ; Other_Math # L& [4] DOUBLE-STRUCK SMALL PI..DOUBLE-STRUCK CAPITAL PI +2145..2149 ; Other_Math # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J +2195..2199 ; Other_Math # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219C..219F ; Other_Math # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A1..21A2 ; Other_Math # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A4..21A5 ; Other_Math # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A7 ; Other_Math # So DOWNWARDS ARROW FROM BAR +21A9..21AD ; Other_Math # So [5] LEFTWARDS ARROW WITH HOOK..LEFT RIGHT WAVE ARROW +21B0..21B1 ; Other_Math # So [2] UPWARDS ARROW WITH TIP LEFTWARDS..UPWARDS ARROW WITH TIP RIGHTWARDS +21B6..21B7 ; Other_Math # So [2] ANTICLOCKWISE TOP SEMICIRCLE ARROW..CLOCKWISE TOP SEMICIRCLE ARROW +21BC..21CD ; Other_Math # So [18] LEFTWARDS HARPOON WITH BARB UPWARDS..LEFTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; Other_Math # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D3 ; Other_Math # So DOWNWARDS DOUBLE ARROW +21D5..21DB ; Other_Math # So [7] UP DOWN DOUBLE ARROW..RIGHTWARDS TRIPLE ARROW +21DD ; Other_Math # So RIGHTWARDS SQUIGGLE ARROW +21E4..21E5 ; Other_Math # So [2] LEFTWARDS ARROW TO BAR..RIGHTWARDS ARROW TO BAR +23B4..23B5 ; Other_Math # So [2] TOP SQUARE BRACKET..BOTTOM SQUARE BRACKET +23B7 ; Other_Math # So RADICAL SYMBOL BOTTOM +23D0 ; Other_Math # So VERTICAL LINE EXTENSION +23E2 ; Other_Math # So WHITE TRAPEZIUM +25A0..25A1 ; Other_Math # So [2] BLACK SQUARE..WHITE SQUARE +25AE..25B6 ; Other_Math # So [9] BLACK VERTICAL RECTANGLE..BLACK RIGHT-POINTING TRIANGLE +25BC..25C0 ; Other_Math # So [5] BLACK DOWN-POINTING TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C6..25C7 ; Other_Math # So [2] BLACK DIAMOND..WHITE DIAMOND +25CA..25CB ; Other_Math # So [2] LOZENGE..WHITE CIRCLE +25CF..25D3 ; Other_Math # So [5] BLACK CIRCLE..CIRCLE WITH UPPER HALF BLACK +25E2 ; Other_Math # So BLACK LOWER RIGHT TRIANGLE +25E4 ; Other_Math # So BLACK UPPER LEFT TRIANGLE +25E7..25EC ; Other_Math # So [6] SQUARE WITH LEFT HALF BLACK..WHITE UP-POINTING TRIANGLE WITH DOT +2605..2606 ; Other_Math # So [2] BLACK STAR..WHITE STAR +2640 ; Other_Math # So FEMALE SIGN +2642 ; Other_Math # So MALE SIGN +2660..2663 ; Other_Math # So [4] BLACK SPADE SUIT..BLACK CLUB SUIT +266D..266E ; Other_Math # So [2] MUSIC FLAT SIGN..MUSIC NATURAL SIGN +27C5 ; Other_Math # Ps LEFT S-SHAPED BAG DELIMITER +27C6 ; Other_Math # Pe RIGHT S-SHAPED BAG DELIMITER +27E6 ; Other_Math # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Other_Math # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Other_Math # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Other_Math # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Other_Math # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Other_Math # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27EC ; Other_Math # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET +27ED ; Other_Math # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET +27EE ; Other_Math # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS +27EF ; Other_Math # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS +2983 ; Other_Math # Ps LEFT WHITE CURLY BRACKET +2984 ; Other_Math # Pe RIGHT WHITE CURLY BRACKET +2985 ; Other_Math # Ps LEFT WHITE PARENTHESIS +2986 ; Other_Math # Pe RIGHT WHITE PARENTHESIS +2987 ; Other_Math # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Other_Math # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Other_Math # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Other_Math # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Other_Math # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Other_Math # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Other_Math # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Other_Math # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Other_Math # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Other_Math # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Other_Math # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Other_Math # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Other_Math # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Other_Math # Pe RIGHT BLACK TORTOISE SHELL BRACKET +29D8 ; Other_Math # Ps LEFT WIGGLY FENCE +29D9 ; Other_Math # Pe RIGHT WIGGLY FENCE +29DA ; Other_Math # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Other_Math # Pe RIGHT DOUBLE WIGGLY FENCE +29FC ; Other_Math # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Other_Math # Pe RIGHT-POINTING CURVED ANGLE BRACKET +FE61 ; Other_Math # Po SMALL ASTERISK +FE63 ; Other_Math # Pd SMALL HYPHEN-MINUS +FE68 ; Other_Math # Po SMALL REVERSE SOLIDUS +FF3C ; Other_Math # Po FULLWIDTH REVERSE SOLIDUS +FF3E ; Other_Math # Sk FULLWIDTH CIRCUMFLEX ACCENT +1D400..1D454 ; Other_Math # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G +1D456..1D49C ; Other_Math # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; Other_Math # L& MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; Other_Math # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B9 ; Other_Math # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D +1D4BB ; Other_Math # L& MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C3 ; Other_Math # L& [7] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D505 ; Other_Math # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; Other_Math # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; Other_Math # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; Other_Math # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D51E..1D539 ; Other_Math # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; Other_Math # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; Other_Math # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; Other_Math # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; Other_Math # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D552..1D6A5 ; Other_Math # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D6A8..1D6C0 ; Other_Math # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6C2..1D6DA ; Other_Math # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DC..1D6FA ; Other_Math # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA +1D6FC..1D714 ; Other_Math # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D716..1D734 ; Other_Math # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D736..1D74E ; Other_Math # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D750..1D76E ; Other_Math # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D770..1D788 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D78A..1D7A8 ; Other_Math # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA +1D7AA..1D7C2 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C4..1D7CB ; Other_Math # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1D7CE..1D7FF ; Other_Math # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 1217 + +# ================================================ + +0030..0039 ; Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE +0041..0046 ; Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F +0061..0066 ; Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F +FF10..FF19 ; Hex_Digit # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +FF21..FF26 ; Hex_Digit # L& [6] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER F +FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER F + +# Total code points: 44 + +# ================================================ + +0030..0039 ; ASCII_Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE +0041..0046 ; ASCII_Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F +0061..0066 ; ASCII_Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F + +# Total code points: 22 + +# ================================================ + +0345 ; Other_Alphabetic # Mn COMBINING GREEK YPOGEGRAMMENI +05B0..05BD ; Other_Alphabetic # Mn [14] HEBREW POINT SHEVA..HEBREW POINT METEG +05BF ; Other_Alphabetic # Mn HEBREW POINT RAFE +05C1..05C2 ; Other_Alphabetic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4..05C5 ; Other_Alphabetic # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT +05C7 ; Other_Alphabetic # Mn HEBREW POINT QAMATS QATAN +0610..061A ; Other_Alphabetic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA +064B..0657 ; Other_Alphabetic # Mn [13] ARABIC FATHATAN..ARABIC INVERTED DAMMA +0659..065F ; Other_Alphabetic # Mn [7] ARABIC ZWARAKAY..ARABIC WAVY HAMZA BELOW +0670 ; Other_Alphabetic # Mn ARABIC LETTER SUPERSCRIPT ALEF +06D6..06DC ; Other_Alphabetic # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06E1..06E4 ; Other_Alphabetic # Mn [4] ARABIC SMALL HIGH DOTLESS HEAD OF KHAH..ARABIC SMALL HIGH MADDA +06E7..06E8 ; Other_Alphabetic # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06ED ; Other_Alphabetic # Mn ARABIC SMALL LOW MEEM +0711 ; Other_Alphabetic # Mn SYRIAC LETTER SUPERSCRIPT ALAPH +0730..073F ; Other_Alphabetic # Mn [16] SYRIAC PTHAHA ABOVE..SYRIAC RWAHA +07A6..07B0 ; Other_Alphabetic # Mn [11] THAANA ABAFILI..THAANA SUKUN +0816..0817 ; Other_Alphabetic # Mn [2] SAMARITAN MARK IN..SAMARITAN MARK IN-ALAF +081B..0823 ; Other_Alphabetic # Mn [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A +0825..0827 ; Other_Alphabetic # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U +0829..082C ; Other_Alphabetic # Mn [4] SAMARITAN VOWEL SIGN LONG I..SAMARITAN VOWEL SIGN SUKUN +0900..0902 ; Other_Alphabetic # Mn [3] DEVANAGARI SIGN INVERTED CANDRABINDU..DEVANAGARI SIGN ANUSVARA +0903 ; Other_Alphabetic # Mc DEVANAGARI SIGN VISARGA +093A ; Other_Alphabetic # Mn DEVANAGARI VOWEL SIGN OE +093B ; Other_Alphabetic # Mc DEVANAGARI VOWEL SIGN OOE +093E..0940 ; Other_Alphabetic # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0941..0948 ; Other_Alphabetic # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +0949..094C ; Other_Alphabetic # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +094E..094F ; Other_Alphabetic # Mc [2] DEVANAGARI VOWEL SIGN PRISHTHAMATRA E..DEVANAGARI VOWEL SIGN AW +0955..0957 ; Other_Alphabetic # Mn [3] DEVANAGARI VOWEL SIGN CANDRA LONG E..DEVANAGARI VOWEL SIGN UUE +0962..0963 ; Other_Alphabetic # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0981 ; Other_Alphabetic # Mn BENGALI SIGN CANDRABINDU +0982..0983 ; Other_Alphabetic # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +09BE..09C0 ; Other_Alphabetic # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C1..09C4 ; Other_Alphabetic # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09C7..09C8 ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09D7 ; Other_Alphabetic # Mc BENGALI AU LENGTH MARK +09E2..09E3 ; Other_Alphabetic # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +0A01..0A02 ; Other_Alphabetic # Mn [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI +0A03 ; Other_Alphabetic # Mc GURMUKHI SIGN VISARGA +0A3E..0A40 ; Other_Alphabetic # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A41..0A42 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4C ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN OO..GURMUKHI VOWEL SIGN AU +0A51 ; Other_Alphabetic # Mn GURMUKHI SIGN UDAAT +0A70..0A71 ; Other_Alphabetic # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A75 ; Other_Alphabetic # Mn GURMUKHI SIGN YAKASH +0A81..0A82 ; Other_Alphabetic # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0A83 ; Other_Alphabetic # Mc GUJARATI SIGN VISARGA +0ABE..0AC0 ; Other_Alphabetic # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC1..0AC5 ; Other_Alphabetic # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0AC9 ; Other_Alphabetic # Mc GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; Other_Alphabetic # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0AE2..0AE3 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL +0B01 ; Other_Alphabetic # Mn ORIYA SIGN CANDRABINDU +0B02..0B03 ; Other_Alphabetic # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B3E ; Other_Alphabetic # Mc ORIYA VOWEL SIGN AA +0B3F ; Other_Alphabetic # Mn ORIYA VOWEL SIGN I +0B40 ; Other_Alphabetic # Mc ORIYA VOWEL SIGN II +0B41..0B44 ; Other_Alphabetic # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR +0B47..0B48 ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B56 ; Other_Alphabetic # Mn ORIYA AI LENGTH MARK +0B57 ; Other_Alphabetic # Mc ORIYA AU LENGTH MARK +0B62..0B63 ; Other_Alphabetic # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL +0B82 ; Other_Alphabetic # Mn TAMIL SIGN ANUSVARA +0BBE..0BBF ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC0 ; Other_Alphabetic # Mn TAMIL VOWEL SIGN II +0BC1..0BC2 ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BD7 ; Other_Alphabetic # Mc TAMIL AU LENGTH MARK +0C01..0C03 ; Other_Alphabetic # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C3E..0C40 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C41..0C44 ; Other_Alphabetic # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C46..0C48 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4C ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU +0C55..0C56 ; Other_Alphabetic # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK +0C62..0C63 ; Other_Alphabetic # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL +0C82..0C83 ; Other_Alphabetic # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0CBE ; Other_Alphabetic # Mc KANNADA VOWEL SIGN AA +0CBF ; Other_Alphabetic # Mn KANNADA VOWEL SIGN I +0CC0..0CC4 ; Other_Alphabetic # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC6 ; Other_Alphabetic # Mn KANNADA VOWEL SIGN E +0CC7..0CC8 ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CCC ; Other_Alphabetic # Mn KANNADA VOWEL SIGN AU +0CD5..0CD6 ; Other_Alphabetic # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0CE2..0CE3 ; Other_Alphabetic # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL +0D02..0D03 ; Other_Alphabetic # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D3E..0D40 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D41..0D44 ; Other_Alphabetic # Mn [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR +0D46..0D48 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D57 ; Other_Alphabetic # Mc MALAYALAM AU LENGTH MARK +0D62..0D63 ; Other_Alphabetic # Mn [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL +0D82..0D83 ; Other_Alphabetic # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0DCF..0DD1 ; Other_Alphabetic # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD2..0DD4 ; Other_Alphabetic # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; Other_Alphabetic # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA +0DD8..0DDF ; Other_Alphabetic # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; Other_Alphabetic # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0E31 ; Other_Alphabetic # Mn THAI CHARACTER MAI HAN-AKAT +0E34..0E3A ; Other_Alphabetic # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU +0E4D ; Other_Alphabetic # Mn THAI CHARACTER NIKHAHIT +0EB1 ; Other_Alphabetic # Mn LAO VOWEL SIGN MAI KAN +0EB4..0EB9 ; Other_Alphabetic # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU +0EBB..0EBC ; Other_Alphabetic # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0ECD ; Other_Alphabetic # Mn LAO NIGGAHITA +0F71..0F7E ; Other_Alphabetic # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO +0F7F ; Other_Alphabetic # Mc TIBETAN SIGN RNAM BCAD +0F80..0F81 ; Other_Alphabetic # Mn [2] TIBETAN VOWEL SIGN REVERSED I..TIBETAN VOWEL SIGN REVERSED II +0F8D..0F97 ; Other_Alphabetic # Mn [11] TIBETAN SUBJOINED SIGN LCE TSA CAN..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; Other_Alphabetic # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +102B..102C ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN TALL AA..MYANMAR VOWEL SIGN AA +102D..1030 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1031 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN E +1032..1036 ; Other_Alphabetic # Mn [5] MYANMAR VOWEL SIGN AI..MYANMAR SIGN ANUSVARA +1038 ; Other_Alphabetic # Mc MYANMAR SIGN VISARGA +103B..103C ; Other_Alphabetic # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA +103D..103E ; Other_Alphabetic # Mn [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA +1056..1057 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +1058..1059 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +105E..1060 ; Other_Alphabetic # Mn [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA +1062 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN SGAW KAREN EU +1067..1068 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN WESTERN PWO KAREN EU..MYANMAR VOWEL SIGN WESTERN PWO KAREN UE +1071..1074 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN GEBA KAREN I..MYANMAR VOWEL SIGN KAYAH EE +1082 ; Other_Alphabetic # Mn MYANMAR CONSONANT SIGN SHAN MEDIAL WA +1083..1084 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN SHAN AA..MYANMAR VOWEL SIGN SHAN E +1085..1086 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN SHAN E ABOVE..MYANMAR VOWEL SIGN SHAN FINAL Y +109C ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN AITON A +109D ; Other_Alphabetic # Mn MYANMAR VOWEL SIGN AITON AI +135F ; Other_Alphabetic # Mn ETHIOPIC COMBINING GEMINATION MARK +1712..1713 ; Other_Alphabetic # Mn [2] TAGALOG VOWEL SIGN I..TAGALOG VOWEL SIGN U +1732..1733 ; Other_Alphabetic # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1752..1753 ; Other_Alphabetic # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1772..1773 ; Other_Alphabetic # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +17B6 ; Other_Alphabetic # Mc KHMER VOWEL SIGN AA +17B7..17BD ; Other_Alphabetic # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17BE..17C5 ; Other_Alphabetic # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C6 ; Other_Alphabetic # Mn KHMER SIGN NIKAHIT +17C7..17C8 ; Other_Alphabetic # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +18A9 ; Other_Alphabetic # Mn MONGOLIAN LETTER ALI GALI DAGALGA +1920..1922 ; Other_Alphabetic # Mn [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U +1923..1926 ; Other_Alphabetic # Mc [4] LIMBU VOWEL SIGN EE..LIMBU VOWEL SIGN AU +1927..1928 ; Other_Alphabetic # Mn [2] LIMBU VOWEL SIGN E..LIMBU VOWEL SIGN O +1929..192B ; Other_Alphabetic # Mc [3] LIMBU SUBJOINED LETTER YA..LIMBU SUBJOINED LETTER WA +1930..1931 ; Other_Alphabetic # Mc [2] LIMBU SMALL LETTER KA..LIMBU SMALL LETTER NGA +1932 ; Other_Alphabetic # Mn LIMBU SMALL LETTER ANUSVARA +1933..1938 ; Other_Alphabetic # Mc [6] LIMBU SMALL LETTER TA..LIMBU SMALL LETTER LA +19B0..19C0 ; Other_Alphabetic # Mc [17] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE VOWEL SIGN IY +19C8..19C9 ; Other_Alphabetic # Mc [2] NEW TAI LUE TONE MARK-1..NEW TAI LUE TONE MARK-2 +1A17..1A18 ; Other_Alphabetic # Mn [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U +1A19..1A1B ; Other_Alphabetic # Mc [3] BUGINESE VOWEL SIGN E..BUGINESE VOWEL SIGN AE +1A55 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN MEDIAL RA +1A56 ; Other_Alphabetic # Mn TAI THAM CONSONANT SIGN MEDIAL LA +1A57 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN LA TANG LAI +1A58..1A5E ; Other_Alphabetic # Mn [7] TAI THAM SIGN MAI KANG LAI..TAI THAM CONSONANT SIGN SA +1A61 ; Other_Alphabetic # Mc TAI THAM VOWEL SIGN A +1A62 ; Other_Alphabetic # Mn TAI THAM VOWEL SIGN MAI SAT +1A63..1A64 ; Other_Alphabetic # Mc [2] TAI THAM VOWEL SIGN AA..TAI THAM VOWEL SIGN TALL AA +1A65..1A6C ; Other_Alphabetic # Mn [8] TAI THAM VOWEL SIGN I..TAI THAM VOWEL SIGN OA BELOW +1A6D..1A72 ; Other_Alphabetic # Mc [6] TAI THAM VOWEL SIGN OY..TAI THAM VOWEL SIGN THAM AI +1A73..1A74 ; Other_Alphabetic # Mn [2] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN MAI KANG +1B00..1B03 ; Other_Alphabetic # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG +1B04 ; Other_Alphabetic # Mc BALINESE SIGN BISAH +1B35 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN TEDUNG +1B36..1B3A ; Other_Alphabetic # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA +1B3B ; Other_Alphabetic # Mc BALINESE VOWEL SIGN RA REPA TEDUNG +1B3C ; Other_Alphabetic # Mn BALINESE VOWEL SIGN LA LENGA +1B3D..1B41 ; Other_Alphabetic # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG +1B42 ; Other_Alphabetic # Mn BALINESE VOWEL SIGN PEPET +1B43 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN PEPET TEDUNG +1B80..1B81 ; Other_Alphabetic # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR +1B82 ; Other_Alphabetic # Mc SUNDANESE SIGN PANGWISAD +1BA1 ; Other_Alphabetic # Mc SUNDANESE CONSONANT SIGN PAMINGKAL +1BA2..1BA5 ; Other_Alphabetic # Mn [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU +1BA6..1BA7 ; Other_Alphabetic # Mc [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG +1BA8..1BA9 ; Other_Alphabetic # Mn [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG +1BE7 ; Other_Alphabetic # Mc BATAK VOWEL SIGN E +1BE8..1BE9 ; Other_Alphabetic # Mn [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE +1BEA..1BEC ; Other_Alphabetic # Mc [3] BATAK VOWEL SIGN I..BATAK VOWEL SIGN O +1BED ; Other_Alphabetic # Mn BATAK VOWEL SIGN KARO O +1BEE ; Other_Alphabetic # Mc BATAK VOWEL SIGN U +1BEF..1BF1 ; Other_Alphabetic # Mn [3] BATAK VOWEL SIGN U FOR SIMALUNGUN SA..BATAK CONSONANT SIGN H +1C24..1C2B ; Other_Alphabetic # Mc [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU +1C2C..1C33 ; Other_Alphabetic # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T +1C34..1C35 ; Other_Alphabetic # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG +1CF2 ; Other_Alphabetic # Mc VEDIC SIGN ARDHAVISARGA +24B6..24E9 ; Other_Alphabetic # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z +2DE0..2DFF ; Other_Alphabetic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS +A823..A824 ; Other_Alphabetic # Mc [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I +A825..A826 ; Other_Alphabetic # Mn [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E +A827 ; Other_Alphabetic # Mc SYLOTI NAGRI VOWEL SIGN OO +A880..A881 ; Other_Alphabetic # Mc [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA +A8B4..A8C3 ; Other_Alphabetic # Mc [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU +A926..A92A ; Other_Alphabetic # Mn [5] KAYAH LI VOWEL UE..KAYAH LI VOWEL O +A947..A951 ; Other_Alphabetic # Mn [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R +A952 ; Other_Alphabetic # Mc REJANG CONSONANT SIGN H +A980..A982 ; Other_Alphabetic # Mn [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR +A983 ; Other_Alphabetic # Mc JAVANESE SIGN WIGNYAN +A9B4..A9B5 ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TARUNG..JAVANESE VOWEL SIGN TOLONG +A9B6..A9B9 ; Other_Alphabetic # Mn [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT +A9BA..A9BB ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TALING..JAVANESE VOWEL SIGN DIRGA MURE +A9BC ; Other_Alphabetic # Mn JAVANESE VOWEL SIGN PEPET +A9BD..A9BF ; Other_Alphabetic # Mc [3] JAVANESE CONSONANT SIGN KERET..JAVANESE CONSONANT SIGN CAKRA +AA29..AA2E ; Other_Alphabetic # Mn [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE +AA2F..AA30 ; Other_Alphabetic # Mc [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI +AA31..AA32 ; Other_Alphabetic # Mn [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE +AA33..AA34 ; Other_Alphabetic # Mc [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA +AA35..AA36 ; Other_Alphabetic # Mn [2] CHAM CONSONANT SIGN LA..CHAM CONSONANT SIGN WA +AA43 ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL NG +AA4C ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL M +AA4D ; Other_Alphabetic # Mc CHAM CONSONANT SIGN FINAL H +AAB0 ; Other_Alphabetic # Mn TAI VIET MAI KANG +AAB2..AAB4 ; Other_Alphabetic # Mn [3] TAI VIET VOWEL I..TAI VIET VOWEL U +AAB7..AAB8 ; Other_Alphabetic # Mn [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA +AABE ; Other_Alphabetic # Mn TAI VIET VOWEL AM +ABE3..ABE4 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP +ABE5 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN ANAP +ABE6..ABE7 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN YENAP..MEETEI MAYEK VOWEL SIGN SOUNAP +ABE8 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN UNAP +ABE9..ABEA ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN CHEINAP..MEETEI MAYEK VOWEL SIGN NUNG +FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA +10A01..10A03 ; Other_Alphabetic # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R +10A05..10A06 ; Other_Alphabetic # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O +10A0C..10A0F ; Other_Alphabetic # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA +11000 ; Other_Alphabetic # Mc BRAHMI SIGN CANDRABINDU +11001 ; Other_Alphabetic # Mn BRAHMI SIGN ANUSVARA +11002 ; Other_Alphabetic # Mc BRAHMI SIGN VISARGA +11038..11045 ; Other_Alphabetic # Mn [14] BRAHMI VOWEL SIGN AA..BRAHMI VOWEL SIGN AU +11082 ; Other_Alphabetic # Mc KAITHI SIGN VISARGA +110B0..110B2 ; Other_Alphabetic # Mc [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II +110B3..110B6 ; Other_Alphabetic # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI +110B7..110B8 ; Other_Alphabetic # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU + +# Total code points: 795 + +# ================================================ + +3006 ; Ideographic # Lo IDEOGRAPHIC CLOSING MARK +3007 ; Ideographic # Nl IDEOGRAPHIC NUMBER ZERO +3021..3029 ; Ideographic # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3038..303A ; Ideographic # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +3400..4DB5 ; Ideographic # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FCB ; Ideographic # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB +F900..FA2D ; Ideographic # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6D ; Ideographic # Lo [62] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6D +FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9 +20000..2A6D6 ; Ideographic # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2A700..2B734 ; Ideographic # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +2B740..2B81D ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D +2F800..2FA1D ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D + +# Total code points: 75630 + +# ================================================ + +005E ; Diacritic # Sk CIRCUMFLEX ACCENT +0060 ; Diacritic # Sk GRAVE ACCENT +00A8 ; Diacritic # Sk DIAERESIS +00AF ; Diacritic # Sk MACRON +00B4 ; Diacritic # Sk ACUTE ACCENT +00B7 ; Diacritic # Po MIDDLE DOT +00B8 ; Diacritic # Sk CEDILLA +02B0..02C1 ; Diacritic # Lm [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP +02C2..02C5 ; Diacritic # Sk [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD +02C6..02D1 ; Diacritic # Lm [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON +02D2..02DF ; Diacritic # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT +02E0..02E4 ; Diacritic # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02E5..02EB ; Diacritic # Sk [7] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER YANG DEPARTING TONE MARK +02EC ; Diacritic # Lm MODIFIER LETTER VOICING +02ED ; Diacritic # Sk MODIFIER LETTER UNASPIRATED +02EE ; Diacritic # Lm MODIFIER LETTER DOUBLE APOSTROPHE +02EF..02FF ; Diacritic # Sk [17] MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW +0300..034E ; Diacritic # Mn [79] COMBINING GRAVE ACCENT..COMBINING UPWARDS ARROW BELOW +0350..0357 ; Diacritic # Mn [8] COMBINING RIGHT ARROWHEAD ABOVE..COMBINING RIGHT HALF RING ABOVE +035D..0362 ; Diacritic # Mn [6] COMBINING DOUBLE BREVE..COMBINING DOUBLE RIGHTWARDS ARROW BELOW +0374 ; Diacritic # Lm GREEK NUMERAL SIGN +0375 ; Diacritic # Sk GREEK LOWER NUMERAL SIGN +037A ; Diacritic # Lm GREEK YPOGEGRAMMENI +0384..0385 ; Diacritic # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS +0483..0487 ; Diacritic # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE +0559 ; Diacritic # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0591..05A1 ; Diacritic # Mn [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER +05A3..05BD ; Diacritic # Mn [27] HEBREW ACCENT MUNAH..HEBREW POINT METEG +05BF ; Diacritic # Mn HEBREW POINT RAFE +05C1..05C2 ; Diacritic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4 ; Diacritic # Mn HEBREW MARK UPPER DOT +064B..0652 ; Diacritic # Mn [8] ARABIC FATHATAN..ARABIC SUKUN +0657..0658 ; Diacritic # Mn [2] ARABIC INVERTED DAMMA..ARABIC MARK NOON GHUNNA +06DF..06E0 ; Diacritic # Mn [2] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO +06E5..06E6 ; Diacritic # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH +06EA..06EC ; Diacritic # Mn [3] ARABIC EMPTY CENTRE LOW STOP..ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE +0730..074A ; Diacritic # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH +07A6..07B0 ; Diacritic # Mn [11] THAANA ABAFILI..THAANA SUKUN +07EB..07F3 ; Diacritic # Mn [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE +07F4..07F5 ; Diacritic # Lm [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE +0818..0819 ; Diacritic # Mn [2] SAMARITAN MARK OCCLUSION..SAMARITAN MARK DAGESH +093C ; Diacritic # Mn DEVANAGARI SIGN NUKTA +094D ; Diacritic # Mn DEVANAGARI SIGN VIRAMA +0951..0954 ; Diacritic # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT +0971 ; Diacritic # Lm DEVANAGARI SIGN HIGH SPACING DOT +09BC ; Diacritic # Mn BENGALI SIGN NUKTA +09CD ; Diacritic # Mn BENGALI SIGN VIRAMA +0A3C ; Diacritic # Mn GURMUKHI SIGN NUKTA +0A4D ; Diacritic # Mn GURMUKHI SIGN VIRAMA +0ABC ; Diacritic # Mn GUJARATI SIGN NUKTA +0ACD ; Diacritic # Mn GUJARATI SIGN VIRAMA +0B3C ; Diacritic # Mn ORIYA SIGN NUKTA +0B4D ; Diacritic # Mn ORIYA SIGN VIRAMA +0BCD ; Diacritic # Mn TAMIL SIGN VIRAMA +0C4D ; Diacritic # Mn TELUGU SIGN VIRAMA +0CBC ; Diacritic # Mn KANNADA SIGN NUKTA +0CCD ; Diacritic # Mn KANNADA SIGN VIRAMA +0D4D ; Diacritic # Mn MALAYALAM SIGN VIRAMA +0DCA ; Diacritic # Mn SINHALA SIGN AL-LAKUNA +0E47..0E4C ; Diacritic # Mn [6] THAI CHARACTER MAITAIKHU..THAI CHARACTER THANTHAKHAT +0E4E ; Diacritic # Mn THAI CHARACTER YAMAKKAN +0EC8..0ECC ; Diacritic # Mn [5] LAO TONE MAI EK..LAO CANCELLATION MARK +0F18..0F19 ; Diacritic # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F35 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG NYI ZLA +0F37 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS +0F39 ; Diacritic # Mn TIBETAN MARK TSA -PHRU +0F3E..0F3F ; Diacritic # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F82..0F84 ; Diacritic # Mn [3] TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA +0F86..0F87 ; Diacritic # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +0FC6 ; Diacritic # Mn TIBETAN SYMBOL PADMA GDAN +1037 ; Diacritic # Mn MYANMAR SIGN DOT BELOW +1039..103A ; Diacritic # Mn [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT +1087..108C ; Diacritic # Mc [6] MYANMAR SIGN SHAN TONE-2..MYANMAR SIGN SHAN COUNCIL TONE-3 +108D ; Diacritic # Mn MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE +108F ; Diacritic # Mc MYANMAR SIGN RUMAI PALAUNG TONE-5 +109A..109B ; Diacritic # Mc [2] MYANMAR SIGN KHAMTI TONE-1..MYANMAR SIGN KHAMTI TONE-3 +17C9..17D3 ; Diacritic # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT +17DD ; Diacritic # Mn KHMER SIGN ATTHACAN +1939..193B ; Diacritic # Mn [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I +1A75..1A7C ; Diacritic # Mn [8] TAI THAM SIGN TONE-1..TAI THAM SIGN KHUEN-LUE KARAN +1A7F ; Diacritic # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT +1B34 ; Diacritic # Mn BALINESE SIGN REREKAN +1B44 ; Diacritic # Mc BALINESE ADEG ADEG +1B6B..1B73 ; Diacritic # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG +1BAA ; Diacritic # Mc SUNDANESE SIGN PAMAAEH +1C36..1C37 ; Diacritic # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA +1C78..1C7D ; Diacritic # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD +1CD0..1CD2 ; Diacritic # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA +1CD3 ; Diacritic # Po VEDIC SIGN NIHSHVASA +1CD4..1CE0 ; Diacritic # Mn [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA +1CE1 ; Diacritic # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA +1CE2..1CE8 ; Diacritic # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL +1CED ; Diacritic # Mn VEDIC SIGN TIRYAK +1D2C..1D61 ; Diacritic # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI +1D62..1D6A ; Diacritic # L& [9] LATIN SUBSCRIPT SMALL LETTER I..GREEK SUBSCRIPT SMALL LETTER CHI +1DC4..1DCF ; Diacritic # Mn [12] COMBINING MACRON-ACUTE..COMBINING ZIGZAG BELOW +1DFD..1DFF ; Diacritic # Mn [3] COMBINING ALMOST EQUAL TO BELOW..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1FBD ; Diacritic # Sk GREEK KORONIS +1FBF..1FC1 ; Diacritic # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FCD..1FCF ; Diacritic # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FDD..1FDF ; Diacritic # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FED..1FEF ; Diacritic # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FFD..1FFE ; Diacritic # Sk [2] GREEK OXIA..GREEK DASIA +2CEF..2CF1 ; Diacritic # Mn [3] COPTIC COMBINING NI ABOVE..COPTIC COMBINING SPIRITUS LENIS +2E2F ; Diacritic # Lm VERTICAL TILDE +302A..302F ; Diacritic # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK +3099..309A ; Diacritic # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309B..309C ; Diacritic # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +30FC ; Diacritic # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK +A66F ; Diacritic # Mn COMBINING CYRILLIC VZMET +A67C..A67D ; Diacritic # Mn [2] COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK +A67F ; Diacritic # Lm CYRILLIC PAYEROK +A6F0..A6F1 ; Diacritic # Mn [2] BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS +A717..A71F ; Diacritic # Lm [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK +A720..A721 ; Diacritic # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE +A788 ; Diacritic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT +A8C4 ; Diacritic # Mn SAURASHTRA SIGN VIRAMA +A8E0..A8F1 ; Diacritic # Mn [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA +A92B..A92D ; Diacritic # Mn [3] KAYAH LI TONE PLOPHU..KAYAH LI TONE CALYA PLOPHU +A92E ; Diacritic # Po KAYAH LI SIGN CWI +A953 ; Diacritic # Mc REJANG VIRAMA +A9B3 ; Diacritic # Mn JAVANESE SIGN CECAK TELU +A9C0 ; Diacritic # Mc JAVANESE PANGKON +AA7B ; Diacritic # Mc MYANMAR SIGN PAO KAREN TONE +AABF ; Diacritic # Mn TAI VIET TONE MAI EK +AAC0 ; Diacritic # Lo TAI VIET TONE MAI NUENG +AAC1 ; Diacritic # Mn TAI VIET TONE MAI THO +AAC2 ; Diacritic # Lo TAI VIET TONE MAI SONG +ABEC ; Diacritic # Mc MEETEI MAYEK LUM IYEK +ABED ; Diacritic # Mn MEETEI MAYEK APUN IYEK +FB1E ; Diacritic # Mn HEBREW POINT JUDEO-SPANISH VARIKA +FE20..FE26 ; Diacritic # Mn [7] COMBINING LIGATURE LEFT HALF..COMBINING CONJOINING MACRON +FF3E ; Diacritic # Sk FULLWIDTH CIRCUMFLEX ACCENT +FF40 ; Diacritic # Sk FULLWIDTH GRAVE ACCENT +FF70 ; Diacritic # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF9E..FF9F ; Diacritic # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +FFE3 ; Diacritic # Sk FULLWIDTH MACRON +110B9..110BA ; Diacritic # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA +1D167..1D169 ; Diacritic # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 +1D16D..1D172 ; Diacritic # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 +1D17B..1D182 ; Diacritic # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D185..1D18B ; Diacritic # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE +1D1AA..1D1AD ; Diacritic # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO + +# Total code points: 639 + +# ================================================ + +00B7 ; Extender # Po MIDDLE DOT +02D0..02D1 ; Extender # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON +0640 ; Extender # Lm ARABIC TATWEEL +07FA ; Extender # Lm NKO LAJANYALAN +0E46 ; Extender # Lm THAI CHARACTER MAIYAMOK +0EC6 ; Extender # Lm LAO KO LA +1843 ; Extender # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN +1AA7 ; Extender # Lm TAI THAM SIGN MAI YAMOK +1C36 ; Extender # Mn LEPCHA SIGN RAN +1C7B ; Extender # Lm OL CHIKI RELAA +3005 ; Extender # Lm IDEOGRAPHIC ITERATION MARK +3031..3035 ; Extender # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +309D..309E ; Extender # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +30FC..30FE ; Extender # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +A015 ; Extender # Lm YI SYLLABLE WU +A60C ; Extender # Lm VAI SYLLABLE LENGTHENER +A9CF ; Extender # Lm JAVANESE PANGRANGKEP +AA70 ; Extender # Lm MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION +AADD ; Extender # Lm TAI VIET SYMBOL SAM +FF70 ; Extender # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK + +# Total code points: 28 + +# ================================================ + +02B0..02B8 ; Other_Lowercase # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02C0..02C1 ; Other_Lowercase # Lm [2] MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP +02E0..02E4 ; Other_Lowercase # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +0345 ; Other_Lowercase # Mn COMBINING GREEK YPOGEGRAMMENI +037A ; Other_Lowercase # Lm GREEK YPOGEGRAMMENI +1D2C..1D61 ; Other_Lowercase # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI +1D78 ; Other_Lowercase # Lm MODIFIER LETTER CYRILLIC EN +1D9B..1DBF ; Other_Lowercase # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA +2090..2094 ; Other_Lowercase # Lm [5] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER SCHWA +2170..217F ; Other_Lowercase # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND +24D0..24E9 ; Other_Lowercase # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +2C7D ; Other_Lowercase # Lm MODIFIER LETTER CAPITAL V +A770 ; Other_Lowercase # Lm MODIFIER LETTER US + +# Total code points: 159 + +# ================================================ + +2160..216F ; Other_Uppercase # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND +24B6..24CF ; Other_Uppercase # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z + +# Total code points: 42 + +# ================================================ + +FDD0..FDEF ; Noncharacter_Code_Point # Cn [32] <noncharacter-FDD0>..<noncharacter-FDEF> +FFFE..FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-FFFE>..<noncharacter-FFFF> +1FFFE..1FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-1FFFE>..<noncharacter-1FFFF> +2FFFE..2FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-2FFFE>..<noncharacter-2FFFF> +3FFFE..3FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-3FFFE>..<noncharacter-3FFFF> +4FFFE..4FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-4FFFE>..<noncharacter-4FFFF> +5FFFE..5FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-5FFFE>..<noncharacter-5FFFF> +6FFFE..6FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-6FFFE>..<noncharacter-6FFFF> +7FFFE..7FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-7FFFE>..<noncharacter-7FFFF> +8FFFE..8FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-8FFFE>..<noncharacter-8FFFF> +9FFFE..9FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-9FFFE>..<noncharacter-9FFFF> +AFFFE..AFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-AFFFE>..<noncharacter-AFFFF> +BFFFE..BFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-BFFFE>..<noncharacter-BFFFF> +CFFFE..CFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-CFFFE>..<noncharacter-CFFFF> +DFFFE..DFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-DFFFE>..<noncharacter-DFFFF> +EFFFE..EFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-EFFFE>..<noncharacter-EFFFF> +FFFFE..FFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-FFFFE>..<noncharacter-FFFFF> +10FFFE..10FFFF; Noncharacter_Code_Point # Cn [2] <noncharacter-10FFFE>..<noncharacter-10FFFF> + +# Total code points: 66 + +# ================================================ + +09BE ; Other_Grapheme_Extend # Mc BENGALI VOWEL SIGN AA +09D7 ; Other_Grapheme_Extend # Mc BENGALI AU LENGTH MARK +0B3E ; Other_Grapheme_Extend # Mc ORIYA VOWEL SIGN AA +0B57 ; Other_Grapheme_Extend # Mc ORIYA AU LENGTH MARK +0BBE ; Other_Grapheme_Extend # Mc TAMIL VOWEL SIGN AA +0BD7 ; Other_Grapheme_Extend # Mc TAMIL AU LENGTH MARK +0CC2 ; Other_Grapheme_Extend # Mc KANNADA VOWEL SIGN UU +0CD5..0CD6 ; Other_Grapheme_Extend # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0D3E ; Other_Grapheme_Extend # Mc MALAYALAM VOWEL SIGN AA +0D57 ; Other_Grapheme_Extend # Mc MALAYALAM AU LENGTH MARK +0DCF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN AELA-PILLA +0DDF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN GAYANUKITTA +200C..200D ; Other_Grapheme_Extend # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER +FF9E..FF9F ; Other_Grapheme_Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +1D165 ; Other_Grapheme_Extend # Mc MUSICAL SYMBOL COMBINING STEM +1D16E..1D172 ; Other_Grapheme_Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 + +# Total code points: 23 + +# ================================================ + +2FF0..2FF1 ; IDS_Binary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW +2FF4..2FFB ; IDS_Binary_Operator # So [8] IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID + +# Total code points: 10 + +# ================================================ + +2FF2..2FF3 ; IDS_Trinary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW + +# Total code points: 2 + +# ================================================ + +2E80..2E99 ; Radical # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; Radical # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; Radical # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE + +# Total code points: 329 + +# ================================================ + +3400..4DB5 ; Unified_Ideograph # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FCB ; Unified_Ideograph # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB +FA0E..FA0F ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F +FA11 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA11 +FA13..FA14 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14 +FA1F ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA1F +FA21 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA21 +FA23..FA24 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24 +FA27..FA29 ; Unified_Ideograph # Lo [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29 +20000..2A6D6 ; Unified_Ideograph # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2A700..2B734 ; Unified_Ideograph # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +2B740..2B81D ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D + +# Total code points: 74616 + +# ================================================ + +034F ; Other_Default_Ignorable_Code_Point # Mn COMBINING GRAPHEME JOINER +115F..1160 ; Other_Default_Ignorable_Code_Point # Lo [2] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER +2065..2069 ; Other_Default_Ignorable_Code_Point # Cn [5] <reserved-2065>..<reserved-2069> +3164 ; Other_Default_Ignorable_Code_Point # Lo HANGUL FILLER +FFA0 ; Other_Default_Ignorable_Code_Point # Lo HALFWIDTH HANGUL FILLER +FFF0..FFF8 ; Other_Default_Ignorable_Code_Point # Cn [9] <reserved-FFF0>..<reserved-FFF8> +E0000 ; Other_Default_Ignorable_Code_Point # Cn <reserved-E0000> +E0002..E001F ; Other_Default_Ignorable_Code_Point # Cn [30] <reserved-E0002>..<reserved-E001F> +E0080..E00FF ; Other_Default_Ignorable_Code_Point # Cn [128] <reserved-E0080>..<reserved-E00FF> +E01F0..E0FFF ; Other_Default_Ignorable_Code_Point # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> + +# Total code points: 3778 + +# ================================================ + +0149 ; Deprecated # L& LATIN SMALL LETTER N PRECEDED BY APOSTROPHE +0673 ; Deprecated # Lo ARABIC LETTER ALEF WITH WAVY HAMZA BELOW +0F77 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC RR +0F79 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC LL +17A3..17A4 ; Deprecated # Lo [2] KHMER INDEPENDENT VOWEL QAQ..KHMER INDEPENDENT VOWEL QAA +206A..206F ; Deprecated # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +2329 ; Deprecated # Ps LEFT-POINTING ANGLE BRACKET +232A ; Deprecated # Pe RIGHT-POINTING ANGLE BRACKET +E0001 ; Deprecated # Cf LANGUAGE TAG +E0020..E007F ; Deprecated # Cf [96] TAG SPACE..CANCEL TAG + +# Total code points: 111 + +# ================================================ + +0069..006A ; Soft_Dotted # L& [2] LATIN SMALL LETTER I..LATIN SMALL LETTER J +012F ; Soft_Dotted # L& LATIN SMALL LETTER I WITH OGONEK +0249 ; Soft_Dotted # L& LATIN SMALL LETTER J WITH STROKE +0268 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH STROKE +029D ; Soft_Dotted # L& LATIN SMALL LETTER J WITH CROSSED-TAIL +02B2 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J +03F3 ; Soft_Dotted # L& GREEK LETTER YOT +0456 ; Soft_Dotted # L& CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I +0458 ; Soft_Dotted # L& CYRILLIC SMALL LETTER JE +1D62 ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER I +1D96 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH RETROFLEX HOOK +1DA4 ; Soft_Dotted # Lm MODIFIER LETTER SMALL I WITH STROKE +1DA8 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J WITH CROSSED-TAIL +1E2D ; Soft_Dotted # L& LATIN SMALL LETTER I WITH TILDE BELOW +1ECB ; Soft_Dotted # L& LATIN SMALL LETTER I WITH DOT BELOW +2071 ; Soft_Dotted # Lm SUPERSCRIPT LATIN SMALL LETTER I +2148..2149 ; Soft_Dotted # L& [2] DOUBLE-STRUCK ITALIC SMALL I..DOUBLE-STRUCK ITALIC SMALL J +2C7C ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER J +1D422..1D423 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SMALL I..MATHEMATICAL BOLD SMALL J +1D456..1D457 ; Soft_Dotted # L& [2] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL J +1D48A..1D48B ; Soft_Dotted # L& [2] MATHEMATICAL BOLD ITALIC SMALL I..MATHEMATICAL BOLD ITALIC SMALL J +1D4BE..1D4BF ; Soft_Dotted # L& [2] MATHEMATICAL SCRIPT SMALL I..MATHEMATICAL SCRIPT SMALL J +1D4F2..1D4F3 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SCRIPT SMALL I..MATHEMATICAL BOLD SCRIPT SMALL J +1D526..1D527 ; Soft_Dotted # L& [2] MATHEMATICAL FRAKTUR SMALL I..MATHEMATICAL FRAKTUR SMALL J +1D55A..1D55B ; Soft_Dotted # L& [2] MATHEMATICAL DOUBLE-STRUCK SMALL I..MATHEMATICAL DOUBLE-STRUCK SMALL J +1D58E..1D58F ; Soft_Dotted # L& [2] MATHEMATICAL BOLD FRAKTUR SMALL I..MATHEMATICAL BOLD FRAKTUR SMALL J +1D5C2..1D5C3 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF SMALL I..MATHEMATICAL SANS-SERIF SMALL J +1D5F6..1D5F7 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD SMALL I..MATHEMATICAL SANS-SERIF BOLD SMALL J +1D62A..1D62B ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF ITALIC SMALL I..MATHEMATICAL SANS-SERIF ITALIC SMALL J +1D65E..1D65F ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J +1D692..1D693 ; Soft_Dotted # L& [2] MATHEMATICAL MONOSPACE SMALL I..MATHEMATICAL MONOSPACE SMALL J + +# Total code points: 46 + +# ================================================ + +0E40..0E44 ; Logical_Order_Exception # Lo [5] THAI CHARACTER SARA E..THAI CHARACTER SARA AI MAIMALAI +0EC0..0EC4 ; Logical_Order_Exception # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +AAB5..AAB6 ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL E..TAI VIET VOWEL O +AAB9 ; Logical_Order_Exception # Lo TAI VIET VOWEL UEA +AABB..AABC ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL AUE..TAI VIET VOWEL AY + +# Total code points: 15 + +# ================================================ + +2118 ; Other_ID_Start # Sm SCRIPT CAPITAL P +212E ; Other_ID_Start # So ESTIMATED SYMBOL +309B..309C ; Other_ID_Start # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK + +# Total code points: 4 + +# ================================================ + +00B7 ; Other_ID_Continue # Po MIDDLE DOT +0387 ; Other_ID_Continue # Po GREEK ANO TELEIA +1369..1371 ; Other_ID_Continue # No [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +19DA ; Other_ID_Continue # No NEW TAI LUE THAM DIGIT ONE + +# Total code points: 12 + +# ================================================ + +0021 ; STerm # Po EXCLAMATION MARK +002E ; STerm # Po FULL STOP +003F ; STerm # Po QUESTION MARK +055C ; STerm # Po ARMENIAN EXCLAMATION MARK +055E ; STerm # Po ARMENIAN QUESTION MARK +0589 ; STerm # Po ARMENIAN FULL STOP +061F ; STerm # Po ARABIC QUESTION MARK +06D4 ; STerm # Po ARABIC FULL STOP +0700..0702 ; STerm # Po [3] SYRIAC END OF PARAGRAPH..SYRIAC SUBLINEAR FULL STOP +07F9 ; STerm # Po NKO EXCLAMATION MARK +0964..0965 ; STerm # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +104A..104B ; STerm # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION +1362 ; STerm # Po ETHIOPIC FULL STOP +1367..1368 ; STerm # Po [2] ETHIOPIC QUESTION MARK..ETHIOPIC PARAGRAPH SEPARATOR +166E ; STerm # Po CANADIAN SYLLABICS FULL STOP +1735..1736 ; STerm # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1803 ; STerm # Po MONGOLIAN FULL STOP +1809 ; STerm # Po MONGOLIAN MANCHU FULL STOP +1944..1945 ; STerm # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK +1AA8..1AAB ; STerm # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B5A..1B5B ; STerm # Po [2] BALINESE PANTI..BALINESE PAMADA +1B5E..1B5F ; STerm # Po [2] BALINESE CARIK SIKI..BALINESE CARIK PAREREN +1C3B..1C3C ; STerm # Po [2] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION NYET THYOOM TA-ROL +1C7E..1C7F ; STerm # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +203C..203D ; STerm # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +2047..2049 ; STerm # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2E2E ; STerm # Po REVERSED QUESTION MARK +3002 ; STerm # Po IDEOGRAPHIC FULL STOP +A4FF ; STerm # Po LISU PUNCTUATION FULL STOP +A60E..A60F ; STerm # Po [2] VAI FULL STOP..VAI QUESTION MARK +A6F3 ; STerm # Po BAMUM FULL STOP +A6F7 ; STerm # Po BAMUM QUESTION MARK +A876..A877 ; STerm # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD +A8CE..A8CF ; STerm # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA +A92F ; STerm # Po KAYAH LI SIGN SHYA +A9C8..A9C9 ; STerm # Po [2] JAVANESE PADA LINGSA..JAVANESE PADA LUNGSI +AA5D..AA5F ; STerm # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA +ABEB ; STerm # Po MEETEI MAYEK CHEIKHEI +FE52 ; STerm # Po SMALL FULL STOP +FE56..FE57 ; STerm # Po [2] SMALL QUESTION MARK..SMALL EXCLAMATION MARK +FF01 ; STerm # Po FULLWIDTH EXCLAMATION MARK +FF0E ; STerm # Po FULLWIDTH FULL STOP +FF1F ; STerm # Po FULLWIDTH QUESTION MARK +FF61 ; STerm # Po HALFWIDTH IDEOGRAPHIC FULL STOP +10A56..10A57 ; STerm # Po [2] KHAROSHTHI PUNCTUATION DANDA..KHAROSHTHI PUNCTUATION DOUBLE DANDA +11047..11048 ; STerm # Po [2] BRAHMI DANDA..BRAHMI DOUBLE DANDA +110BE..110C1 ; STerm # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA + +# Total code points: 76 + +# ================================================ + +180B..180D ; Variation_Selector # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +FE00..FE0F ; Variation_Selector # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +E0100..E01EF ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 + +# Total code points: 259 + +# ================================================ + +0009..000D ; Pattern_White_Space # Cc [5] <control-0009>..<control-000D> +0020 ; Pattern_White_Space # Zs SPACE +0085 ; Pattern_White_Space # Cc <control-0085> +200E..200F ; Pattern_White_Space # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK +2028 ; Pattern_White_Space # Zl LINE SEPARATOR +2029 ; Pattern_White_Space # Zp PARAGRAPH SEPARATOR + +# Total code points: 11 + +# ================================================ + +0021..0023 ; Pattern_Syntax # Po [3] EXCLAMATION MARK..NUMBER SIGN +0024 ; Pattern_Syntax # Sc DOLLAR SIGN +0025..0027 ; Pattern_Syntax # Po [3] PERCENT SIGN..APOSTROPHE +0028 ; Pattern_Syntax # Ps LEFT PARENTHESIS +0029 ; Pattern_Syntax # Pe RIGHT PARENTHESIS +002A ; Pattern_Syntax # Po ASTERISK +002B ; Pattern_Syntax # Sm PLUS SIGN +002C ; Pattern_Syntax # Po COMMA +002D ; Pattern_Syntax # Pd HYPHEN-MINUS +002E..002F ; Pattern_Syntax # Po [2] FULL STOP..SOLIDUS +003A..003B ; Pattern_Syntax # Po [2] COLON..SEMICOLON +003C..003E ; Pattern_Syntax # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN +003F..0040 ; Pattern_Syntax # Po [2] QUESTION MARK..COMMERCIAL AT +005B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET +005C ; Pattern_Syntax # Po REVERSE SOLIDUS +005D ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET +005E ; Pattern_Syntax # Sk CIRCUMFLEX ACCENT +0060 ; Pattern_Syntax # Sk GRAVE ACCENT +007B ; Pattern_Syntax # Ps LEFT CURLY BRACKET +007C ; Pattern_Syntax # Sm VERTICAL LINE +007D ; Pattern_Syntax # Pe RIGHT CURLY BRACKET +007E ; Pattern_Syntax # Sm TILDE +00A1 ; Pattern_Syntax # Po INVERTED EXCLAMATION MARK +00A2..00A5 ; Pattern_Syntax # Sc [4] CENT SIGN..YEN SIGN +00A6..00A7 ; Pattern_Syntax # So [2] BROKEN BAR..SECTION SIGN +00A9 ; Pattern_Syntax # So COPYRIGHT SIGN +00AB ; Pattern_Syntax # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00AC ; Pattern_Syntax # Sm NOT SIGN +00AE ; Pattern_Syntax # So REGISTERED SIGN +00B0 ; Pattern_Syntax # So DEGREE SIGN +00B1 ; Pattern_Syntax # Sm PLUS-MINUS SIGN +00B6 ; Pattern_Syntax # So PILCROW SIGN +00BB ; Pattern_Syntax # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +00BF ; Pattern_Syntax # Po INVERTED QUESTION MARK +00D7 ; Pattern_Syntax # Sm MULTIPLICATION SIGN +00F7 ; Pattern_Syntax # Sm DIVISION SIGN +2010..2015 ; Pattern_Syntax # Pd [6] HYPHEN..HORIZONTAL BAR +2016..2017 ; Pattern_Syntax # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE +2018 ; Pattern_Syntax # Pi LEFT SINGLE QUOTATION MARK +2019 ; Pattern_Syntax # Pf RIGHT SINGLE QUOTATION MARK +201A ; Pattern_Syntax # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; Pattern_Syntax # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; Pattern_Syntax # Pf RIGHT DOUBLE QUOTATION MARK +201E ; Pattern_Syntax # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; Pattern_Syntax # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2020..2027 ; Pattern_Syntax # Po [8] DAGGER..HYPHENATION POINT +2030..2038 ; Pattern_Syntax # Po [9] PER MILLE SIGN..CARET +2039 ; Pattern_Syntax # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Pattern_Syntax # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +203B..203E ; Pattern_Syntax # Po [4] REFERENCE MARK..OVERLINE +2041..2043 ; Pattern_Syntax # Po [3] CARET INSERTION POINT..HYPHEN BULLET +2044 ; Pattern_Syntax # Sm FRACTION SLASH +2045 ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH QUILL +2047..2051 ; Pattern_Syntax # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2052 ; Pattern_Syntax # Sm COMMERCIAL MINUS SIGN +2053 ; Pattern_Syntax # Po SWUNG DASH +2055..205E ; Pattern_Syntax # Po [10] FLOWER PUNCTUATION MARK..VERTICAL FOUR DOTS +2190..2194 ; Pattern_Syntax # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +2195..2199 ; Pattern_Syntax # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219A..219B ; Pattern_Syntax # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +219C..219F ; Pattern_Syntax # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A0 ; Pattern_Syntax # Sm RIGHTWARDS TWO HEADED ARROW +21A1..21A2 ; Pattern_Syntax # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A3 ; Pattern_Syntax # Sm RIGHTWARDS ARROW WITH TAIL +21A4..21A5 ; Pattern_Syntax # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A6 ; Pattern_Syntax # Sm RIGHTWARDS ARROW FROM BAR +21A7..21AD ; Pattern_Syntax # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AE ; Pattern_Syntax # Sm LEFT RIGHT ARROW WITH STROKE +21AF..21CD ; Pattern_Syntax # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21CE..21CF ; Pattern_Syntax # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; Pattern_Syntax # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D2 ; Pattern_Syntax # Sm RIGHTWARDS DOUBLE ARROW +21D3 ; Pattern_Syntax # So DOWNWARDS DOUBLE ARROW +21D4 ; Pattern_Syntax # Sm LEFT RIGHT DOUBLE ARROW +21D5..21F3 ; Pattern_Syntax # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW +21F4..22FF ; Pattern_Syntax # Sm [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP +2300..2307 ; Pattern_Syntax # So [8] DIAMETER SIGN..WAVY LINE +2308..230B ; Pattern_Syntax # Sm [4] LEFT CEILING..RIGHT FLOOR +230C..231F ; Pattern_Syntax # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER +2320..2321 ; Pattern_Syntax # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2322..2328 ; Pattern_Syntax # So [7] FROWN..KEYBOARD +2329 ; Pattern_Syntax # Ps LEFT-POINTING ANGLE BRACKET +232A ; Pattern_Syntax # Pe RIGHT-POINTING ANGLE BRACKET +232B..237B ; Pattern_Syntax # So [81] ERASE TO THE LEFT..NOT CHECK MARK +237C ; Pattern_Syntax # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +237D..239A ; Pattern_Syntax # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL +239B..23B3 ; Pattern_Syntax # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +23B4..23DB ; Pattern_Syntax # So [40] TOP SQUARE BRACKET..FUSE +23DC..23E1 ; Pattern_Syntax # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET +23E2..23F3 ; Pattern_Syntax # So [18] WHITE TRAPEZIUM..HOURGLASS WITH FLOWING SAND +23F4..23FF ; Pattern_Syntax # Cn [12] <reserved-23F4>..<reserved-23FF> +2400..2426 ; Pattern_Syntax # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2427..243F ; Pattern_Syntax # Cn [25] <reserved-2427>..<reserved-243F> +2440..244A ; Pattern_Syntax # So [11] OCR HOOK..OCR DOUBLE BACKSLASH +244B..245F ; Pattern_Syntax # Cn [21] <reserved-244B>..<reserved-245F> +2500..25B6 ; Pattern_Syntax # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE +25B7 ; Pattern_Syntax # Sm WHITE RIGHT-POINTING TRIANGLE +25B8..25C0 ; Pattern_Syntax # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C1 ; Pattern_Syntax # Sm WHITE LEFT-POINTING TRIANGLE +25C2..25F7 ; Pattern_Syntax # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +25F8..25FF ; Pattern_Syntax # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +2600..266E ; Pattern_Syntax # So [111] BLACK SUN WITH RAYS..MUSIC NATURAL SIGN +266F ; Pattern_Syntax # Sm MUSIC SHARP SIGN +2670..26FF ; Pattern_Syntax # So [144] WEST SYRIAC CROSS..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE +2700 ; Pattern_Syntax # Cn <reserved-2700> +2701..2767 ; Pattern_Syntax # So [103] UPPER BLADE SCISSORS..ROTATED FLORAL HEART BULLET +2768 ; Pattern_Syntax # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; Pattern_Syntax # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; Pattern_Syntax # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; Pattern_Syntax # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; Pattern_Syntax # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; Pattern_Syntax # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; Pattern_Syntax # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; Pattern_Syntax # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; Pattern_Syntax # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; Pattern_Syntax # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +2794..27BF ; Pattern_Syntax # So [44] HEAVY WIDE-HEADED RIGHTWARDS ARROW..DOUBLE CURLY LOOP +27C0..27C4 ; Pattern_Syntax # Sm [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET +27C5 ; Pattern_Syntax # Ps LEFT S-SHAPED BAG DELIMITER +27C6 ; Pattern_Syntax # Pe RIGHT S-SHAPED BAG DELIMITER +27C7..27CA ; Pattern_Syntax # Sm [4] OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE +27CB ; Pattern_Syntax # Cn <reserved-27CB> +27CC ; Pattern_Syntax # Sm LONG DIVISION +27CD ; Pattern_Syntax # Cn <reserved-27CD> +27CE..27E5 ; Pattern_Syntax # Sm [24] SQUARED LOGICAL AND..WHITE SQUARE WITH RIGHTWARDS TICK +27E6 ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Pattern_Syntax # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Pattern_Syntax # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Pattern_Syntax # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27EC ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET +27ED ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET +27EE ; Pattern_Syntax # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS +27EF ; Pattern_Syntax # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS +27F0..27FF ; Pattern_Syntax # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2800..28FF ; Pattern_Syntax # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2900..2982 ; Pattern_Syntax # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2983 ; Pattern_Syntax # Ps LEFT WHITE CURLY BRACKET +2984 ; Pattern_Syntax # Pe RIGHT WHITE CURLY BRACKET +2985 ; Pattern_Syntax # Ps LEFT WHITE PARENTHESIS +2986 ; Pattern_Syntax # Pe RIGHT WHITE PARENTHESIS +2987 ; Pattern_Syntax # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Pattern_Syntax # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Pattern_Syntax # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Pattern_Syntax # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Pattern_Syntax # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Pattern_Syntax # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Pattern_Syntax # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Pattern_Syntax # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Pattern_Syntax # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Pattern_Syntax # Pe RIGHT BLACK TORTOISE SHELL BRACKET +2999..29D7 ; Pattern_Syntax # Sm [63] DOTTED FENCE..BLACK HOURGLASS +29D8 ; Pattern_Syntax # Ps LEFT WIGGLY FENCE +29D9 ; Pattern_Syntax # Pe RIGHT WIGGLY FENCE +29DA ; Pattern_Syntax # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Pattern_Syntax # Pe RIGHT DOUBLE WIGGLY FENCE +29DC..29FB ; Pattern_Syntax # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FC ; Pattern_Syntax # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Pattern_Syntax # Pe RIGHT-POINTING CURVED ANGLE BRACKET +29FE..2AFF ; Pattern_Syntax # Sm [258] TINY..N-ARY WHITE VERTICAL BAR +2B00..2B2F ; Pattern_Syntax # So [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE +2B30..2B44 ; Pattern_Syntax # Sm [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET +2B45..2B46 ; Pattern_Syntax # So [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW +2B47..2B4C ; Pattern_Syntax # Sm [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR +2B4D..2B4F ; Pattern_Syntax # Cn [3] <reserved-2B4D>..<reserved-2B4F> +2B50..2B59 ; Pattern_Syntax # So [10] WHITE MEDIUM STAR..HEAVY CIRCLED SALTIRE +2B5A..2BFF ; Pattern_Syntax # Cn [166] <reserved-2B5A>..<reserved-2BFF> +2E00..2E01 ; Pattern_Syntax # Po [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER +2E02 ; Pattern_Syntax # Pi LEFT SUBSTITUTION BRACKET +2E03 ; Pattern_Syntax # Pf RIGHT SUBSTITUTION BRACKET +2E04 ; Pattern_Syntax # Pi LEFT DOTTED SUBSTITUTION BRACKET +2E05 ; Pattern_Syntax # Pf RIGHT DOTTED SUBSTITUTION BRACKET +2E06..2E08 ; Pattern_Syntax # Po [3] RAISED INTERPOLATION MARKER..DOTTED TRANSPOSITION MARKER +2E09 ; Pattern_Syntax # Pi LEFT TRANSPOSITION BRACKET +2E0A ; Pattern_Syntax # Pf RIGHT TRANSPOSITION BRACKET +2E0B ; Pattern_Syntax # Po RAISED SQUARE +2E0C ; Pattern_Syntax # Pi LEFT RAISED OMISSION BRACKET +2E0D ; Pattern_Syntax # Pf RIGHT RAISED OMISSION BRACKET +2E0E..2E16 ; Pattern_Syntax # Po [9] EDITORIAL CORONIS..DOTTED RIGHT-POINTING ANGLE +2E17 ; Pattern_Syntax # Pd DOUBLE OBLIQUE HYPHEN +2E18..2E19 ; Pattern_Syntax # Po [2] INVERTED INTERROBANG..PALM BRANCH +2E1A ; Pattern_Syntax # Pd HYPHEN WITH DIAERESIS +2E1B ; Pattern_Syntax # Po TILDE WITH RING ABOVE +2E1C ; Pattern_Syntax # Pi LEFT LOW PARAPHRASE BRACKET +2E1D ; Pattern_Syntax # Pf RIGHT LOW PARAPHRASE BRACKET +2E1E..2E1F ; Pattern_Syntax # Po [2] TILDE WITH DOT ABOVE..TILDE WITH DOT BELOW +2E20 ; Pattern_Syntax # Pi LEFT VERTICAL BAR WITH QUILL +2E21 ; Pattern_Syntax # Pf RIGHT VERTICAL BAR WITH QUILL +2E22 ; Pattern_Syntax # Ps TOP LEFT HALF BRACKET +2E23 ; Pattern_Syntax # Pe TOP RIGHT HALF BRACKET +2E24 ; Pattern_Syntax # Ps BOTTOM LEFT HALF BRACKET +2E25 ; Pattern_Syntax # Pe BOTTOM RIGHT HALF BRACKET +2E26 ; Pattern_Syntax # Ps LEFT SIDEWAYS U BRACKET +2E27 ; Pattern_Syntax # Pe RIGHT SIDEWAYS U BRACKET +2E28 ; Pattern_Syntax # Ps LEFT DOUBLE PARENTHESIS +2E29 ; Pattern_Syntax # Pe RIGHT DOUBLE PARENTHESIS +2E2A..2E2E ; Pattern_Syntax # Po [5] TWO DOTS OVER ONE DOT PUNCTUATION..REVERSED QUESTION MARK +2E2F ; Pattern_Syntax # Lm VERTICAL TILDE +2E30..2E31 ; Pattern_Syntax # Po [2] RING POINT..WORD SEPARATOR MIDDLE DOT +2E32..2E7F ; Pattern_Syntax # Cn [78] <reserved-2E32>..<reserved-2E7F> +3001..3003 ; Pattern_Syntax # Po [3] IDEOGRAPHIC COMMA..DITTO MARK +3008 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET +3009 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET +300A ; Pattern_Syntax # Ps LEFT DOUBLE ANGLE BRACKET +300B ; Pattern_Syntax # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; Pattern_Syntax # Ps LEFT CORNER BRACKET +300D ; Pattern_Syntax # Pe RIGHT CORNER BRACKET +300E ; Pattern_Syntax # Ps LEFT WHITE CORNER BRACKET +300F ; Pattern_Syntax # Pe RIGHT WHITE CORNER BRACKET +3010 ; Pattern_Syntax # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; Pattern_Syntax # Pe RIGHT BLACK LENTICULAR BRACKET +3012..3013 ; Pattern_Syntax # So [2] POSTAL MARK..GETA MARK +3014 ; Pattern_Syntax # Ps LEFT TORTOISE SHELL BRACKET +3015 ; Pattern_Syntax # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; Pattern_Syntax # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; Pattern_Syntax # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; Pattern_Syntax # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; Pattern_Syntax # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; Pattern_Syntax # Ps LEFT WHITE SQUARE BRACKET +301B ; Pattern_Syntax # Pe RIGHT WHITE SQUARE BRACKET +301C ; Pattern_Syntax # Pd WAVE DASH +301D ; Pattern_Syntax # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Pattern_Syntax # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +3020 ; Pattern_Syntax # So POSTAL MARK FACE +3030 ; Pattern_Syntax # Pd WAVY DASH +FD3E ; Pattern_Syntax # Ps ORNATE LEFT PARENTHESIS +FD3F ; Pattern_Syntax # Pe ORNATE RIGHT PARENTHESIS +FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT + +# Total code points: 2760 + +# EOF diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Double/ParseDouble.java --- a/jdk/test/java/lang/Double/ParseDouble.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Double/ParseDouble.java Sat May 14 11:52:15 2011 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4160406 4705734 4707389 4826774 4895911 4421494 7021568 + * @bug 4160406 4705734 4707389 4826774 4895911 4421494 7021568 7039369 * @summary Test for Double.parseDouble method and acceptance regex */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/ProcessBuilder/Basic.java --- a/jdk/test/java/lang/ProcessBuilder/Basic.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/ProcessBuilder/Basic.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,7 @@ * @bug 4199068 4738465 4937983 4930681 4926230 4931433 4932663 4986689 * 5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313 * 6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958 - * 4947220 7018606 + * 4947220 7018606 7034570 * @summary Basic tests for Process and Environment Variable code * @run main/othervm/timeout=300 Basic * @author Martin Buchholz @@ -1440,11 +1440,12 @@ // Check for sort order of environment variables on Windows. //---------------------------------------------------------------- try { + String systemRoot = "SystemRoot=" + System.getenv("SystemRoot"); // '+' < 'A' < 'Z' < '_' < 'a' < 'z' < '~' String[]envp = {"FOO=BAR","BAZ=GORP","QUUX=", - "+=+", "_=_", "~=~"}; + "+=+", "_=_", "~=~", systemRoot}; String output = nativeEnv(envp); - String expected = "+=+\nBAZ=GORP\nFOO=BAR\nQUUX=\n_=_\n~=~\n"; + String expected = "+=+\nBAZ=GORP\nFOO=BAR\nQUUX=\n"+systemRoot+"\n_=_\n~=~\n"; // On Windows, Java must keep the environment sorted. // Order is random on Unix, so this test does the sort. if (! Windows.is()) @@ -1453,6 +1454,21 @@ } catch (Throwable t) { unexpected(t); } //---------------------------------------------------------------- + // Test Runtime.exec(...envp...) + // and check SystemRoot gets set automatically on Windows + //---------------------------------------------------------------- + try { + if (Windows.is()) { + String systemRoot = "SystemRoot=" + System.getenv("SystemRoot"); + String[]envp = {"FOO=BAR","BAZ=GORP","QUUX=", + "+=+", "_=_", "~=~"}; + String output = nativeEnv(envp); + String expected = "+=+\nBAZ=GORP\nFOO=BAR\nQUUX=\n"+systemRoot+"\n_=_\n~=~\n"; + equal(output, expected); + } + } catch (Throwable t) { unexpected(t); } + + //---------------------------------------------------------------- // System.getenv() must be consistent with System.getenv(String) //---------------------------------------------------------------- try { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Throwable/ChainedExceptions.java --- a/jdk/test/java/lang/Throwable/ChainedExceptions.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Throwable/ChainedExceptions.java Sat May 14 11:52:15 2011 -0700 @@ -13,28 +13,28 @@ StackTraceElement[] highTrace = e.getStackTrace(); int depthTrim = highTrace.length - 2; - check(highTrace[0], "a", 48); - check(highTrace[1], "main", 11); + check(e, highTrace[0], "a", 48); + check(e, highTrace[1], "main", 11); Throwable mid = e.getCause(); StackTraceElement[] midTrace = mid.getStackTrace(); if (midTrace.length - depthTrim != 4) throw new RuntimeException("Mid depth"); - check(midTrace[0], "c", 58); - check(midTrace[1], "b", 52); - check(midTrace[2], "a", 46); - check(midTrace[3], "main", 11); + check(mid, midTrace[0], "c", 58); + check(mid, midTrace[1], "b", 52); + check(mid, midTrace[2], "a", 46); + check(mid, midTrace[3], "main", 11); Throwable low = mid.getCause(); StackTraceElement[] lowTrace = low.getStackTrace(); if (lowTrace.length - depthTrim != 6) throw new RuntimeException("Low depth"); - check(lowTrace[0], "e", 65); - check(lowTrace[1], "d", 62); - check(lowTrace[2], "c", 56); - check(lowTrace[3], "b", 52); - check(lowTrace[4], "a", 46); - check(lowTrace[5], "main", 11); + check(low, lowTrace[0], "e", 65); + check(low, lowTrace[1], "d", 62); + check(low, lowTrace[2], "c", 56); + check(low, lowTrace[3], "b", 52); + check(low, lowTrace[4], "a", 46); + check(low, lowTrace[5], "main", 11); if (low.getCause() != null) throw new RuntimeException("Low cause != null"); @@ -68,15 +68,15 @@ private static final String OUR_CLASS = ChainedExceptions.class.getName(); private static final String OUR_FILE_NAME = "ChainedExceptions.java"; - private static void check(StackTraceElement e, String methodName, int n) { + private static void check(Throwable t, StackTraceElement e, String methodName, int n) { if (!e.getClassName().equals(OUR_CLASS)) - throw new RuntimeException("Class: " + e); + throw new RuntimeException("Class: " + e, t); if (!e.getMethodName().equals(methodName)) - throw new RuntimeException("Method name: " + e); + throw new RuntimeException("Method name: " + e, t); if (!e.getFileName().equals(OUR_FILE_NAME)) - throw new RuntimeException("File name: " + e); + throw new RuntimeException("File name: " + e, t); if (e.getLineNumber() != n) - throw new RuntimeException("Line number: " + e); + throw new RuntimeException("Line number: " + e, t); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Throwable/StackTraceSerialization.java --- a/jdk/test/java/lang/Throwable/StackTraceSerialization.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Throwable/StackTraceSerialization.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ /* * @test - * @bug 4202914 4363318 6991528 + * @bug 4202914 4363318 6991528 6998871 * @summary Basic test of serialization of stack trace information * @author Josh Bloch */ @@ -37,14 +37,52 @@ testWithFillInStackTrace(); } - private static void testWithSetStackTrace() throws Exception { - Throwable t = new Throwable(); + private static void testWithSetStackTrace() { + StackTraceElement[] stackTrace = {new StackTraceElement("foo", "bar", "baz", -1)}; + + Throwable t = new TestThrowable(true, false); // Immutable and empty stack + assertEmptyStackTrace(t); + + // Verify fillInStackTrace is now a no-op. + t.fillInStackTrace(); + assertEmptyStackTrace(t); + + // Verify setStackTrace is now a no-op. + t.setStackTrace(stackTrace); + assertEmptyStackTrace(t); - t.setStackTrace(new StackTraceElement[] - {new StackTraceElement("foo", "bar", "baz", -1)}); + // Verify null-handling + try { + t.setStackTrace(null); + throw new RuntimeException("No NPE on a null stack trace."); + } catch(NullPointerException npe) { + assertEmptyStackTrace(t); + } + + try { + t.setStackTrace(new StackTraceElement[]{null}); + throw new RuntimeException("No NPE on a null stack trace element."); + } catch(NullPointerException npe) { + assertEmptyStackTrace(t); + } if (!equal(t, reconstitute(t))) - throw new Exception("Unequal Throwables with set stacktrace"); + throw new RuntimeException("Unequal Throwables with set stacktrace"); + + Throwable t2 = new Throwable(); + t2.setStackTrace(stackTrace); + if (!equal(t2, reconstitute(t2))) + throw new RuntimeException("Unequal Throwables with set stacktrace"); + + } + + private static class TestThrowable extends Throwable { + public TestThrowable(boolean enableSuppression, + boolean writableStackTrace) { + super("the medium", null, + enableSuppression, + writableStackTrace); + } } private static void assertEmptyStackTrace(Throwable t) { @@ -52,7 +90,7 @@ throw new AssertionError("Nonempty stacktrace."); } - private static void testWithFillInStackTrace() throws Exception { + private static void testWithFillInStackTrace() { Throwable original = null; try { a(); @@ -61,16 +99,14 @@ } if (!equal(original, reconstitute(original))) - throw new Exception("Unequal Throwables with filled-in stacktrace"); + throw new RuntimeException("Unequal Throwables with filled-in stacktrace"); } - /** * Serialize the argument and return the deserialized result. */ - private static Throwable reconstitute(Throwable t) throws Exception { + private static Throwable reconstitute(Throwable t) { Throwable result = null; - try(ByteArrayOutputStream bout = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream(bout)) { out.writeObject(t); @@ -80,8 +116,9 @@ ObjectInputStream in = new ObjectInputStream(bin)) { result = (Throwable) in.readObject(); } + } catch(IOException | ClassNotFoundException e) { + throw new RuntimeException(e); } - return result; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Throwable/SuppressedExceptions.java --- a/jdk/test/java/lang/Throwable/SuppressedExceptions.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Throwable/SuppressedExceptions.java Sat May 14 11:52:15 2011 -0700 @@ -193,6 +193,7 @@ // Make sure addSuppressed(null) throws an NPE try { t.addSuppressed(null); + throw new RuntimeException("NPE not thrown!"); } catch(NullPointerException e) { ; // Expected } @@ -204,7 +205,7 @@ private static class NoSuppression extends Throwable { public NoSuppression(boolean enableSuppression) { - super("The medium.", null, enableSuppression); + super("The medium.", null, enableSuppression, true); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/nio/charset/StandardCharset/Standard.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/nio/charset/StandardCharset/Standard.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2011, 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 4884238 + * @summary Test standard charset name constants. + * @author Mike Duigou + * @run main Standard + */ + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.io.*; +import java.nio.charset.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +public class Standard { + + private final static String standardCharsets[] = { + "US-ASCII", "ISO-8859-1", "UTF-8", + "UTF-16BE", "UTF-16LE", "UTF-16" }; + + public static void realMain(String[] args) { + check(StandardCharset.US_ASCII instanceof Charset); + check(StandardCharset.ISO_8859_1 instanceof Charset); + check(StandardCharset.UTF_8 instanceof Charset); + check(StandardCharset.UTF_16BE instanceof Charset); + check(StandardCharset.UTF_16LE instanceof Charset); + check(StandardCharset.UTF_16 instanceof Charset); + + check("US-ASCII".equals(StandardCharset.US_ASCII.name())); + check("ISO-8859-1".equals(StandardCharset.ISO_8859_1.name())); + check("UTF-8".equals(StandardCharset.UTF_8.name())); + check("UTF-16BE".equals(StandardCharset.UTF_16BE.name())); + check("UTF-16LE".equals(StandardCharset.UTF_16LE.name())); + check("UTF-16".equals(StandardCharset.UTF_16.name())); + + Set<String> charsets = new HashSet<>(); + Field standardCharsetFields[] = StandardCharset.class.getFields(); + + for(Field charsetField : standardCharsetFields) { + check(StandardCharset.class == charsetField.getDeclaringClass()); + check(Modifier.isFinal(charsetField.getModifiers())); + check(Modifier.isStatic(charsetField.getModifiers())); + check(Modifier.isPublic(charsetField.getModifiers())); + Object value; + try { + value = charsetField.get(null); + } catch(IllegalAccessException failure) { + unexpected(failure); + continue; + } + check(value instanceof Charset); + charsets.add(((Charset)value).name()); + } + + check(charsets.containsAll(Arrays.asList(standardCharsets))); + charsets.removeAll(Arrays.asList(standardCharsets)); + check(charsets.isEmpty()); + } + + //--------------------- Infrastructure --------------------------- + static volatile int passed = 0, failed = 0; + static void pass() { passed++; } + static void fail() { failed++; Thread.dumpStack(); } + static void fail(String msg) { System.out.println(msg); fail(); } + static void unexpected(Throwable t) { failed++; t.printStackTrace(); } + static void check(boolean cond) { if (cond) pass(); else fail(); } + static void equal(Object x, Object y) { + if (x == null ? y == null : x.equals(y)) pass(); + else {System.out.println(x + " not equal to " + y); fail();}} + static void equal2(Object x, Object y) {equal(x, y); equal(y, x);} + public static void main(String[] args) throws Throwable { + try { realMain(args); } catch (Throwable t) { unexpected(t); } + + System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); + if (failed > 0) throw new Exception("Some tests failed"); + } + private static abstract class Fun {abstract void f() throws Throwable;} + private static void THROWS(Class<? extends Throwable> k, Fun... fs) { + for (Fun f : fs) + try { f.f(); fail("Expected " + k.getName() + " not thrown"); } + catch (Throwable t) { + if (k.isAssignableFrom(t.getClass())) pass(); + else unexpected(t);}} + static byte[] serializedForm(Object obj) { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + new ObjectOutputStream(baos).writeObject(obj); + return baos.toByteArray(); + } catch (IOException e) { throw new Error(e); }} + static Object readObject(byte[] bytes) + throws IOException, ClassNotFoundException { + InputStream is = new ByteArrayInputStream(bytes); + return new ObjectInputStream(is).readObject();} + @SuppressWarnings("unchecked") + static <T> T serialClone(T obj) { + try { return (T) readObject(serializedForm(obj)); } + catch (Exception e) { throw new Error(e); }} + +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/security/spec/EllipticCurveMatch.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/security/spec/EllipticCurveMatch.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2011, 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 6738532 + * @summary Check EllipticCurve.equals() does not compare seed value of curve. + * @run main/othervm EllipticCurveMatch + * @author Mike StJohns + */ + +import java.security.spec.*; +import java.math.BigInteger; +import java.security.SecureRandom; + +public class EllipticCurveMatch { + static String primeP256 = + "0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"; + static String aP256 = + "0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC"; + static String bP256 = + "05AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"; + static String seedP256 = + "0C49D360886E704936A6678E1139D26B7819F7E90"; + + private static EllipticCurve addSeedToCurve(EllipticCurve curve) + { + SecureRandom rand = new SecureRandom(); + byte[] seed = new byte[12]; + rand.nextBytes(seed); + + return new EllipticCurve (curve.getField(), curve.getA(), curve.getB(), + seed); + } + + private static EllipticCurve getP256Curve() + { + ECFieldFp field = new ECFieldFp(new BigInteger (primeP256,16)); + BigInteger a = new BigInteger (aP256, 16); + BigInteger b = new BigInteger (bP256, 16); + + return new EllipticCurve (field, a, b); + } + + public static void main (String[] argv) throws Exception { + EllipticCurve firstCurve = getP256Curve(); + EllipticCurve secondCurve = addSeedToCurve(firstCurve); + EllipticCurve thirdCurve = addSeedToCurve(firstCurve); + + if (!firstCurve.equals(firstCurve)) + throw new Exception("Original curve doesn't equal itself"); + + if (!firstCurve.equals(secondCurve)) + throw new Exception ("Original curve doesn't equal seeded curve"); + + if (!secondCurve.equals(secondCurve)) + throw new Exception ("Seeded curve doesn't equal itself"); + + if (!secondCurve.equals(thirdCurve)) + throw new Exception ("Seeded curve doesn't equal differently " + + "seeded curve"); + System.out.println("Curve equals test passed"); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/Locale/LocaleEnhanceTest.java --- a/jdk/test/java/util/Locale/LocaleEnhanceTest.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/Locale/LocaleEnhanceTest.java Sat May 14 11:52:15 2011 -0700 @@ -45,7 +45,7 @@ /** * @test - * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 + * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 7044019 * @summary test API changes to Locale * @compile LocaleEnhanceTest.java * @run main/othervm -esa LocaleEnhanceTest @@ -616,11 +616,9 @@ assertEquals("latn US", "Latin", latnLocale.getDisplayScript()); assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript()); - // note, no localization data yet other than US - // this should break when we have localization data for DE Locale.setDefault(Locale.GERMANY); - assertEquals("latn DE", "Latin", latnLocale.getDisplayScript()); - assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript()); + assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript()); + assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript()); Locale.setDefault(oldLocale); } @@ -632,10 +630,8 @@ assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US)); assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US)); - // note, no localization data yet other than US - // this should break when we have localization data for DE - assertEquals("latn DE", "Latin", latnLocale.getDisplayScript(Locale.GERMANY)); - assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript(Locale.GERMANY)); + assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript(Locale.GERMANY)); + assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript(Locale.GERMANY)); } public void testGetDisplayName() { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java --- a/jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,11 +27,9 @@ * @summary Confirm that JarEntry.getCertificates identifies signed entries. */ -import java.io.*; import java.net.URL; import java.security.CodeSigner; import java.security.cert.Certificate; -import java.util.Enumeration; import java.util.jar.*; /* @@ -72,6 +70,9 @@ if (signers == null && certificates == null) { System.out.println("[unsigned]\t" + name + "\t(" + size + " bytes)"); + if (name.equals("Count.class")) { + throw new Exception("Count.class should be signed"); + } } else if (signers != null && certificates != null) { System.out.println("[" + signers.length + (signers.length == 1 ? " signer" : " signers") + "]\t" + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java --- a/jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -37,7 +37,7 @@ public static void main(String...args) throws Throwable { try (JarInputStream jis = new JarInputStream( - new FileInputStream(System.getProperty("tst.src", ".") + + new FileInputStream(System.getProperty("test.src", ".") + System.getProperty("file.separator") + "BadSignedJar.jar"))) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/regex/POSIX_ASCII.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/util/regex/POSIX_ASCII.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2011, 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. + */ + + +final class POSIX_ASCII { + + static final int UPPER = 0x00000100; + + static final int LOWER = 0x00000200; + + static final int DIGIT = 0x00000400; + + static final int SPACE = 0x00000800; + + static final int PUNCT = 0x00001000; + + static final int CNTRL = 0x00002000; + + static final int BLANK = 0x00004000; + + static final int HEX = 0x00008000; + + static final int UNDER = 0x00010000; + + static final int ASCII = 0x0000FF00; + + static final int ALPHA = (UPPER|LOWER); + + static final int ALNUM = (UPPER|LOWER|DIGIT); + + static final int GRAPH = (PUNCT|UPPER|LOWER|DIGIT); + + static final int WORD = (UPPER|LOWER|UNDER|DIGIT); + + static final int XDIGIT = (HEX); + + private static final int[] ctype = new int[] { + CNTRL, /* 00 (NUL) */ + CNTRL, /* 01 (SOH) */ + CNTRL, /* 02 (STX) */ + CNTRL, /* 03 (ETX) */ + CNTRL, /* 04 (EOT) */ + CNTRL, /* 05 (ENQ) */ + CNTRL, /* 06 (ACK) */ + CNTRL, /* 07 (BEL) */ + CNTRL, /* 08 (BS) */ + SPACE+CNTRL+BLANK, /* 09 (HT) */ + SPACE+CNTRL, /* 0A (LF) */ + SPACE+CNTRL, /* 0B (VT) */ + SPACE+CNTRL, /* 0C (FF) */ + SPACE+CNTRL, /* 0D (CR) */ + CNTRL, /* 0E (SI) */ + CNTRL, /* 0F (SO) */ + CNTRL, /* 10 (DLE) */ + CNTRL, /* 11 (DC1) */ + CNTRL, /* 12 (DC2) */ + CNTRL, /* 13 (DC3) */ + CNTRL, /* 14 (DC4) */ + CNTRL, /* 15 (NAK) */ + CNTRL, /* 16 (SYN) */ + CNTRL, /* 17 (ETB) */ + CNTRL, /* 18 (CAN) */ + CNTRL, /* 19 (EM) */ + CNTRL, /* 1A (SUB) */ + CNTRL, /* 1B (ESC) */ + CNTRL, /* 1C (FS) */ + CNTRL, /* 1D (GS) */ + CNTRL, /* 1E (RS) */ + CNTRL, /* 1F (US) */ + SPACE+BLANK, /* 20 SPACE */ + PUNCT, /* 21 ! */ + PUNCT, /* 22 " */ + PUNCT, /* 23 # */ + PUNCT, /* 24 $ */ + PUNCT, /* 25 % */ + PUNCT, /* 26 & */ + PUNCT, /* 27 ' */ + PUNCT, /* 28 ( */ + PUNCT, /* 29 ) */ + PUNCT, /* 2A * */ + PUNCT, /* 2B + */ + PUNCT, /* 2C , */ + PUNCT, /* 2D - */ + PUNCT, /* 2E . */ + PUNCT, /* 2F / */ + DIGIT+HEX+0, /* 30 0 */ + DIGIT+HEX+1, /* 31 1 */ + DIGIT+HEX+2, /* 32 2 */ + DIGIT+HEX+3, /* 33 3 */ + DIGIT+HEX+4, /* 34 4 */ + DIGIT+HEX+5, /* 35 5 */ + DIGIT+HEX+6, /* 36 6 */ + DIGIT+HEX+7, /* 37 7 */ + DIGIT+HEX+8, /* 38 8 */ + DIGIT+HEX+9, /* 39 9 */ + PUNCT, /* 3A : */ + PUNCT, /* 3B ; */ + PUNCT, /* 3C < */ + PUNCT, /* 3D = */ + PUNCT, /* 3E > */ + PUNCT, /* 3F ? */ + PUNCT, /* 40 @ */ + UPPER+HEX+10, /* 41 A */ + UPPER+HEX+11, /* 42 B */ + UPPER+HEX+12, /* 43 C */ + UPPER+HEX+13, /* 44 D */ + UPPER+HEX+14, /* 45 E */ + UPPER+HEX+15, /* 46 F */ + UPPER+16, /* 47 G */ + UPPER+17, /* 48 H */ + UPPER+18, /* 49 I */ + UPPER+19, /* 4A J */ + UPPER+20, /* 4B K */ + UPPER+21, /* 4C L */ + UPPER+22, /* 4D M */ + UPPER+23, /* 4E N */ + UPPER+24, /* 4F O */ + UPPER+25, /* 50 P */ + UPPER+26, /* 51 Q */ + UPPER+27, /* 52 R */ + UPPER+28, /* 53 S */ + UPPER+29, /* 54 T */ + UPPER+30, /* 55 U */ + UPPER+31, /* 56 V */ + UPPER+32, /* 57 W */ + UPPER+33, /* 58 X */ + UPPER+34, /* 59 Y */ + UPPER+35, /* 5A Z */ + PUNCT, /* 5B [ */ + PUNCT, /* 5C \ */ + PUNCT, /* 5D ] */ + PUNCT, /* 5E ^ */ + PUNCT|UNDER, /* 5F _ */ + PUNCT, /* 60 ` */ + LOWER+HEX+10, /* 61 a */ + LOWER+HEX+11, /* 62 b */ + LOWER+HEX+12, /* 63 c */ + LOWER+HEX+13, /* 64 d */ + LOWER+HEX+14, /* 65 e */ + LOWER+HEX+15, /* 66 f */ + LOWER+16, /* 67 g */ + LOWER+17, /* 68 h */ + LOWER+18, /* 69 i */ + LOWER+19, /* 6A j */ + LOWER+20, /* 6B k */ + LOWER+21, /* 6C l */ + LOWER+22, /* 6D m */ + LOWER+23, /* 6E n */ + LOWER+24, /* 6F o */ + LOWER+25, /* 70 p */ + LOWER+26, /* 71 q */ + LOWER+27, /* 72 r */ + LOWER+28, /* 73 s */ + LOWER+29, /* 74 t */ + LOWER+30, /* 75 u */ + LOWER+31, /* 76 v */ + LOWER+32, /* 77 w */ + LOWER+33, /* 78 x */ + LOWER+34, /* 79 y */ + LOWER+35, /* 7A z */ + PUNCT, /* 7B { */ + PUNCT, /* 7C | */ + PUNCT, /* 7D } */ + PUNCT, /* 7E ~ */ + CNTRL, /* 7F (DEL) */ + }; + + static int getType(int ch) { + return ((ch & 0xFFFFFF80) == 0 ? ctype[ch] : 0); + } + + static boolean isType(int ch, int type) { + return (getType(ch) & type) != 0; + } + + static boolean isAscii(int ch) { + return ((ch & 0xFFFFFF80) == 0); + } + + static boolean isAlpha(int ch) { + return isType(ch, ALPHA); + } + + static boolean isDigit(int ch) { + return ((ch-'0')|('9'-ch)) >= 0; + } + + static boolean isAlnum(int ch) { + return isType(ch, ALNUM); + } + + static boolean isGraph(int ch) { + return isType(ch, GRAPH); + } + + static boolean isPrint(int ch) { + return ((ch-0x20)|(0x7E-ch)) >= 0; + } + + static boolean isPunct(int ch) { + return isType(ch, PUNCT); + } + + static boolean isSpace(int ch) { + return isType(ch, SPACE); + } + + static boolean isHexDigit(int ch) { + return isType(ch, HEX); + } + + static boolean isCntrl(int ch) { + return isType(ch, CNTRL); + } + + static boolean isLower(int ch) { + return ((ch-'a')|('z'-ch)) >= 0; + } + + static boolean isUpper(int ch) { + return ((ch-'A')|('Z'-ch)) >= 0; + } + + static boolean isWord(int ch) { + return isType(ch, WORD); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/regex/POSIX_Unicode.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/util/regex/POSIX_Unicode.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2011, 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.util.HashMap; +import java.util.Locale; + +final public class POSIX_Unicode { + + public static boolean isAlpha(int ch) { + return Character.isAlphabetic(ch); + } + + public static boolean isLower(int ch) { + return Character.isLowerCase(ch); + } + + public static boolean isUpper(int ch) { + return Character.isUpperCase(ch); + } + + // \p{Whitespace} + public static boolean isSpace(int ch) { + return ((((1 << Character.SPACE_SEPARATOR) | + (1 << Character.LINE_SEPARATOR) | + (1 << Character.PARAGRAPH_SEPARATOR)) >> Character.getType(ch)) & 1) + != 0 || + (ch >= 0x9 && ch <= 0xd) || + (ch == 0x85); + } + + // \p{gc=Control} + public static boolean isCntrl(int ch) { + return Character.getType(ch) == Character.CONTROL; + } + + // \p{gc=Punctuation} + public static boolean isPunct(int ch) { + return ((((1 << Character.CONNECTOR_PUNCTUATION) | + (1 << Character.DASH_PUNCTUATION) | + (1 << Character.START_PUNCTUATION) | + (1 << Character.END_PUNCTUATION) | + (1 << Character.OTHER_PUNCTUATION) | + (1 << Character.INITIAL_QUOTE_PUNCTUATION) | + (1 << Character.FINAL_QUOTE_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0; + } + + // \p{gc=Decimal_Number} + // \p{Hex_Digit} -> PropList.txt: Hex_Digit + public static boolean isHexDigit(int ch) { + return Character.isDigit(ch) || + (ch >= 0x0030 && ch <= 0x0039) || + (ch >= 0x0041 && ch <= 0x0046) || + (ch >= 0x0061 && ch <= 0x0066) || + (ch >= 0xFF10 && ch <= 0xFF19) || + (ch >= 0xFF21 && ch <= 0xFF26) || + (ch >= 0xFF41 && ch <= 0xFF46); + } + + // \p{gc=Decimal_Number} + public static boolean isDigit(int ch) { + return Character.isDigit(ch); + }; + + // \p{alpha} + // \p{digit} + public static boolean isAlnum(int ch) { + return Character.isAlphabetic(ch) || Character.isDigit(ch); + } + + // \p{Whitespace} -- + // [\N{LF} \N{VT} \N{FF} \N{CR} \N{NEL} -> 0xa, 0xb, 0xc, 0xd, 0x85 + // \p{gc=Line_Separator} + // \p{gc=Paragraph_Separator}] + public static boolean isBlank(int ch) { + int type = Character.getType(ch); + return isSpace(ch) && + ch != 0xa & ch != 0xb && ch !=0xc && ch != 0xd && ch != 0x85 && + type != Character.LINE_SEPARATOR && + type != Character.PARAGRAPH_SEPARATOR; + } + + // [^ + // \p{space} + // \p{gc=Control} + // \p{gc=Surrogate} + // \p{gc=Unassigned}] + public static boolean isGraph(int ch) { + int type = Character.getType(ch); + return !(isSpace(ch) || + Character.CONTROL == type || + Character.SURROGATE == type || + Character.UNASSIGNED == type); + } + + // \p{graph} + // \p{blank} + // -- \p{cntrl} + public static boolean isPrint(int ch) { + return (isGraph(ch) || isBlank(ch)) && !isCntrl(ch); + } + + // PropList.txt:Noncharacter_Code_Point + public static boolean isNoncharacterCodePoint(int ch) { + return (ch & 0xfffe) == 0xfffe || (ch >= 0xfdd0 && ch <= 0xfdef); + } + + // \p{alpha} + // \p{gc=Mark} + // \p{digit} + // \p{gc=Connector_Punctuation} + public static boolean isWord(int ch) { + return isAlpha(ch) || + ((((1 << Character.NON_SPACING_MARK) | + (1 << Character.ENCLOSING_MARK) | + (1 << Character.COMBINING_SPACING_MARK) | + (1 << Character.CONNECTOR_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0 || + isDigit(ch); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/regex/RegExTest.java --- a/jdk/test/java/util/regex/RegExTest.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/regex/RegExTest.java Sat May 14 11:52:15 2011 -0700 @@ -32,7 +32,7 @@ * 4872664 4803179 4892980 4900747 4945394 4938995 4979006 4994840 4997476 * 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940 * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133 - * 6350801 6676425 6878475 6919132 6931676 6948903 7014645 + * 6350801 6676425 6878475 6919132 6931676 6948903 7014645 7039066 */ import java.util.regex.*; @@ -137,6 +137,7 @@ nonBmpClassComplementTest(); unicodePropertiesTest(); unicodeHexNotationTest(); + unicodeClassesTest(); if (failure) throw new RuntimeException("Failure in the RE handling."); else @@ -3656,5 +3657,146 @@ failCount++; } report("unicodeHexNotation"); - } + } + + private static void unicodeClassesTest() throws Exception { + + Matcher lower = Pattern.compile("\\p{Lower}").matcher(""); + Matcher upper = Pattern.compile("\\p{Upper}").matcher(""); + Matcher ASCII = Pattern.compile("\\p{ASCII}").matcher(""); + Matcher alpha = Pattern.compile("\\p{Alpha}").matcher(""); + Matcher digit = Pattern.compile("\\p{Digit}").matcher(""); + Matcher alnum = Pattern.compile("\\p{Alnum}").matcher(""); + Matcher punct = Pattern.compile("\\p{Punct}").matcher(""); + Matcher graph = Pattern.compile("\\p{Graph}").matcher(""); + Matcher print = Pattern.compile("\\p{Print}").matcher(""); + Matcher blank = Pattern.compile("\\p{Blank}").matcher(""); + Matcher cntrl = Pattern.compile("\\p{Cntrl}").matcher(""); + Matcher xdigit = Pattern.compile("\\p{XDigit}").matcher(""); + Matcher space = Pattern.compile("\\p{Space}").matcher(""); + Matcher bound = Pattern.compile("\\b").matcher(""); + Matcher word = Pattern.compile("\\w++").matcher(""); + // UNICODE_CHARACTER_CLASS + Matcher lowerU = Pattern.compile("\\p{Lower}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher upperU = Pattern.compile("\\p{Upper}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher ASCIIU = Pattern.compile("\\p{ASCII}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher alphaU = Pattern.compile("\\p{Alpha}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher digitU = Pattern.compile("\\p{Digit}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher alnumU = Pattern.compile("\\p{Alnum}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher punctU = Pattern.compile("\\p{Punct}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher graphU = Pattern.compile("\\p{Graph}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher printU = Pattern.compile("\\p{Print}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher blankU = Pattern.compile("\\p{Blank}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher cntrlU = Pattern.compile("\\p{Cntrl}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher xdigitU = Pattern.compile("\\p{XDigit}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher spaceU = Pattern.compile("\\p{Space}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher boundU = Pattern.compile("\\b", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher wordU = Pattern.compile("\\w", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + // embedded flag (?U) + Matcher lowerEU = Pattern.compile("(?U)\\p{Lower}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher graphEU = Pattern.compile("(?U)\\p{Graph}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher wordEU = Pattern.compile("(?U)\\w", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + + Matcher bwb = Pattern.compile("\\b\\w\\b").matcher(""); + Matcher bwbU = Pattern.compile("\\b\\w++\\b", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher bwbEU = Pattern.compile("(?U)\\b\\w++\\b", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + // properties + Matcher lowerP = Pattern.compile("\\p{IsLowerCase}").matcher(""); + Matcher upperP = Pattern.compile("\\p{IsUpperCase}").matcher(""); + Matcher titleP = Pattern.compile("\\p{IsTitleCase}").matcher(""); + Matcher letterP = Pattern.compile("\\p{IsLetter}").matcher(""); + Matcher alphaP = Pattern.compile("\\p{IsAlphabetic}").matcher(""); + Matcher ideogP = Pattern.compile("\\p{IsIdeographic}").matcher(""); + Matcher cntrlP = Pattern.compile("\\p{IsControl}").matcher(""); + Matcher spaceP = Pattern.compile("\\p{IsWhiteSpace}").matcher(""); + Matcher definedP = Pattern.compile("\\p{IsAssigned}").matcher(""); + Matcher nonCCPP = Pattern.compile("\\p{IsNoncharacterCodePoint}").matcher(""); + + // javaMethod + Matcher lowerJ = Pattern.compile("\\p{javaLowerCase}").matcher(""); + Matcher upperJ = Pattern.compile("\\p{javaUpperCase}").matcher(""); + Matcher alphaJ = Pattern.compile("\\p{javaAlphabetic}").matcher(""); + Matcher ideogJ = Pattern.compile("\\p{javaIdeographic}").matcher(""); + + for (int cp = 1; cp < 0x30000; cp++) { + String str = new String(Character.toChars(cp)); + int type = Character.getType(cp); + if (// lower + POSIX_ASCII.isLower(cp) != lower.reset(str).matches() || + Character.isLowerCase(cp) != lowerU.reset(str).matches() || + Character.isLowerCase(cp) != lowerP.reset(str).matches() || + Character.isLowerCase(cp) != lowerEU.reset(str).matches()|| + Character.isLowerCase(cp) != lowerJ.reset(str).matches()|| + // upper + POSIX_ASCII.isUpper(cp) != upper.reset(str).matches() || + POSIX_Unicode.isUpper(cp) != upperU.reset(str).matches() || + Character.isUpperCase(cp) != upperP.reset(str).matches() || + Character.isUpperCase(cp) != upperJ.reset(str).matches() || + // alpha + POSIX_ASCII.isAlpha(cp) != alpha.reset(str).matches() || + POSIX_Unicode.isAlpha(cp) != alphaU.reset(str).matches() || + Character.isAlphabetic(cp)!= alphaP.reset(str).matches() || + Character.isAlphabetic(cp)!= alphaJ.reset(str).matches() || + // digit + POSIX_ASCII.isDigit(cp) != digit.reset(str).matches() || + Character.isDigit(cp) != digitU.reset(str).matches() || + // alnum + POSIX_ASCII.isAlnum(cp) != alnum.reset(str).matches() || + POSIX_Unicode.isAlnum(cp) != alnumU.reset(str).matches() || + // punct + POSIX_ASCII.isPunct(cp) != punct.reset(str).matches() || + POSIX_Unicode.isPunct(cp) != punctU.reset(str).matches() || + // graph + POSIX_ASCII.isGraph(cp) != graph.reset(str).matches() || + POSIX_Unicode.isGraph(cp) != graphU.reset(str).matches() || + POSIX_Unicode.isGraph(cp) != graphEU.reset(str).matches()|| + // blank + POSIX_ASCII.isType(cp, POSIX_ASCII.BLANK) + != blank.reset(str).matches() || + POSIX_Unicode.isBlank(cp) != blankU.reset(str).matches() || + // print + POSIX_ASCII.isPrint(cp) != print.reset(str).matches() || + POSIX_Unicode.isPrint(cp) != printU.reset(str).matches() || + // cntrl + POSIX_ASCII.isCntrl(cp) != cntrl.reset(str).matches() || + POSIX_Unicode.isCntrl(cp) != cntrlU.reset(str).matches() || + (Character.CONTROL == type) != cntrlP.reset(str).matches() || + // hexdigit + POSIX_ASCII.isHexDigit(cp) != xdigit.reset(str).matches() || + POSIX_Unicode.isHexDigit(cp) != xdigitU.reset(str).matches() || + // space + POSIX_ASCII.isSpace(cp) != space.reset(str).matches() || + POSIX_Unicode.isSpace(cp) != spaceU.reset(str).matches() || + POSIX_Unicode.isSpace(cp) != spaceP.reset(str).matches() || + // word + POSIX_ASCII.isWord(cp) != word.reset(str).matches() || + POSIX_Unicode.isWord(cp) != wordU.reset(str).matches() || + POSIX_Unicode.isWord(cp) != wordEU.reset(str).matches()|| + // bwordb + POSIX_ASCII.isWord(cp) != bwb.reset(str).matches() || + POSIX_Unicode.isWord(cp) != bwbU.reset(str).matches() || + // properties + Character.isTitleCase(cp) != titleP.reset(str).matches() || + Character.isLetter(cp) != letterP.reset(str).matches()|| + Character.isIdeographic(cp) != ideogP.reset(str).matches() || + Character.isIdeographic(cp) != ideogJ.reset(str).matches() || + (Character.UNASSIGNED == type) == definedP.reset(str).matches() || + POSIX_Unicode.isNoncharacterCodePoint(cp) != nonCCPP.reset(str).matches()) + failCount++; + } + + // bounds/word align + twoFindIndexes(" \u0180sherman\u0400 ", bound, 1, 10); + if (!bwbU.reset("\u0180sherman\u0400").matches()) + failCount++; + twoFindIndexes(" \u0180sh\u0345erman\u0400 ", bound, 1, 11); + if (!bwbU.reset("\u0180sh\u0345erman\u0400").matches()) + failCount++; + twoFindIndexes(" \u0724\u0739\u0724 ", bound, 1, 4); + if (!bwbU.reset("\u0724\u0739\u0724").matches()) + failCount++; + if (!bwbEU.reset("\u0724\u0739\u0724").matches()) + failCount++; + report("unicodePredefinedClasses"); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/javax/swing/JFileChooser/7036025/bug7036025.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JFileChooser/7036025/bug7036025.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011, 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 7036025 + @summary java.security.AccessControlException when creating JFileChooser in signed applet + @author Pavel Porvatov + @run main/othervm/policy=security.policy bug7036025 +*/ + +import javax.swing.*; +import java.io.File; + +public class bug7036025 { + public static final String DIR = "c:/temp"; + + public static void main(String[] args) throws Exception { + String systemLookAndFeelClassName = UIManager.getSystemLookAndFeelClassName(); + + if (!systemLookAndFeelClassName.toLowerCase().contains("windows")) { + System.out.println("The test is only for Windows OS."); + + return; + } + + File file = new File(DIR); + + if (!file.exists()) { + if (!file.mkdir()) { + throw new RuntimeException("Cannot create " + DIR); + } + + file.deleteOnExit(); + } + + UIManager.setLookAndFeel(systemLookAndFeelClassName); + + new JFileChooser(file); + + System.out.println("Test passed for LookAndFeel " + UIManager.getLookAndFeel().getName()); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/javax/swing/JFileChooser/7036025/security.policy --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JFileChooser/7036025/security.policy Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,5 @@ +grant { + permission java.io.FilePermission "C:\\temp\\*", "read"; + permission java.io.FilePermission "C:\\temp", "read,write,delete"; + permission java.util.PropertyPermission "*", "read"; +}; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/javax/swing/JLabel/6596966/bug6596966.java --- a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/javax/swing/JLabel/6596966/bug6596966.java Sat May 14 11:52:15 2011 -0700 @@ -24,13 +24,13 @@ /* @test @bug 6596966 @summary Some JFileChooser mnemonics do not work with sticky keys - * @library ../../regtesthelpers - * @build Util @run main bug6596966 @author Pavel Porvatov */ +import sun.awt.SunToolkit; + import javax.swing.*; import java.awt.*; import java.awt.event.KeyEvent; @@ -44,6 +44,7 @@ public static void main(String[] args) throws Exception { Robot robot = new Robot(); + SunToolkit toolkit = (SunToolkit) SunToolkit.getDefaultToolkit(); SwingUtilities.invokeAndWait(new Runnable() { public void run() { @@ -68,17 +69,17 @@ } }); - Util.blockTillDisplayed(frame); + toolkit.realSync(); robot.keyPress(KeyEvent.VK_ALT); robot.keyPress(KeyEvent.VK_L); - robot.waitForIdle(); + toolkit.realSync(); - Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new KeyEvent(label, KeyEvent.KEY_RELEASED, + toolkit.getSystemEventQueue().postEvent(new KeyEvent(label, KeyEvent.KEY_RELEASED, EventQueue.getMostRecentEventTime(), 0, KeyEvent.VK_L, 'L')); - robot.waitForIdle(); + toolkit.realSync(); try { SwingUtilities.invokeAndWait(new Runnable() { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/StrCodingBenchmarkUTF8.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/nio/cs/StrCodingBenchmarkUTF8.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2011, 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.util.*; +import java.nio.*; +import java.nio.charset.*; + +public class StrCodingBenchmarkUTF8 { + + public static void main(String[] args) throws Throwable { + + final int itrs = Integer.getInteger("iterations", 100000); + final int size = 2048; + final int subsize = Integer.getInteger("subsize", 128); + final Random rnd = new Random(); + final int maxchar = 0x7f; + + Charset charset = Charset.forName("UTF-8"); + final String csn = charset.name(); + final Charset cs = charset; + + int[] starts = new int[] { 0, 0x80, 0x800, 0x10000}; + for (int nb = 1; nb <= 4; nb++) { + + final CharsetEncoder enc = cs.newEncoder(); + + char[] cc = new char[size]; + int i = 0; + while (i < size - 3) { + i += Character.toChars(starts[nb - 1] + rnd.nextInt(maxchar), cc, i); + } + + final String string = new String(cc); + final byte[] bytes = string.getBytes(cs); + + System.out.printf("%n--------%s[nb=%d]---------%n", csn, nb); + int sz = 12; + while (sz < size) { + System.out.printf(" [len=%d]%n", sz); + final byte[] bs = Arrays.copyOf(bytes, sz); + final String str = new String(bs, csn); + StrCodingBenchmark.Job[] jobs = { + new StrCodingBenchmark.Job("String decode: csn") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + new String(bs, csn); + }}, + + new StrCodingBenchmark.Job("String decode: cs") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + new String(bs, cs); + }}, + + new StrCodingBenchmark.Job("String encode: csn") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + str.getBytes(csn); + }}, + + new StrCodingBenchmark.Job("String encode: cs") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + str.getBytes(cs); + }}, + }; + StrCodingBenchmark.time(StrCodingBenchmark.filter(null, jobs)); + sz <<= 1; + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/TestStringCoding.java --- a/jdk/test/sun/nio/cs/TestStringCoding.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/nio/cs/TestStringCoding.java Sat May 14 11:52:15 2011 -0700 @@ -24,7 +24,7 @@ */ /* @test - @bug 6636323 6636319 + @bug 6636323 6636319 7040220 @summary Test if StringCoding and NIO result have the same de/encoding result * @run main/othervm/timeout=2000 TestStringCoding */ @@ -111,6 +111,8 @@ //encode unmappable surrogates if (enc instanceof sun.nio.cs.ArrayEncoder && cs.contains(Charset.forName("ASCII"))) { + if (cs.name().equals("UTF-8")) // utf8 handles surrogates + return; enc.replaceWith(new byte[] { (byte)'A'}); sun.nio.cs.ArrayEncoder cae = (sun.nio.cs.ArrayEncoder)enc; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/TestStringCodingUTF8.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/nio/cs/TestStringCodingUTF8.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2011, 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 7040220 + @summary Test if StringCoding and NIO result have the same de/encoding result for UTF-8 + * @run main/othervm/timeout=2000 TestStringCodingUTF8 + */ + +import java.util.*; +import java.nio.*; +import java.nio.charset.*; + +public class TestStringCodingUTF8 { + public static void main(String[] args) throws Throwable { + test(); + // security manager on + System.setSecurityManager(new PermissiveSecurityManger()); + test(); + } + + static void test() throws Throwable { + Charset cs = Charset.forName("UTF-8"); + char[] bmp = new char[0x10000]; + for (int i = 0; i < 0x10000; i++) { + bmp[i] = (char)i; + } + test(cs, bmp, 0, bmp.length); + + ArrayList<Integer> list = new ArrayList<>(0x20000); + for (int i = 0; i < 0x20000; i++) { + list.add(i, i); + } + Collections.shuffle(list); + int j = 0; + char[] bmpsupp = new char[0x30000]; + for (int i = 0; i < 0x20000; i++) { + j += Character.toChars(list.get(i), bmpsupp, j); + } + assert (j == bmpsupp.length); + test(cs, bmpsupp, 0, bmpsupp.length); + + // randomed "off" and "len" on shuffled data + Random rnd = new Random(); + int maxlen = 1000; + int itr = 5000; + for (int i = 0; i < itr; i++) { + int off = rnd.nextInt(bmpsupp.length - maxlen); + int len = rnd.nextInt(maxlen); + test(cs, bmpsupp, off, len); + } + + // random length of bytes, test the edge corner case + for (int i = 0; i < itr; i++) { + byte[] ba = new byte[rnd.nextInt(maxlen)]; + rnd.nextBytes(ba); + //new String(csn); + if (!new String(ba, cs.name()).equals( + new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(csn) failed"); + //new String(cs); + if (!new String(ba, cs).equals( + new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(cs) failed"); + } + System.out.println("done!"); + } + + static void test(Charset cs, char[] ca, int off, int len) throws Throwable { + String str = new String(ca, off, len); + byte[] ba = encode(cs, ca, off, len); + + //getBytes(csn); + byte[] baStr = str.getBytes(cs.name()); + if (!Arrays.equals(ba, baStr)) + throw new RuntimeException("getBytes(csn) failed"); + + //getBytes(cs); + baStr = str.getBytes(cs); + if (!Arrays.equals(ba, baStr)) + throw new RuntimeException("getBytes(cs) failed"); + + //new String(csn); + if (!new String(ba, cs.name()).equals(new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(csn) failed"); + + //new String(cs); + if (!new String(ba, cs).equals(new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(cs) failed"); + } + + // copy/paste of the StringCoding.decode() + static char[] decode(Charset cs, byte[] ba, int off, int len) { + CharsetDecoder cd = cs.newDecoder(); + int en = (int)(len * cd.maxCharsPerByte()); + char[] ca = new char[en]; + if (len == 0) + return ca; + cd.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); + + ByteBuffer bb = ByteBuffer.wrap(ba, off, len); + CharBuffer cb = CharBuffer.wrap(ca); + try { + CoderResult cr = cd.decode(bb, cb, true); + if (!cr.isUnderflow()) + cr.throwException(); + cr = cd.flush(cb); + if (!cr.isUnderflow()) + cr.throwException(); + } catch (CharacterCodingException x) { + throw new Error(x); + } + return Arrays.copyOf(ca, cb.position()); + } + + // copy/paste of the StringCoding.encode() + static byte[] encode(Charset cs, char[] ca, int off, int len) { + CharsetEncoder ce = cs.newEncoder(); + int en = (int)(len * ce.maxBytesPerChar()); + byte[] ba = new byte[en]; + if (len == 0) + return ba; + ce.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); + ByteBuffer bb = ByteBuffer.wrap(ba); + CharBuffer cb = CharBuffer.wrap(ca, off, len); + try { + CoderResult cr = ce.encode(cb, bb, true); + if (!cr.isUnderflow()) + cr.throwException(); + cr = ce.flush(bb); + if (!cr.isUnderflow()) + cr.throwException(); + } catch (CharacterCodingException x) { + throw new Error(x); + } + return Arrays.copyOf(ba, bb.position()); + } + + static class PermissiveSecurityManger extends SecurityManager { + @Override public void checkPermission(java.security.Permission p) {} + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/TestUTF8.java --- a/jdk/test/sun/nio/cs/TestUTF8.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/nio/cs/TestUTF8.java Sat May 14 11:52:15 2011 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4486841 + * @bug 4486841 7040220 * @summary Test UTF-8 charset */ @@ -70,6 +70,32 @@ return dec.decode(bbf, cbf, true); } + // copy/paste of the StringCoding.decode() + static char[] decode(Charset cs, byte[] ba, int off, int len) { + CharsetDecoder cd = cs.newDecoder(); + int en = (int)(len * cd.maxCharsPerByte()); + char[] ca = new char[en]; + if (len == 0) + return ca; + cd.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); + + ByteBuffer bb = ByteBuffer.wrap(ba, off, len); + CharBuffer cb = CharBuffer.wrap(ca); + try { + CoderResult cr = cd.decode(bb, cb, true); + if (!cr.isUnderflow()) + cr.throwException(); + cr = cd.flush(cb); + if (!cr.isUnderflow()) + cr.throwException(); + } catch (CharacterCodingException x) { + throw new Error(x); + } + return Arrays.copyOf(ca, cb.position()); + } + static byte[] encode(char[] cc, String csn, boolean testDirect) throws Exception { ByteBuffer bbf; @@ -142,7 +168,14 @@ bb = encode(cc, csn, true); ccO = decode(bb, csn, true); if (!Arrays.equals(cc, ccO)) { - System.out.printf(" (direct) failed"); + System.out.print(" (direct) failed"); + } + // String.getBytes()/toCharArray() goes to ArrayDe/Encoder path + if (!Arrays.equals(bb, new String(cc).getBytes(csn))) { + System.out.printf(" String.getBytes() failed"); + } + if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) { + System.out.printf(" String.toCharArray() failed"); } System.out.println(); } @@ -168,6 +201,12 @@ if (!Arrays.equals(cc, ccO)) { System.out.printf(" decoding(direct) failed%n"); } + // new String(bb, csn).getBytes(csn) will not return + // the 6 bytes surrogates as in bb, so only test + // toCharArray() here. + if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) { + System.out.printf(" String.toCharArray() failed"); + } } static void compare(String csn1, String csn2) throws Exception { @@ -274,6 +313,7 @@ static void checkMalformed(String csn) throws Exception { boolean failed = false; System.out.printf(" Check malformed <%s>...%n", csn); + Charset cs = Charset.forName(csn); for (boolean direct: new boolean[] {false, true}) { for (byte[] bins : malformed) { int mlen = bins[0]; @@ -285,10 +325,15 @@ ashex += Integer.toBinaryString((int)bin[i] & 0xff); } if (!cr.isMalformed()) { - System.out.printf(" FAIL(direct=%b): [%s] not malformed.\n", direct, ashex); + System.out.printf(" FAIL(direct=%b): [%s] not malformed.%n", direct, ashex); failed = true; } else if (cr.length() != mlen) { - System.out.printf(" FAIL(direct=%b): [%s] malformed[len=%d].\n", direct, ashex, cr.length()); + System.out.printf(" FAIL(direct=%b): [%s] malformed[len=%d].%n", direct, ashex, cr.length()); + failed = true; + } + if (!Arrays.equals(decode(cs, bin, 0, bin.length), + new String(bin, csn).toCharArray())) { + System.out.printf(" FAIL(new String(bb, %s)) failed%n", csn); failed = true; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011, 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 7040151 + * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478 + * @compile -XDignore.symbol.file NegTokenTargFields.java + * @run main NegTokenTargFields nomech + * @run main/fail NegTokenTargFields badorder + */ + +import sun.security.jgss.spnego.NegTokenTarg; + +public class NegTokenTargFields { + + // A hand-crafted NegTokenTarg with negResult and responseToken only + public static byte[] nomech = { + (byte)0xA1, (byte)0x0F, (byte)0x30, (byte)0x0D, + (byte)0xA0, (byte)0x03, (byte)0x0A, (byte)0x01, + (byte)0x02, (byte)0xA2, (byte)0x02, (byte)0x04, + (byte)0x00, (byte)0xA3, (byte)0x02, (byte)0x04, + (byte)0x00, + }; + + // A hand-crafted NegTokenTarg with negResult and supportedMech in wrong order + public static byte[] badorder = { + (byte)0xA1, (byte)0x1E, (byte)0x30, (byte)0x1C, + (byte)0xA1, (byte)0x0B, (byte)0x06, (byte)0x09, + (byte)0x2A, (byte)0x86, (byte)0x48, (byte)0x86, + (byte)0xF7, (byte)0x12, (byte)0x01, (byte)0x02, + (byte)0x02, (byte)0xA0, (byte)0x03, (byte)0x0A, + (byte)0x01, (byte)0x00, (byte)0xA2, (byte)0x03, + (byte)0x04, (byte)0x01, (byte)0x00, (byte)0xA3, + (byte)0x03, (byte)0x04, (byte)0x01, (byte)0x00, + }; + + public static void main(String[] args) throws Exception { + byte[] buf = (byte[])NegTokenTargFields.class.getField(args[0]).get(null); + new NegTokenTarg(buf); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/BadKdc.java --- a/jdk/test/sun/security/krb5/auto/BadKdc.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/BadKdc.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, 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 @@ -22,8 +22,14 @@ */ import java.io.*; +import java.net.BindException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.security.auth.login.LoginException; +import sun.security.krb5.Asn1Exception; import sun.security.krb5.Config; public class BadKdc { @@ -34,8 +40,51 @@ static final Pattern re = Pattern.compile( ">>> KDCCommunication: kdc=kdc.rabbit.hole UDP:(\\d)...., " + "timeout=(\\d)000,"); + + /* + * There are several cases this test fails: + * + * 1. The random selected port is used by another process. No good way to + * prevent this happening, coz krb5.conf must be written before KDC starts. + * There are two different outcomes: + * + * a. Cannot start the KDC. A BindException thrown. + * b. When trying to access a non-existing KDC, a response is received! + * Most likely a Asn1Exception thrown + * + * 2. Even if a KDC is started, and more than 20 seconds pass by, a timeout + * can still happens for the first UDP request. In fact, the KDC did not + * received it at all. This happens on almost all platforms, especially + * solaris-i586 and solaris-x64. + * + * To avoid them: + * + * 1. Catch those exceptions and ignore + * + * 2. a. Make the timeout longer? useless + * b. Read the output carefully, if there is a timeout, it's OK. + * Just make sure the retries times and KDCs are correct. + * This is tough. + * c. Feed the KDC a UDP packet first. The current "solution". + */ public static void go(int[]... expected) throws Exception { + try { + go0(expected); + } catch (BindException be) { + System.out.println("The random port is used by another process"); + } catch (LoginException le) { + Throwable cause = le.getCause(); + if (cause instanceof Asn1Exception) { + System.out.println("Bad packet possibly from another process"); + return; + } + throw le; + } + } + + public static void go0(int[]... expected) + throws Exception { System.setProperty("sun.security.krb5.debug", "true"); // Make sure KDCs' ports starts with 1 and 2 and 3, @@ -78,20 +127,39 @@ KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p, true); k.addPrincipal(OneKDC.USER, OneKDC.PASS); k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM); + // Feed a packet to newly started KDC to warm it up + System.err.println("-------- IGNORE THIS ERROR MESSAGE --------"); + new DatagramSocket().send( + new DatagramPacket("Hello".getBytes(), 5, + InetAddress.getByName(OneKDC.KDCHOST), p)); return k; } + private static void test(int... expected) throws Exception { + ByteArrayOutputStream bo = new ByteArrayOutputStream(); + try { + test0(bo, expected); + } catch (Exception e) { + System.out.println("----------------- ERROR -----------------"); + System.out.println(new String(bo.toByteArray())); + System.out.println("--------------- ERROR END ---------------"); + throw e; + } + } + /** * One round of test for max_retries and timeout. - * @param timeout the expected timeout * @param expected the expected kdc# timeout kdc# timeout... */ - private static void test(int... expected) throws Exception { - ByteArrayOutputStream bo = new ByteArrayOutputStream(); + private static void test0(ByteArrayOutputStream bo, int... expected) + throws Exception { PrintStream oldout = System.out; System.setOut(new PrintStream(bo)); - Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); - System.setOut(oldout); + try { + Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + } finally { + System.setOut(oldout); + } String[] lines = new String(bo.toByteArray()).split("\n"); System.out.println("----------------- TEST -----------------"); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/Context.java --- a/jdk/test/sun/security/krb5/auto/Context.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/Context.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ import com.sun.security.jgss.AuthorizationDataEntry; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import javax.security.auth.kerberos.KeyTab; /** * Context of a JGSS subject, encapsulating Subject and GSSContext. @@ -107,15 +108,19 @@ return out; } + public static Context fromUserPass( + String user, char[] pass, boolean storeKey) throws Exception { + return fromUserPass(null, user, pass, storeKey); + } /** * Logins with a username and a password, using Krb5LoginModule directly * @param storeKey true if key should be saved, used on acceptor side */ - public static Context fromUserPass(String user, char[] pass, boolean storeKey) - throws Exception { + public static Context fromUserPass(Subject s, + String user, char[] pass, boolean storeKey) throws Exception { Context out = new Context(); out.name = user; - out.s = new Subject(); + out.s = s == null ? new Subject() : s; Krb5LoginModule krb5 = new Krb5LoginModule(); Map<String, String> map = new HashMap<>(); Map<String, Object> shared = new HashMap<>(); @@ -198,12 +203,25 @@ * @throws java.lang.Exception */ public void startAsServer(final Oid mech) throws Exception { + startAsServer(null, mech); + } + + /** + * Starts as a server with the specified service name + * @param name the service name + * @param mech GSS mech + * @throws java.lang.Exception + */ + public void startAsServer(final String name, final Oid mech) throws Exception { doAs(new Action() { @Override public byte[] run(Context me, byte[] dummy) throws Exception { GSSManager m = GSSManager.getInstance(); me.x = (ExtendedGSSContext)m.createContext(m.createCredential( - null, + name == null ? null : + (name.indexOf('@') < 0 ? + m.createName(name, null) : + m.createName(name, GSSName.NT_HOSTBASED_SERVICE)), GSSCredential.INDEFINITE_LIFETIME, mech, GSSCredential.ACCEPT_ONLY)); @@ -230,6 +248,14 @@ } /** + * Accesses the internal subject. + * @return the subject + */ + public Subject s() { + return s; + } + + /** * Disposes the GSSContext within * @throws org.ietf.jgss.GSSException */ @@ -297,7 +323,7 @@ } catch (Exception e) { ;// Don't care } - System.out.println("====================================="); + System.out.println("====== Private Credentials Set ======"); for (Object o : s.getPrivateCredentials()) { System.out.println(" " + o.getClass()); if (o instanceof KerberosTicket) { @@ -315,6 +341,8 @@ for (Object k : map.keySet()) { System.out.println(" " + k + ": " + map.get(k)); } + } else { + System.out.println(" " + o); } } if (x != null && x instanceof ExtendedGSSContext) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/DynamicKeytab.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/DynamicKeytab.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2011, 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 6894072 + * @run main/othervm DynamicKeytab + * @summary always refresh keytab + */ + +import java.io.File; +import java.io.FileOutputStream; +import java.nio.file.Files; +import java.nio.file.Paths; +import org.ietf.jgss.GSSException; +import sun.security.jgss.GSSUtil; +import sun.security.krb5.KrbException; +import sun.security.krb5.internal.Krb5; + +public class DynamicKeytab { + + Context c, s; + public static void main(String[] args) + throws Exception { + new DynamicKeytab().go(); + } + + void go() throws Exception { + OneKDC k = new OneKDC(null); + k.writeJAASConf(); + + Files.delete(Paths.get(OneKDC.KTAB)); + + // Starts with no keytab + c = Context.fromJAAS("client"); + s = Context.fromJAAS("com.sun.security.jgss.krb5.accept"); + + // Test 1: read new key 1 from keytab + k.addPrincipal(OneKDC.SERVER, "pass1".toCharArray()); + k.writeKtab(OneKDC.KTAB); + connect(); + + // Test 2: service key cached, find 1 in keytab (now contains 1 and 2) + k.addPrincipal(OneKDC.SERVER, "pass2".toCharArray()); + k.appendKtab(OneKDC.KTAB); + connect(); + + // Test 3: re-login. Now find 2 in keytab + c = Context.fromJAAS("client"); + connect(); + + // Test 4: re-login, KDC use 3 this time. + c = Context.fromJAAS("client"); + // Put 3 and 4 into keytab but keep the real key back to 3. + k.addPrincipal(OneKDC.SERVER, "pass3".toCharArray()); + k.appendKtab(OneKDC.KTAB); + k.addPrincipal(OneKDC.SERVER, "pass4".toCharArray()); + k.appendKtab(OneKDC.KTAB); + k.addPrincipal(OneKDC.SERVER, "pass3".toCharArray()); + connect(); + + // Test 5: invalid keytab file, should ignore + try (FileOutputStream fos = new FileOutputStream(OneKDC.KTAB)) { + fos.write("BADBADBAD".getBytes()); + } + connect(); + + // Test 6: delete keytab file, identical to revoke all + Files.delete(Paths.get(OneKDC.KTAB)); + try { + connect(); + throw new Exception("Should not success"); + } catch (GSSException gsse) { + System.out.println(gsse); + KrbException ke = (KrbException)gsse.getCause(); + // KrbApReq.authenticate(*) if (dkey == null)... + // This should have been Krb5.KRB_AP_ERR_NOKEY + if (ke.returnCode() != Krb5.API_INVALID_ARG) { + throw new Exception("Not expected failure code: " + + ke.returnCode()); + } + } + + // Test 7: 3 revoked, should fail (now contains only 5) + k.addPrincipal(OneKDC.SERVER, "pass5".toCharArray()); + k.writeKtab(OneKDC.KTAB); // overwrite keytab, which means + // old key is revoked + try { + connect(); + throw new Exception("Should not success"); + } catch (GSSException gsse) { + System.out.println(gsse); + KrbException ke = (KrbException)gsse.getCause(); + if (ke.returnCode() != Krb5.KRB_AP_ERR_BADKEYVER) { + throw new Exception("Not expected failure code: " + + ke.returnCode()); + } + } + + // Test 8: an empty KDC means revoke all + KDC.create("EMPTY.REALM").writeKtab(OneKDC.KTAB); + try { + connect(); + throw new Exception("Should not success"); + } catch (GSSException gsse) { + System.out.println(gsse); + KrbException ke = (KrbException)gsse.getCause(); + // KrbApReq.authenticate(*) if (dkey == null)... + // This should have been Krb5.KRB_AP_ERR_NOKEY + if (ke.returnCode() != Krb5.API_INVALID_ARG) { + throw new Exception("Not expected failure code: " + + ke.returnCode()); + } + } + } + + void connect() throws Exception { + Thread.sleep(2000); // make sure ktab timestamp is different + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c, s); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/KDC.java --- a/jdk/test/sun/security/krb5/auto/KDC.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/KDC.java Sat May 14 11:52:15 2011 -0700 @@ -228,7 +228,33 @@ } /** - * Write all principals' keys from multiple KDCsinto one keytab file. + * Writes or appends KDC keys into a keytab. See doc for writeMultiKtab. + * @param append true if append, otherwise, overwrite. + */ + private static void writeKtab0(String tab, boolean append, KDC... kdcs) + throws IOException, KrbException { + KeyTab ktab = append ? KeyTab.getInstance(tab) : KeyTab.create(tab); + for (KDC kdc: kdcs) { + for (String name : kdc.passwords.keySet()) { + char[] pass = kdc.passwords.get(name); + int kvno = 0; + if (Character.isDigit(pass[pass.length-1])) { + kvno = pass[pass.length-1] - '0'; + } + ktab.addEntry(new PrincipalName(name, + name.indexOf('/') < 0 ? + PrincipalName.KRB_NT_UNKNOWN : + PrincipalName.KRB_NT_SRV_HST), + pass, + kvno, + true); + } + } + ktab.save(); + } + + /** + * Writes all principals' keys from multiple KDCs into one keytab file. * Note that the keys for the krbtgt principals will not be written. * * Attention: This method references krb5.conf settings. If you need to @@ -252,17 +278,16 @@ */ public static void writeMultiKtab(String tab, KDC... kdcs) throws IOException, KrbException { - KeyTab ktab = KeyTab.create(tab); - for (KDC kdc: kdcs) { - for (String name : kdc.passwords.keySet()) { - ktab.addEntry(new PrincipalName(name, - name.indexOf('/') < 0 ? - PrincipalName.KRB_NT_UNKNOWN : - PrincipalName.KRB_NT_SRV_HST), - kdc.passwords.get(name), -1, true); - } - } - ktab.save(); + writeKtab0(tab, false, kdcs); + } + + /** + * Appends all principals' keys from multiple KDCs to one keytab file. + * See writeMultiKtab for details. + */ + public static void appendMultiKtab(String tab, KDC... kdcs) + throws IOException, KrbException { + writeKtab0(tab, true, kdcs); } /** @@ -273,6 +298,13 @@ } /** + * Appends keys in this KDC to a ktab. + */ + public void appendKtab(String tab) throws IOException, KrbException { + KDC.appendMultiKtab(tab, this); + } + + /** * Adds a new principal to this realm with a given password. * @param user the principal's name. For a service principal, use the * form of host/f.q.d.n diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/KeyTabCompat.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/KeyTabCompat.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2011, 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 6894072 + * @compile -XDignore.symbol.file KeyTabCompat.java + * @run main/othervm KeyTabCompat + * @summary always refresh keytab + */ + +import javax.security.auth.kerberos.KerberosKey; +import sun.security.jgss.GSSUtil; + +/* + * There are 2 compat issues to check: + * + * 1. If there is only KerberosKeys in private credential set and no + * KerberosPrincipal. JAAS login should go on. + * 2. Even if KeyTab is used, user can still get KerberosKeys from + * private credentials set. + */ +public class KeyTabCompat { + + public static void main(String[] args) + throws Exception { + OneKDC kdc = new OneKDC("aes128-cts"); + kdc.writeJAASConf(); + kdc.addPrincipal(OneKDC.SERVER, "pass1".toCharArray()); + kdc.writeKtab(OneKDC.KTAB); + + Context c, s; + + // Part 1 + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + s = Context.fromUserPass(OneKDC.USER2, OneKDC.PASS2, true); + + s.s().getPrincipals().clear(); + + c.startAsClient(OneKDC.USER2, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + + Context.handshake(c, s); + + // Part 2 + c = Context.fromJAAS("client"); + s = Context.fromJAAS("server"); + + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + s.status(); + + if (s.s().getPrivateCredentials(KerberosKey.class).size() != 1) { + throw new Exception("There should be one KerberosKey"); + } + + Thread.sleep(2000); // make sure ktab timestamp is different + + kdc.addPrincipal(OneKDC.SERVER, "pass2".toCharArray()); + kdc.writeKtab(OneKDC.KTAB); + + Context.handshake(c, s); + s.status(); + + if (s.s().getPrivateCredentials(KerberosKey.class).size() != 1) { + throw new Exception("There should be only one KerberosKey"); + } + + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/LoginModuleOptions.java --- a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java Sat May 14 11:52:15 2011 -0700 @@ -28,7 +28,6 @@ * @summary Krb5LoginModule a little too restrictive, and the doc is not clear. */ import com.sun.security.auth.module.Krb5LoginModule; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; @@ -36,7 +35,6 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; public class LoginModuleOptions { @@ -61,10 +59,12 @@ // 1. ccache -> keytab login(null, "useTicketCache", "true", "ticketCache", "krbcc_non_exists", "useKeyTab", "true", "principal", "dummy"); + // 2. keytab -> shared login(null, "useKeyTab", "true", "principal", "dummy", "keyTab", "ktab_non_exist", "tryFirstPass", "true", NAME, OneKDC.USER, PWD, OneKDC.PASS); + // 3. shared -> callback // 3.1. useFirstPass, no callback boolean failed = false; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/SPNEGO.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/SPNEGO.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2011, 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 7040151 + * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478 + * @compile -XDignore.symbol.file SPNEGO.java + * @run main/othervm SPNEGO + */ + +import sun.security.jgss.GSSUtil; + +// The basic krb5 test skeleton you can copy from +public class SPNEGO { + + public static void main(String[] args) throws Exception { + + new OneKDC(null).writeJAASConf(); + + Context c, s; + c = Context.fromJAAS("client"); + s = Context.fromJAAS("server"); + + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_SPNEGO_MECH_OID); + s.startAsServer(GSSUtil.GSS_SPNEGO_MECH_OID); + + Context.handshake(c, s); + + Context.transmit("i say high --", c, s); + Context.transmit(" you say low", s, c); + + s.dispose(); + c.dispose(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/SSL.java --- a/jdk/test/sun/security/krb5/auto/SSL.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/SSL.java Sat May 14 11:52:15 2011 -0700 @@ -48,7 +48,7 @@ public class SSL { private static String krb5Cipher; - private static final int LOOP_LIMIT = 1; + private static final int LOOP_LIMIT = 3; private static int loopCount = 0; private static volatile String server; private static volatile int port; @@ -98,13 +98,13 @@ fos.close(); f.deleteOnExit(); - final Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + Context c; final Context s = Context.fromJAAS("ssl"); - c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); + // There's no keytab file when server starts. s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); - new Thread(new Runnable() { + Thread server = new Thread(new Runnable() { public void run() { try { s.doAs(new JsseServerAction(), null); @@ -112,12 +112,57 @@ e.printStackTrace(); } } - }).start(); + }); + server.setDaemon(true); + server.start(); // Warm the server Thread.sleep(2000); + // Now create the keytab + + /* + // Add 3 versions of keys into keytab + KeyTab ktab = KeyTab.create(OneKDC.KTAB); + PrincipalName service = new PrincipalName( + "host/" + server, PrincipalName.KRB_NT_SRV_HST); + ktab.addEntry(service, "pass1".toCharArray(), 1); + ktab.addEntry(service, "pass2".toCharArray(), 2); + ktab.addEntry(service, "pass3".toCharArray(), 3); + ktab.save(); + + // and use the middle one as the real key + kdc.addPrincipal("host/" + server, "pass2".toCharArray()); + */ + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); c.doAs(new JsseClientAction(), null); + + // Add another version of key, make sure it can be loaded + Thread.sleep(2000); + ktab = KeyTab.getInstance(OneKDC.KTAB); + ktab.addEntry(service, "pass4".toCharArray(), 4, true); + ktab.save(); + kdc.addPrincipal("host/" + server, "pass4".toCharArray()); + + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); + c.doAs(new JsseClientAction(), null); + + // Revoke the old key + /*Thread.sleep(2000); + ktab = KeyTab.create(OneKDC.KTAB); + ktab.addEntry(service, "pass5".toCharArray(), 5, false); + ktab.save(); + + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); + try { + c.doAs(new JsseClientAction(), null); + throw new Exception("Should fail this time."); + } catch (SSLException e) { + // Correct behavior. + }*/ } // Following codes copied from @@ -126,6 +171,7 @@ public byte[] run(Context s, byte[] input) throws Exception { SSLSocketFactory sslsf = (SSLSocketFactory) SSLSocketFactory.getDefault(); + System.out.println("Connecting " + server + ":" + port); SSLSocket sslSocket = (SSLSocket) sslsf.createSocket(server, port); // Enable only a KRB5 cipher suite. @@ -154,6 +200,9 @@ System.out.println("Server is: " + peer.toString()); sslSocket.close(); + // This line should not be needed. It's the server's duty to + // forget the old key + //sslSocket.getSession().invalidate(); return null; } } @@ -165,6 +214,7 @@ SSLServerSocket sslServerSocket = (SSLServerSocket) sslssf.createServerSocket(0); // any port port = sslServerSocket.getLocalPort(); + System.out.println("Listening on " + port); // Enable only a KRB5 cipher suite. String enabledSuites[] = {krb5Cipher}; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/TwoPrinces.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/TwoPrinces.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2011, 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 6894072 + * @compile -XDignore.symbol.file TwoPrinces.java + * @run main/othervm TwoPrinces + * @summary always refresh keytab + */ + +import java.io.File; +import java.io.FileOutputStream; +import sun.security.jgss.GSSUtil; +import sun.security.krb5.Config; + +public class TwoPrinces { + + public static void main(String[] args) + throws Exception { + + KDC k1 = KDC.create("R1"); + k1.addPrincipal("u1", "hello".toCharArray()); + k1.addPrincipalRandKey("krbtgt/R1"); + k1.addPrincipalRandKey("host/same.host"); + + KDC k2 = KDC.create("R2"); + k2.addPrincipal("u2", "hello".toCharArray()); + k2.addPrincipalRandKey("krbtgt/R2"); + k2.addPrincipalRandKey("host/same.host"); + + System.setProperty("java.security.krb5.conf", "krb5.conf"); + + // R1 is the default realm now + KDC.saveConfig("krb5.conf", k1, k2); + Config.refresh(); + + k1.writeKtab("ktab1"); + k2.writeKtab("ktab2"); + + // A JAAS config file with 2 Krb5LoginModules, after commit, the + // subject with have principals and keytabs from both sides + System.setProperty("java.security.auth.login.config", "jaas.conf"); + File f = new File("jaas.conf"); + FileOutputStream fos = new FileOutputStream(f); + fos.write(( + "me {\n" + + " com.sun.security.auth.module.Krb5LoginModule required" + + " isInitiator=true principal=\"host/same.host@R1\"" + + " useKeyTab=true keyTab=ktab1 storeKey=true;\n" + + " com.sun.security.auth.module.Krb5LoginModule required" + + " isInitiator=true principal=\"host/same.host@R2\"" + + " useKeyTab=true keyTab=ktab2 storeKey=true;\n" + + "};\n" + ).getBytes()); + fos.close(); + + /* + * This server side context will be able to act as services in both + * realms. Please note that we still don't support a single instance + * of server to accept connections from two realms at the same time. + * Therefore, we must call startAsServer in a given realm to start + * working there. The same Subject never changes anyway. + */ + Context s = Context.fromJAAS("me"); + + // Default realm still R1 + s.startAsServer("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context c1 = Context.fromUserPass("u1", "hello".toCharArray(), false); + c1.startAsClient("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c1, s); + + KDC.saveConfig("krb5.conf", k2, k1); + Config.refresh(); + + // Default realm now R2 + s.startAsServer("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context c2 = Context.fromUserPass("u2", "hello".toCharArray(), false); + c2.startAsClient("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c2, s); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/ktab/KeyTabIndex.java --- a/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -44,7 +44,6 @@ KeyTab.getInstance("ktab").getClass(); } }; - KeyTab.refresh(); for (int i=0; i<10; i++) { new Thread(t).start(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/AccessKeyStore.sh --- a/jdk/test/sun/security/mscapi/AccessKeyStore.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/AccessKeyStore.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6324295 +# @bug 6324295 6931562 # @run shell AccessKeyStore.sh # @summary Confirm that permission must be granted to access keystores. -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh --- a/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6318171 +# @bug 6318171 6931562 # @run shell IsSunMSCAPIAvailable.sh # @summary Basic test of the Microsoft CryptoAPI provider. -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh --- a/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,12 +25,10 @@ # @test -# @bug 6324294 +# @bug 6324294 6931562 # @run shell KeyStoreCompatibilityMode.sh # @summary Confirm that a null stream or password is not permitted when # compatibility mode is enabled (and vice versa). -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh --- a/jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6415696 +# @bug 6415696 6931562 # @run shell KeytoolChangeAlias.sh # @summary Test "keytool -changealias" using the Microsoft CryptoAPI provider. -# -# Run only on non-64-bit Windows platform. # set a few environment variables so that the shell-script can run stand-alone # in the source directory diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/PublicKeyInterop.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/PublicKeyInterop.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * @see PublicKeyInterop.sh + */ + +import java.security.*; +import java.util.*; +import javax.crypto.*; + +import sun.misc.HexDumpEncoder; + +/* + * Confirm interoperability of RSA public keys between SunMSCAPI and SunJCE + * security providers. + */ +public class PublicKeyInterop { + + public static void main(String[] arg) throws Exception { + PrivateKey privKey = null; + Certificate cert = null; + KeyStore ks = KeyStore.getInstance("Windows-MY"); + ks.load(null, null); + System.out.println("Loaded keystore: Windows-MY"); + + PublicKey myPuKey = + (PublicKey) ks.getCertificate("6888925").getPublicKey(); + System.out.println("Public key is a " + myPuKey.getClass().getName()); + PrivateKey myPrKey = (PrivateKey) ks.getKey("6888925", null); + System.out.println("Private key is a " + myPrKey.getClass().getName()); + System.out.println(); + + byte[] plain = new byte[] {0x01, 0x02, 0x03, 0x04, 0x05}; + HexDumpEncoder hde = new HexDumpEncoder(); + System.out.println("Plaintext:\n" + hde.encode(plain) + "\n"); + + Cipher rsa = Cipher.getInstance("RSA/ECB/PKCS1Padding"); + rsa.init(Cipher.ENCRYPT_MODE, myPuKey); + byte[] encrypted = rsa.doFinal(plain); + System.out.println("Encrypted plaintext using RSA Cipher from " + + rsa.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(encrypted) + "\n"); + + Cipher rsa2 = Cipher.getInstance("RSA/ECB/PKCS1Padding", "SunMSCAPI"); + rsa2.init(Cipher.ENCRYPT_MODE, myPuKey); + byte[] encrypted2 = rsa2.doFinal(plain); + System.out.println("Encrypted plaintext using RSA Cipher from " + + rsa2.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(encrypted2) + "\n"); + + Cipher rsa3 = Cipher.getInstance("RSA/ECB/PKCS1Padding", "SunMSCAPI"); + rsa3.init(Cipher.DECRYPT_MODE, myPrKey); + byte[] decrypted = rsa3.doFinal(encrypted); + System.out.println("Decrypted first ciphertext using RSA Cipher from " + + rsa3.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(decrypted) + "\n"); + if (! Arrays.equals(plain, decrypted)) { + throw new Exception("First decrypted ciphertext does not match " + + "original plaintext"); + } + + decrypted = rsa3.doFinal(encrypted2); + System.out.println("Decrypted second ciphertext using RSA Cipher from " + + rsa3.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(decrypted) + "\n"); + if (! Arrays.equals(plain, decrypted)) { + throw new Exception("Second decrypted ciphertext does not match " + + "original plaintext"); + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/PublicKeyInterop.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/PublicKeyInterop.sh Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,84 @@ +#!/bin/sh + +# +# Copyright (c) 2011, 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 6888925 +# @run shell PublicKeyInterop.sh +# @summary SunMSCAPI's Cipher can't use RSA public keys obtained from other +# sources. +# + +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi + +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi + +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +OS=`uname -s` +case "$OS" in + Windows* | CYGWIN* ) + + echo "Creating a temporary RSA keypair in the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -genkeypair \ + -storetype Windows-My \ + -keyalg RSA \ + -alias 6888925 \ + -dname "cn=6888925,c=US" \ + -noprompt + + echo + echo "Running the test..." + ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\PublicKeyInterop.java + ${TESTJAVA}/bin/java PublicKeyInterop + + rc=$? + + echo + echo "Removing the temporary RSA keypair from the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -delete \ + -storetype Windows-My \ + -alias 6888925 + + echo done. + exit $rc + ;; + + * ) + echo "This test is not intended for '$OS' - passing test" + exit 0 + ;; +esac diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh --- a/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,13 +24,11 @@ # # @test -# @bug 6457422 +# @bug 6457422 6931562 # @run shell RSAEncryptDecrypt.sh # @summary Confirm that plaintext can be encrypted and then decrypted using the # RSA cipher in the SunMSCAPI crypto provider. NOTE: The RSA cipher is # absent from the SunMSCAPI provider in OpenJDK builds. -# -# Run only on non-64-bit Windows platform. # set a few environment variables so that the shell-script can run stand-alone # in the source directory diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,225 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * @see SignUsingNONEwithRSA.sh + */ + +import java.security.*; +import java.util.*; + +public class SignUsingNONEwithRSA { + + private static final List<byte[]> precomputedHashes = Arrays.asList( + // A MD5 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 + }, + // A SHA-1 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20 + }, + // A concatenation of SHA-1 and MD5 hashes (used during SSL handshake) + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 + }, + // A SHA-256 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32 + }, + // A SHA-384 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x40, + 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48 + }, + // A SHA-512 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x40, + 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x50, + 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x60, + 0x61, 0x62, 0x63, 0x64 + }); + + private static List<byte[]> generatedSignatures = new ArrayList<>(); + + public static void main(String[] args) throws Exception { + + Provider[] providers = Security.getProviders("Signature.NONEwithRSA"); + if (providers == null) { + System.out.println("No JCE providers support the " + + "'Signature.NONEwithRSA' algorithm"); + System.out.println("Skipping this test..."); + return; + + } else { + System.out.println("The following JCE providers support the " + + "'Signature.NONEwithRSA' algorithm: "); + for (Provider provider : providers) { + System.out.println(" " + provider.getName()); + } + } + System.out.println("-------------------------------------------------"); + + KeyPair keys = getKeysFromKeyStore(); + signAllUsing("SunMSCAPI", keys.getPrivate()); + System.out.println("-------------------------------------------------"); + + verifyAllUsing("SunMSCAPI", keys.getPublic()); + System.out.println("-------------------------------------------------"); + + verifyAllUsing("SunJCE", keys.getPublic()); + System.out.println("-------------------------------------------------"); + + keys = generateKeys(); + signAllUsing("SunJCE", keys.getPrivate()); + System.out.println("-------------------------------------------------"); + + verifyAllUsing("SunMSCAPI", keys.getPublic()); + System.out.println("-------------------------------------------------"); + + } + + private static KeyPair getKeysFromKeyStore() throws Exception { + KeyStore ks = KeyStore.getInstance("Windows-MY", "SunMSCAPI"); + ks.load(null, null); + System.out.println("Loaded keystore: Windows-MY"); + + Enumeration e = ks.aliases(); + PrivateKey privateKey = null; + PublicKey publicKey = null; + + while (e.hasMoreElements()) { + String alias = (String) e.nextElement(); + if (alias.equals("6578658")) { + System.out.println("Loaded entry: " + alias); + privateKey = (PrivateKey) ks.getKey(alias, null); + publicKey = (PublicKey) ks.getCertificate(alias).getPublicKey(); + } + } + if (privateKey == null || publicKey == null) { + throw new Exception("Cannot load the keys need to run this test"); + } + + return new KeyPair(publicKey, privateKey); + } + + + private static KeyPair generateKeys() throws Exception { + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); + keyGen.initialize(1024, null); + KeyPair pair = keyGen.generateKeyPair(); + PrivateKey privateKey = pair.getPrivate(); + PublicKey publicKey = pair.getPublic(); + + if (privateKey == null || publicKey == null) { + throw new Exception("Cannot load the keys need to run this test"); + } + + return new KeyPair(publicKey, privateKey); + } + + private static void signAllUsing(String providerName, PrivateKey privateKey) + throws Exception { + Signature sig1 = Signature.getInstance("NONEwithRSA", providerName); + if (sig1 == null) { + throw new Exception("'NONEwithRSA' is not supported"); + } + if (sig1.getProvider() != null) { + System.out.println("Using NONEwithRSA signer from the " + + sig1.getProvider().getName() + " JCE provider"); + } else { + System.out.println( + "Using NONEwithRSA signer from the internal JCE provider"); + } + + System.out.println("Using key: " + privateKey); + generatedSignatures.clear(); + for (byte[] hash : precomputedHashes) { + sig1.initSign(privateKey); + sig1.update(hash); + + try { + + byte [] sigBytes = sig1.sign(); + System.out.println("\nGenerated RSA signature over a " + + hash.length + "-byte hash (signature length: " + + sigBytes.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + + (sigBytes.length * 2) + "x", + new java.math.BigInteger(1, sigBytes))); + generatedSignatures.add(sigBytes); + + } catch (SignatureException se) { + System.out.println("Error generating RSA signature: " + se); + } + } + } + + private static void verifyAllUsing(String providerName, PublicKey publicKey) + throws Exception { + Signature sig1 = Signature.getInstance("NONEwithRSA", providerName); + if (sig1.getProvider() != null) { + System.out.println("\nUsing NONEwithRSA verifier from the " + + sig1.getProvider().getName() + " JCE provider"); + } else { + System.out.println( + "\nUsing NONEwithRSA verifier from the internal JCE provider"); + } + + System.out.println("Using key: " + publicKey); + + int i = 0; + for (byte[] hash : precomputedHashes) { + + byte[] sigBytes = generatedSignatures.get(i++); + System.out.println("\nVerifying RSA Signature over a " + + hash.length + "-byte hash (signature length: " + + sigBytes.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + + (sigBytes.length * 2) + "x", + new java.math.BigInteger(1, sigBytes))); + + sig1.initVerify(publicKey); + sig1.update(hash); + if (sig1.verify(sigBytes)) { + System.out.println("Verify PASSED"); + } else { + throw new Exception("Verify FAILED"); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,83 @@ +#!/bin/sh + +# +# Copyright (c) 2011, 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 6578658 +# @run shell SignUsingNONEwithRSA.sh +# @summary Sign using the NONEwithRSA signature algorithm from SunMSCAPI + +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi + +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi + +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +OS=`uname -s` +case "$OS" in + Windows* | CYGWIN* ) + + echo "Creating a temporary RSA keypair in the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -genkeypair \ + -storetype Windows-My \ + -keyalg RSA \ + -alias 6578658 \ + -dname "cn=6578658,c=US" \ + -noprompt + + echo + echo "Running the test..." + ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingNONEwithRSA.java + ${TESTJAVA}/bin/java SignUsingNONEwithRSA + + rc=$? + + echo + echo "Removing the temporary RSA keypair from the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -delete \ + -storetype Windows-My \ + -alias 6578658 + + echo done. + exit $rc + ;; + + * ) + echo "This test is not intended for '$OS' - passing test" + exit 0 + ;; +esac diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * @see SignUsingSHA2withRSA.sh + */ + +import java.security.*; +import java.util.*; + +public class SignUsingSHA2withRSA { + + private static final byte[] toBeSigned = new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10 + }; + + private static List<byte[]> generatedSignatures = new ArrayList<>(); + + public static void main(String[] args) throws Exception { + + Provider[] providers = Security.getProviders("Signature.SHA256withRSA"); + if (providers == null) { + System.out.println("No JCE providers support the " + + "'Signature.SHA256withRSA' algorithm"); + System.out.println("Skipping this test..."); + return; + + } else { + System.out.println("The following JCE providers support the " + + "'Signature.SHA256withRSA' algorithm: "); + for (Provider provider : providers) { + System.out.println(" " + provider.getName()); + } + } + System.out.println("-------------------------------------------------"); + + KeyStore ks = KeyStore.getInstance("Windows-MY", "SunMSCAPI"); + ks.load(null, null); + System.out.println("Loaded keystore: Windows-MY"); + + Enumeration e = ks.aliases(); + PrivateKey privateKey = null; + PublicKey publicKey = null; + + while (e.hasMoreElements()) { + String alias = (String) e.nextElement(); + if (alias.equals("6753664")) { + System.out.println("Loaded entry: " + alias); + privateKey = (PrivateKey) ks.getKey(alias, null); + publicKey = (PublicKey) ks.getCertificate(alias).getPublicKey(); + } + } + if (privateKey == null || publicKey == null) { + throw new Exception("Cannot load the keys need to run this test"); + } + System.out.println("-------------------------------------------------"); + + generatedSignatures.add(signUsing("SHA256withRSA", privateKey)); + generatedSignatures.add(signUsing("SHA384withRSA", privateKey)); + generatedSignatures.add(signUsing("SHA512withRSA", privateKey)); + + System.out.println("-------------------------------------------------"); + + verifyUsing("SHA256withRSA", publicKey, generatedSignatures.get(0)); + verifyUsing("SHA384withRSA", publicKey, generatedSignatures.get(1)); + verifyUsing("SHA512withRSA", publicKey, generatedSignatures.get(2)); + + System.out.println("-------------------------------------------------"); + } + + private static byte[] signUsing(String signAlgorithm, + PrivateKey privateKey) throws Exception { + + // Must explicitly specify the SunMSCAPI JCE provider + // (otherwise SunJCE is chosen because it appears earlier in the list) + Signature sig1 = Signature.getInstance(signAlgorithm, "SunMSCAPI"); + if (sig1 == null) { + throw new Exception("'" + signAlgorithm + "' is not supported"); + } + System.out.println("Using " + signAlgorithm + " signer from the " + + sig1.getProvider().getName() + " JCE provider"); + + System.out.println("Using key: " + privateKey); + sig1.initSign(privateKey); + sig1.update(toBeSigned); + byte [] sigBytes = null; + + try { + sigBytes = sig1.sign(); + System.out.println("Generated RSA signature over a " + + toBeSigned.length + "-byte data (signature length: " + + sigBytes.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + + (sigBytes.length * 2) + "x", + new java.math.BigInteger(1, sigBytes))); + + } catch (SignatureException se) { + System.out.println("Error generating RSA signature: " + se); + } + + return sigBytes; + } + + private static void verifyUsing(String signAlgorithm, PublicKey publicKey, + byte[] signature) throws Exception { + + // Must explicitly specify the SunMSCAPI JCE provider + // (otherwise SunJCE is chosen because it appears earlier in the list) + Signature sig1 = Signature.getInstance(signAlgorithm, "SunMSCAPI"); + if (sig1 == null) { + throw new Exception("'" + signAlgorithm + "' is not supported"); + } + System.out.println("Using " + signAlgorithm + " verifier from the " + + sig1.getProvider().getName() + " JCE provider"); + + System.out.println("Using key: " + publicKey); + + System.out.println("\nVerifying RSA Signature over a " + + toBeSigned.length + "-byte data (signature length: " + + signature.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + (signature.length * 2) + + "x", new java.math.BigInteger(1, signature))); + + sig1.initVerify(publicKey); + sig1.update(toBeSigned); + + if (sig1.verify(signature)) { + System.out.println("Verify PASSED\n"); + } else { + throw new Exception("Verify FAILED"); + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,83 @@ +#!/bin/sh + +# +# Copyright (c) 2011, 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 6753664 +# @run shell SignUsingSHA2withRSA.sh +# @summary Support SHA256 (and higher) in SunMSCAPI + +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi + +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi + +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +OS=`uname -s` +case "$OS" in + Windows* | CYGWIN* ) + + echo "Creating a temporary RSA keypair in the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -genkeypair \ + -storetype Windows-My \ + -keyalg RSA \ + -alias 6753664 \ + -dname "cn=6753664,c=US" \ + -noprompt + + echo + echo "Running the test..." + ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java + ${TESTJAVA}/bin/java SignUsingSHA2withRSA + + rc=$? + + echo + echo "Removing the temporary RSA keypair from the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -delete \ + -storetype Windows-My \ + -alias 6753664 + + echo done. + exit $rc + ;; + + * ) + echo "This test is not intended for '$OS' - passing test" + exit 0 + ;; +esac diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/.hgignore --- a/langtools/.hgignore Wed May 11 16:12:01 2011 -0700 +++ b/langtools/.hgignore Sat May 14 11:52:15 2011 -0700 @@ -1,3 +1,4 @@ ^build/ ^dist/ /nbproject/private/ +^.hgtip diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/.hgtags --- a/langtools/.hgtags Wed May 11 16:12:01 2011 -0700 +++ b/langtools/.hgtags Sat May 14 11:52:15 2011 -0700 @@ -114,3 +114,5 @@ a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 +258e6654aba25aab91c9ba3b4c53d05bc895a86c jdk7-b140 +90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/source/util/Trees.java --- a/langtools/src/share/classes/com/sun/source/util/Trees.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -38,6 +38,7 @@ import javax.tools.Diagnostic; import javax.tools.JavaCompiler.CompilationTask; +import com.sun.source.tree.CatchTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.MethodTree; @@ -207,4 +208,11 @@ public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg, com.sun.source.tree.Tree t, com.sun.source.tree.CompilationUnitTree root); + + /** + * Gets the lub of an exception parameter declared in a catch clause. + * @param tree the tree for the catch clause + * @return The lub of the exception parameter + */ + public abstract TypeMirror getLub(CatchTree tree); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Sat May 14 11:52:15 2011 -0700 @@ -149,11 +149,20 @@ ClassUseMapper mapper = new ClassUseMapper(configuration.root, classtree); ClassDoc[] classes = configuration.root.classes(); for (int i = 0; i < classes.length; i++) { - ClassUseWriter.generate(configuration, mapper, classes[i]); + // If -nodeprecated option is set and the containing package is marked + // as deprecated, do not generate the class-use page. We will still generate + // the class-use page if the class is marked as deprecated but the containing + // package is not since it could still be linked from that package-use page. + if (!(configuration.nodeprecated && + Util.isDeprecated(classes[i].containingPackage()))) + ClassUseWriter.generate(configuration, mapper, classes[i]); } PackageDoc[] pkgs = configuration.packages; for (int i = 0; i < pkgs.length; i++) { - PackageUseWriter.generate(configuration, mapper, pkgs[i]); + // If -nodeprecated option is set and the package is marked + // as deprecated, do not generate the package-use page. + if (!(configuration.nodeprecated && Util.isDeprecated(pkgs[i]))) + PackageUseWriter.generate(configuration, mapper, pkgs[i]); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -31,6 +31,7 @@ import com.sun.javadoc.*; import java.util.*; import java.io.*; +import java.net.*; /** * Configure the output based on the command line options. @@ -48,6 +49,7 @@ * @author Robert Field. * @author Atul Dambalkar. * @author Jamie Ho + * @author Bhavesh Patel (Modified) */ public class ConfigurationImpl extends Configuration { @@ -110,6 +112,11 @@ public String stylesheetfile = ""; /** + * Argument for command line option "-Xdocrootparent". + */ + public String docrootparent = ""; + + /** * True if command line option "-nohelp" is used. Default value is false. */ public boolean nohelp = false; @@ -239,6 +246,8 @@ stylesheetfile = os[1]; } else if (opt.equals("-charset")) { charset = os[1]; + } else if (opt.equals("-xdocrootparent")) { + docrootparent = os[1]; } else if (opt.equals("-nohelp")) { nohelp = true; } else if (opt.equals("-splitindex")) { @@ -322,7 +331,8 @@ option.equals("-helpfile") || option.equals("-stylesheetfile") || option.equals("-charset") || - option.equals("-overview")) { + option.equals("-overview") || + option.equals("-xdocrootparent")) { return 2; } else { return 0; @@ -372,6 +382,13 @@ return false; } nohelp = true; + } else if (opt.equals("-xdocrootparent")) { + try { + new URL(os[1]); + } catch (MalformedURLException e) { + reporter.printError(getText("doclet.MalformedURL", os[1])); + return false; + } } else if (opt.equals("-overview")) { if (nooverview == true) { reporter.printError(getText("doclet.Option_conflict", diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -42,15 +42,15 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private static final String[] ANCHORS = new String[] { - "interface", "class", "enum", "exception", "error", "annotation_type", - "field", "method", "constructor", "enum_constant", + "package", "interface", "class", "enum", "exception", "error", + "annotation_type", "field", "method", "constructor", "enum_constant", "annotation_type_member" }; private static final String[] HEADING_KEYS = new String[] { - "doclet.Deprecated_Interfaces", "doclet.Deprecated_Classes", - "doclet.Deprecated_Enums", "doclet.Deprecated_Exceptions", - "doclet.Deprecated_Errors", + "doclet.Deprecated_Packages", "doclet.Deprecated_Interfaces", + "doclet.Deprecated_Classes", "doclet.Deprecated_Enums", + "doclet.Deprecated_Exceptions", "doclet.Deprecated_Errors", "doclet.Deprecated_Annotation_Types", "doclet.Deprecated_Fields", "doclet.Deprecated_Methods", "doclet.Deprecated_Constructors", @@ -59,9 +59,9 @@ }; private static final String[] SUMMARY_KEYS = new String[] { - "doclet.deprecated_interfaces", "doclet.deprecated_classes", - "doclet.deprecated_enums", "doclet.deprecated_exceptions", - "doclet.deprecated_errors", + "doclet.deprecated_packages", "doclet.deprecated_interfaces", + "doclet.deprecated_classes", "doclet.deprecated_enums", + "doclet.deprecated_exceptions", "doclet.deprecated_errors", "doclet.deprecated_annotation_types", "doclet.deprecated_fields", "doclet.deprecated_methods", "doclet.deprecated_constructors", @@ -70,7 +70,7 @@ }; private static final String[] HEADER_KEYS = new String[] { - "doclet.Interface", "doclet.Class", + "doclet.Package", "doclet.Interface", "doclet.Class", "doclet.Enum", "doclet.Exceptions", "doclet.Errors", "doclet.AnnotationType", @@ -116,7 +116,7 @@ DeprecatedListWriter depr = new DeprecatedListWriter(configuration, filename); depr.generateDeprecatedListFile( - new DeprecatedAPIListBuilder(configuration.root)); + new DeprecatedAPIListBuilder(configuration)); depr.close(); } catch (IOException exc) { configuration.standardmessage.error( @@ -149,8 +149,14 @@ memberTableHeader[0] = configuration.getText("doclet.0_and_1", configuration.getText(HEADER_KEYS[i]), configuration.getText("doclet.Description")); - writers[i].addDeprecatedAPI(deprapi.getList(i), - HEADING_KEYS[i], memberTableSummary, memberTableHeader, div); + // DeprecatedAPIListBuilder.PACKAGE == 0, so if i == 0, it is + // a PackageDoc. + if (i == DeprecatedAPIListBuilder.PACKAGE) + addPackageDeprecatedAPI(deprapi.getList(i), + HEADING_KEYS[i], memberTableSummary, memberTableHeader, div); + else + writers[i - 1].addDeprecatedAPI(deprapi.getList(i), + HEADING_KEYS[i], memberTableSummary, memberTableHeader, div); } } body.addContent(div); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -198,23 +198,27 @@ PackageIndexFrameWriter.generate(configuration); } PackageDoc prev = null, next; - for(int i = 0; i < packages.length; i++) { - PackageFrameWriter.generate(configuration, packages[i]); - next = (i + 1 < packages.length && packages[i+1].name().length() > 0) ? - packages[i+1] : null; - //If the next package is unnamed package, skip 2 ahead if possible - next = (i + 2 < packages.length && next == null) ? - packages[i+2]: next; - AbstractBuilder packageSummaryBuilder = configuration. - getBuilderFactory().getPackageSummaryBuilder( - packages[i], prev, next); - packageSummaryBuilder.build(); - if (configuration.createtree) { - PackageTreeWriter.generate(configuration, - packages[i], prev, next, - configuration.nodeprecated); + for (int i = 0; i < packages.length; i++) { + // if -nodeprecated option is set and the package is marked as + // deprecated, do not generate the package-summary.html, package-frame.html + // and package-tree.html pages for that package. + if (!(configuration.nodeprecated && Util.isDeprecated(packages[i]))) { + PackageFrameWriter.generate(configuration, packages[i]); + next = (i + 1 < packages.length && + packages[i + 1].name().length() > 0) ? packages[i + 1] : null; + //If the next package is unnamed package, skip 2 ahead if possible + next = (i + 2 < packages.length && next == null) ? packages[i + 2] : next; + AbstractBuilder packageSummaryBuilder = + configuration.getBuilderFactory().getPackageSummaryBuilder( + packages[i], prev, next); + packageSummaryBuilder.build(); + if (configuration.createtree) { + PackageTreeWriter.generate(configuration, + packages[i], prev, next, + configuration.nodeprecated); + } + prev = packages[i]; } - prev = packages[i]; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat May 14 11:52:15 2011 -0700 @@ -159,22 +159,42 @@ StringBuilder buf = new StringBuilder(); int previndex = 0; while (true) { - // Search for lowercase version of {@docRoot} - index = lowerHtml.indexOf("{@docroot}", previndex); - // If next {@docRoot} tag not found, append rest of htmlstr and exit loop - if (index < 0) { - buf.append(htmlstr.substring(previndex)); - break; - } - // If next {@docroot} tag found, append htmlstr up to start of tag - buf.append(htmlstr.substring(previndex, index)); - previndex = index + 10; // length for {@docroot} string - // Insert relative path where {@docRoot} was located - buf.append(relativepathNoSlash); - // Append slash if next character is not a slash - if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() - && htmlstr.charAt(previndex) != '/') { - buf.append(DirectoryManager.URL_FILE_SEPARATOR); + if (configuration.docrootparent.length() > 0) { + // Search for lowercase version of {@docRoot}/.. + index = lowerHtml.indexOf("{@docroot}/..", previndex); + // If next {@docRoot}/.. pattern not found, append rest of htmlstr and exit loop + if (index < 0) { + buf.append(htmlstr.substring(previndex)); + break; + } + // If next {@docroot}/.. pattern found, append htmlstr up to start of tag + buf.append(htmlstr.substring(previndex, index)); + previndex = index + 13; // length for {@docroot}/.. string + // Insert docrootparent absolute path where {@docRoot}/.. was located + + buf.append(configuration.docrootparent); + // Append slash if next character is not a slash + if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') { + buf.append(DirectoryManager.URL_FILE_SEPARATOR); + } + } else { + // Search for lowercase version of {@docRoot} + index = lowerHtml.indexOf("{@docroot}", previndex); + // If next {@docRoot} tag not found, append rest of htmlstr and exit loop + if (index < 0) { + buf.append(htmlstr.substring(previndex)); + break; + } + // If next {@docroot} tag found, append htmlstr up to start of tag + buf.append(htmlstr.substring(previndex, index)); + previndex = index + 10; // length for {@docroot} string + // Insert relative path where {@docRoot} was located + buf.append(relativepathNoSlash); + // Append slash if next character is not a slash + if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() && + htmlstr.charAt(previndex) != '/') { + buf.append(DirectoryManager.URL_FILE_SEPARATOR); + } } } return buf.toString(); @@ -1395,6 +1415,44 @@ } /** + * Add package deprecation information to the documentation tree + * + * @param deprPkgs list of deprecated packages + * @param headingKey the caption for the deprecated package table + * @param tableSummary the summary for the deprecated package table + * @param tableHeader table headers for the deprecated package table + * @param contentTree the content tree to which the deprecated package table will be added + */ + protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey, + String tableSummary, String[] tableHeader, Content contentTree) { + if (deprPkgs.size() > 0) { + Content table = HtmlTree.TABLE(0, 3, 0, tableSummary, + getTableCaption(configuration().getText(headingKey))); + table.addContent(getSummaryTableHeader(tableHeader, "col")); + Content tbody = new HtmlTree(HtmlTag.TBODY); + for (int i = 0; i < deprPkgs.size(); i++) { + PackageDoc pkg = (PackageDoc) deprPkgs.get(i); + HtmlTree td = HtmlTree.TD(HtmlStyle.colOne, + getPackageLink(pkg, getPackageName(pkg))); + if (pkg.tags("deprecated").length > 0) { + addInlineDeprecatedComment(pkg, pkg.tags("deprecated")[0], td); + } + HtmlTree tr = HtmlTree.TR(td); + if (i % 2 == 0) { + tr.addStyle(HtmlStyle.altColor); + } else { + tr.addStyle(HtmlStyle.rowColor); + } + tbody.addContent(tr); + } + table.addContent(tbody); + Content li = HtmlTree.LI(HtmlStyle.blockList, table); + Content ul = HtmlTree.UL(HtmlStyle.blockList, li); + contentTree.addContent(ul); + } + } + + /** * Prine table header information about color, column span and the font. * * @param color Background color. @@ -2120,7 +2178,7 @@ } } text = (isplaintext) ? - refMemName : getCode() + refMemName + getCodeEnd(); + refMemName : getCode() + Util.escapeHtmlChars(refMemName) + getCodeEnd(); result.append(getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing, refMem, (label.length() == 0)? text: label, false)); @@ -2280,6 +2338,7 @@ public String commentTagsToString(Tag holderTag, Doc doc, Tag[] tags, boolean isFirstSentence) { StringBuilder result = new StringBuilder(); + boolean textTagChange = false; // Array of all possible inline tags for this javadoc run configuration.tagletManager.checkTags(doc, tags, true); for (int i = 0; i < tags.length; i++) { @@ -2295,13 +2354,26 @@ result.append(output == null ? "" : output.toString()); if (originalLength == 0 && isFirstSentence && tagelem.name().equals("@inheritDoc") && result.length() > 0) { break; + } else if (configuration.docrootparent.length() > 0 && + tagelem.name().equals("@docRoot") && + ((tags[i + 1]).text()).startsWith("/..")) { + //If Xdocrootparent switch ON, set the flag to remove the /.. occurance after + //{@docRoot} tag in the very next Text tag. + textTagChange = true; + continue; } else { - continue; + continue; } } else { + String text = tagelem.text(); + //If Xdocrootparent switch ON, remove the /.. occurance after {@docRoot} tag. + if (textTagChange) { + text = text.replaceFirst("/..", ""); + textTagChange = false; + } //This is just a regular text tag. The text may contain html links (<a>) //or inline tag {@docRoot}, which will be handled as special cases. - String text = redirectRelativeLinks(tagelem.holder(), tagelem.text()); + text = redirectRelativeLinks(tagelem.holder(), text); // Replace @docRoot only if not represented by an instance of DocRootTaglet, // that is, only if it was not present in a source file doc comment. diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -93,7 +93,7 @@ packgen = new PackageFrameWriter(configuration, packageDoc); String pkgName = Util.getPackageName(packageDoc); Content body = packgen.getBody(false, packgen.getWindowTitle(pkgName)); - Content pkgNameContent = new StringContent(pkgName); + Content pkgNameContent = new RawHtml(pkgName); Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar, packgen.getTargetPackageLink(packageDoc, "classFrame", pkgNameContent)); body.addContent(heading); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -80,7 +80,10 @@ HtmlTree ul = new HtmlTree(HtmlTag.UL); ul.addAttr(HtmlAttr.TITLE, packagesLabel.toString()); for(int i = 0; i < packages.length; i++) { - if (packages[i] != null) { + // Do not list the package if -nodeprecated option is set and the + // package is marked as deprecated. + if (packages[i] != null && + (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))) { ul.addContent(getPackage(packages[i])); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Sat May 14 11:52:15 2011 -0700 @@ -137,6 +137,8 @@ protected void addPackagesList(PackageDoc[] packages, Content tbody) { for (int i = 0; i < packages.length; i++) { if (packages[i] != null && packages[i].name().length() > 0) { + if (configuration.nodeprecated && Util.isDeprecated(packages[i])) + continue; Content packageLinkContent = getPackageLink(packages[i], getPackageName(packages[i])); Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, packageLinkContent); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Sat May 14 11:52:15 2011 -0700 @@ -242,11 +242,16 @@ */ protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException { Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, - getHyperLink("", pkg.name(), new StringContent(Util.getPackageName(pkg)))); + getHyperLink("", Util.getPackageName(pkg), + new RawHtml(Util.getPackageName(pkg)))); contentTree.addContent(tdFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); tdLast.addStyle(HtmlStyle.colLast); - addSummaryComment(pkg, tdLast); + if (pkg != null && pkg.name().length() != 0) { + addSummaryComment(pkg, tdLast); + } else { + tdLast.addContent(getSpace()); + } contentTree.addContent(tdLast); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Sat May 14 11:52:15 2011 -0700 @@ -114,11 +114,12 @@ Content packageHead = new RawHtml(heading); tHeading.addContent(packageHead); div.addContent(tHeading); + addDeprecationInfo(div); if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) { - HtmlTree subTitleDiv = new HtmlTree(HtmlTag.DIV); - subTitleDiv.addStyle(HtmlStyle.subTitle); - addSummaryComment(packageDoc, subTitleDiv); - div.addContent(subTitleDiv); + HtmlTree docSummaryDiv = new HtmlTree(HtmlTag.DIV); + docSummaryDiv.addStyle(HtmlStyle.docSummary); + addSummaryComment(packageDoc, docSummaryDiv); + div.addContent(docSummaryDiv); Content space = getSpace(); Content descLink = getHyperLink("", "package_description", descriptionLabel, "", ""); @@ -139,6 +140,28 @@ } /** + * Add the package deprecation information to the documentation tree. + * + * @param div the content tree to which the deprecation information will be added + */ + public void addDeprecationInfo(Content div) { + Tag[] deprs = packageDoc.tags("deprecated"); + if (Util.isDeprecated(packageDoc)) { + HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); + deprDiv.addStyle(HtmlStyle.deprecatedContent); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + deprDiv.addContent(deprPhrase); + if (deprs.length > 0) { + Tag[] commentTags = deprs[0].inlineTags(); + if (commentTags.length > 0) { + addInlineDeprecatedComment(packageDoc, deprs[0], deprDiv); + } + } + div.addContent(deprDiv); + } + } + + /** * {@inheritDoc} */ public Content getSummaryHeader() { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Sat May 14 11:52:15 2011 -0700 @@ -82,12 +82,20 @@ } PackageDoc[] pds = rd.specifiedPackages(); for (int i = 0; i < pds.length; i++) { - convertPackage(configuration, pds[i], outputdir); + // If -nodeprecated option is set and the package is marked as deprecated, + // do not convert the package files to HTML. + if (!(configuration.nodeprecated && Util.isDeprecated(pds[i]))) + convertPackage(configuration, pds[i], outputdir); } ClassDoc[] cds = rd.specifiedClasses(); for (int i = 0; i < cds.length; i++) { - convertClass(configuration, cds[i], - getPackageOutputDir(outputdir, cds[i].containingPackage())); + // If -nodeprecated option is set and the class is marked as deprecated + // or the containing package is deprecated, do not convert the + // package files to HTML. + if (!(configuration.nodeprecated && + (Util.isDeprecated(cds[i]) || Util.isDeprecated(cds[i].containingPackage())))) + convertClass(configuration, cds[i], + getPackageOutputDir(outputdir, cds[i].containingPackage())); } } @@ -106,7 +114,12 @@ String classOutputdir = getPackageOutputDir(outputdir, pd); ClassDoc[] cds = pd.allClasses(); for (int i = 0; i < cds.length; i++) { - convertClass(configuration, cds[i], classOutputdir); + // If -nodeprecated option is set and the class is marked as deprecated, + // do not convert the package files to HTML. We do not check for + // containing package deprecation since it is already check in + // the calling method above. + if (!(configuration.nodeprecated && Util.isDeprecated(cds[i]))) + convertClass(configuration, cds[i], classOutputdir); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,7 +59,10 @@ * {@inheritDoc} */ public TagletOutput getDocRootOutput() { - return new TagletOutputImpl(htmlWriter.relativepathNoSlash); + if (htmlWriter.configuration.docrootparent.length() > 0) + return new TagletOutputImpl(htmlWriter.configuration.docrootparent); + else + return new TagletOutputImpl(htmlWriter.relativepathNoSlash); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,7 +132,11 @@ HtmlTree ul = new HtmlTree(HtmlTag.UL); ul.addStyle(HtmlStyle.horizontal); for (int i = 0; i < packages.length; i++) { - if (packages[i].name().length() == 0) { + // If the package name length is 0 or if -nodeprecated option + // is set and the package is marked as deprecated, do not include + // the page in the list of package hierarchies. + if (packages[i].name().length() == 0 || + (configuration.nodeprecated && Util.isDeprecated(packages[i]))) { continue; } String link = pathString(packages[i], "package-tree.html"); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -46,6 +46,7 @@ contentContainer, description, details, + docSummary, header, horizontal, footer, @@ -67,6 +68,7 @@ subNavList, subTitle, summary, + deprecatedContent, tabEnd, title, topNav; diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Sat May 14 11:52:15 2011 -0700 @@ -68,6 +68,7 @@ doclet.see.malformed_tag=Tag {0}: Malformed: {1} doclet.Inherited_API_Summary=Inherited API Summary doclet.Deprecated_API=Deprecated API +doclet.Deprecated_Packages=Deprecated Packages doclet.Deprecated_Classes=Deprecated Classes doclet.Deprecated_Enums=Deprecated Enums doclet.Deprecated_Interfaces=Deprecated Interfaces @@ -79,6 +80,7 @@ doclet.Deprecated_Methods=Deprecated Methods doclet.Deprecated_Enum_Constants=Deprecated Enum Constants doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements +doclet.deprecated_packages=deprecated packages doclet.deprecated_classes=deprecated classes doclet.deprecated_enums=deprecated enums doclet.deprecated_interfaces=deprecated interfaces @@ -245,6 +247,7 @@ -tag <name>:<locations>:<header> Specify single argument custom tags\n\ -taglet The fully qualified name of Taglet to register\n\ -tagletpath The path to Taglets\n\ + -Xdocrootparent <url> Replaces all appearances of @docRoot followed by /.. in doc comments with <url>\n\ -charset <charset> Charset for cross-platform viewing of generated documentation.\n\ -helpfile <file> Include file that help link links to\n\ -linksource Generate source in HTML\n\ diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -11,54 +11,30 @@ doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64 doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64 doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64 -# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc. doclet.Prev=\u524D -# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc. doclet.Next=\u6B21 -# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc. -doclet.Prev_Class=PREV CLASS -# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc. -doclet.Next_Class=NEXT CLASS -# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc. -doclet.Prev_Package=PREV PACKAGE -# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc. -doclet.Next_Package=NEXT PACKAGE -# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index. -doclet.Prev_Letter=PREV LETTER -# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index. -doclet.Next_Letter=NEXT LETTER -# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc. -doclet.Show_Lists=SHOW LISTS -# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc. -doclet.Hide_Lists=HIDE LISTS +doclet.Prev_Class=\u524D\u306E\u30AF\u30E9\u30B9 +doclet.Next_Class=\u6B21\u306E\u30AF\u30E9\u30B9 +doclet.Prev_Package=\u524D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.Next_Package=\u6B21\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.Prev_Letter=\u524D\u306E\u6587\u5B57 +doclet.Next_Letter=\u6B21\u306E\u6587\u5B57 doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9 doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8 doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary. -doclet.Summary=SUMMARY: -# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail. -doclet.Detail=DETAIL: -# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc. -doclet.navNested=NESTED -# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc. -doclet.navAnnotationTypeOptionalMember=OPTIONAL -# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeRequiredMember=REQUIRED -# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeMember=ELEMENT -# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc. -doclet.navField=FIELD -# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc. -doclet.navEnum=ENUM CONSTANTS -# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc. -doclet.navConstructor=CONSTR -# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc. -doclet.navMethod=METHOD -# The following resource does not seem to be used anymore. -doclet.navFactoryMethod=FACTORY +doclet.Summary=\u6982\u8981: +doclet.Detail=\u8A73\u7D30: +doclet.navNested=\u30CD\u30B9\u30C8 +doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3 +doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808 +doclet.navAnnotationTypeMember=\u8981\u7D20 +doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9 +doclet.navEnum=\u5217\u6319\u5B9A\u6570 +doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF +doclet.navMethod=\u30E1\u30BD\u30C3\u30C9 doclet.Index=\u7D22\u5F15 doclet.Window_Single_Index=\u7D22\u5F15 doclet.Window_Split_Index={0}\u306E\u7D22\u5F15 @@ -66,12 +42,6 @@ doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7 doclet.New_Page=NewPage doclet.None=\u306A\u3057 -# The following resource does not seem to be used anymore -doclet.CLASSES=CLASSES -# The following resource does not seem to be used anymore -doclet.MEMBERS=MEMBERS -# The following resource does not seem to be used anymore -doclet.NONE=\u306A\u3057 doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30 doclet.navDeprecated=\u975E\u63A8\u5968 doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8 @@ -136,10 +106,7 @@ doclet.Option=\u30AA\u30D7\u30B7\u30E7\u30F3 doclet.Or=\u307E\u305F\u306F doclet.Frames=\u30D5\u30EC\u30FC\u30E0 -# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames. -doclet.FRAMES=FRAMES -# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames. -doclet.NO_FRAMES=NO FRAMES +doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057 doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64: doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64 doclet.Source_Code=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9: @@ -147,11 +114,10 @@ doclet.Cannot_handle_no_packages=\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002 doclet.Frame_Alert=\u30D5\u30EC\u30FC\u30E0\u95A2\u9023\u306E\u30A2\u30E9\u30FC\u30C8 doclet.Overview-Member-Frame=\u6982\u8981\u30E1\u30F3\u30D0\u30FC\u30FB\u30D5\u30EC\u30FC\u30E0 -doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 +doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002{0}\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059\u3002 doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002 -doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3002 +doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30F3 doclet.Frame_Version=\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3 -doclet.Link_To=\u30EA\u30F3\u30AF\u5148 doclet.Following_From_Class=\u30AF\u30E9\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0: doclet.Following_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0: doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E: @@ -167,7 +133,7 @@ doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210 doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002 -doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F4\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A @@ -190,16 +156,16 @@ doclet.Help_line_24=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306B\u3088\u308A\u3001\u524D\u307E\u305F\u306F\u6B21\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u95A2\u9023\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\u3067\u304D\u307E\u3059\u3002 doclet.Help_line_25=\u30D5\u30EC\u30FC\u30E0/\u30D5\u30EC\u30FC\u30E0\u306A\u3057 doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002 -doclet.Help_line_27=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002 -doclet.Help_line_28=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002 -doclet.Help_line_29=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002 +doclet.Help_line_29=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002 +doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059: doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00 doclet.Help_enum_line_3=\u5217\u6319\u578B\u306E\u8AAC\u660E doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059: doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00 doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E -doclet.The=The doclet.Style_line_1=javadoc\u30B9\u30BF\u30A4\u30EB\u30FB\u30B7\u30FC\u30C8 doclet.Style_line_2=\u8272\u3084\u30D5\u30A9\u30F3\u30C8\u306A\u3069\u306E\u30B9\u30BF\u30A4\u30EB\u5C5E\u6027\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306F\u3001\u3053\u3053\u3067\u5B9A\u7FA9\u3057\u307E\u3059 doclet.Style_line_3=\u30DA\u30FC\u30B8\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u8272 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -11,54 +11,30 @@ doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784 doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784 doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784 -# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc. doclet.Prev=\u4E0A\u4E00\u4E2A -# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc. doclet.Next=\u4E0B\u4E00\u4E2A -# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc. -doclet.Prev_Class=PREV CLASS -# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc. -doclet.Next_Class=NEXT CLASS -# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc. -doclet.Prev_Package=PREV PACKAGE -# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc. -doclet.Next_Package=NEXT PACKAGE -# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index. -doclet.Prev_Letter=PREV LETTER -# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index. -doclet.Next_Letter=NEXT LETTER -# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc. -doclet.Show_Lists=SHOW LISTS -# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc. -doclet.Hide_Lists=HIDE LISTS +doclet.Prev_Class=\u4E0A\u4E00\u4E2A\u7C7B +doclet.Next_Class=\u4E0B\u4E00\u4E2A\u7C7B +doclet.Prev_Package=\u4E0A\u4E00\u4E2A\u7A0B\u5E8F\u5305 +doclet.Next_Package=\u4E0B\u4E00\u4E2A\u7A0B\u5E8F\u5305 +doclet.Prev_Letter=\u4E0A\u4E00\u4E2A\u5B57\u6BCD +doclet.Next_Letter=\u4E0B\u4E00\u4E2A\u5B57\u6BCD doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3 doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570 doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3 -# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary. -doclet.Summary=SUMMARY: -# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail. -doclet.Detail=DETAIL: -# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc. -doclet.navNested=NESTED -# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc. -doclet.navAnnotationTypeOptionalMember=OPTIONAL -# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeRequiredMember=REQUIRED -# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeMember=ELEMENT -# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc. -doclet.navField=FIELD -# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc. -doclet.navEnum=ENUM CONSTANTS -# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc. -doclet.navConstructor=CONSTR -# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc. -doclet.navMethod=METHOD -# The following resource does not seem to be used anymore. -doclet.navFactoryMethod=FACTORY +doclet.Summary=\u6982\u8981: +doclet.Detail=\u8BE6\u7EC6\u8D44\u6599: +doclet.navNested=\u5D4C\u5957 +doclet.navAnnotationTypeOptionalMember=\u53EF\u9009 +doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700 +doclet.navAnnotationTypeMember=\u5143\u7D20 +doclet.navField=\u5B57\u6BB5 +doclet.navEnum=\u679A\u4E3E\u5E38\u91CF +doclet.navConstructor=\u6784\u9020\u5668 +doclet.navMethod=\u65B9\u6CD5 doclet.Index=\u7D22\u5F15 doclet.Window_Single_Index=\u7D22\u5F15 doclet.Window_Split_Index={0} - \u7D22\u5F15 @@ -66,12 +42,6 @@ doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5 doclet.New_Page=NewPage doclet.None=\u65E0 -# The following resource does not seem to be used anymore -doclet.CLASSES=CLASSES -# The following resource does not seem to be used anymore -doclet.MEMBERS=MEMBERS -# The following resource does not seem to be used anymore -doclet.NONE=\u65E0 doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599 doclet.navDeprecated=\u5DF2\u8FC7\u65F6 doclet.Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868 @@ -136,10 +106,7 @@ doclet.Option=\u9009\u9879 doclet.Or=\u6216 doclet.Frames=\u6846\u67B6 -# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames. -doclet.FRAMES=FRAMES -# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames. -doclet.NO_FRAMES=NO FRAMES +doclet.No_Frames=\u65E0\u6846\u67B6 doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784: doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784 doclet.Source_Code=\u6E90\u4EE3\u7801: @@ -147,11 +114,10 @@ doclet.Cannot_handle_no_packages=\u65E0\u6CD5\u5904\u7406\u6CA1\u6709\u7A0B\u5E8F\u5305\u7684\u60C5\u51B5\u3002 doclet.Frame_Alert=\u6846\u67B6\u9884\u8B66 doclet.Overview-Member-Frame=\u6210\u5458\u6846\u67B6\u6982\u89C8 -doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002 +doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002\u94FE\u63A5\u5230{0}\u3002 doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002 -doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C\u3002 +doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C doclet.Frame_Version=\u6846\u67B6\u7248\u672C -doclet.Link_To=\u94FE\u63A5\u5230 doclet.Following_From_Class=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u7C7B{0}\u590D\u5236\u7684 doclet.Following_From_Interface=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u63A5\u53E3{0}\u590D\u5236\u7684 doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E: @@ -167,7 +133,7 @@ doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002 doclet.Help_line_3={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002 -doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u56DB\u4E2A\u7C7B\u522B: +doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B: doclet.Help_line_5=\u7C7B/\u63A5\u53E3 doclet.Help_line_6=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210: doclet.Help_line_7=\u7C7B\u7EE7\u627F\u56FE @@ -190,16 +156,16 @@ doclet.Help_line_24=\u8FD9\u4E9B\u94FE\u63A5\u4F7F\u60A8\u53EF\u4EE5\u8F6C\u81F3\u4E0B\u4E00\u4E2A\u6216\u4E0A\u4E00\u4E2A\u7C7B, \u63A5\u53E3, \u7A0B\u5E8F\u5305\u6216\u76F8\u5173\u9875\u9762\u3002 doclet.Help_line_25=\u6846\u67B6/\u65E0\u6846\u67B6 doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002 -doclet.Help_line_27=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002 -doclet.Help_line_28=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002 -doclet.Help_line_29=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002 +doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002 +doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002 +doclet.Help_line_29=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002 +doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002 doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206: doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E doclet.Help_enum_line_3=\u679A\u4E3E\u8BF4\u660E doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206: doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E -doclet.The=\u8BE5 doclet.Style_line_1=Javadoc \u6837\u5F0F\u8868 doclet.Style_line_2=\u5728\u6B64\u5904\u5B9A\u4E49\u989C\u8272, \u5B57\u4F53\u548C\u5176\u4ED6\u6837\u5F0F\u5C5E\u6027\u4EE5\u8986\u76D6\u9ED8\u8BA4\u503C doclet.Style_line_3=\u9875\u9762\u80CC\u666F\u989C\u8272 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -419,7 +419,7 @@ docencoding = encoding; } - classDocCatalog = new ClassDocCatalog(root.specifiedClasses()); + classDocCatalog = new ClassDocCatalog(root.specifiedClasses(), this); initTagletManager(customTagStrs); } @@ -677,15 +677,18 @@ } /** - * Return true if the doc element is getting documented, depending upon - * -nodeprecated option and @deprecated tag used. Return true if - * -nodeprecated is not used or @deprecated tag is not used. + * Return true if the ClassDoc element is getting documented, depending upon + * -nodeprecated option and the deprecation information. Return true if + * -nodeprecated is not used. Return false if -nodeprecated is used and if + * either ClassDoc element is deprecated or the containing package is deprecated. + * + * @param cd the ClassDoc for which the page generation is checked */ - public boolean isGeneratedDoc(Doc doc) { + public boolean isGeneratedDoc(ClassDoc cd) { if (!nodeprecated) { return true; } - return (doc.tags("deprecated")).length == 0; + return !(Util.isDeprecated(cd) || Util.isDeprecated(cd.containingPackage())); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Sat May 14 11:52:15 2011 -0700 @@ -2,17 +2,10 @@ /* Overall document style */ -* { - margin:0; - padding:0; -} body { font-family:Helvetica, Arial, sans-serif; color:#000000; } -p { - margin:20px 0; -} pre { font-size:1.0em; } @@ -30,35 +23,18 @@ } ul { margin:10px 0 10px 20px; -} -li { - list-style:disc; -} -dl dt { - font-size:0.95em; - font-weight:bold; - margin:10px 0 0 0; -} -dl dd { - margin:10px 0 10px 20px; -} -dl dd ul { - margin-left:0; -} -dl dd ul li { - list-style:none; - margin:10px 0 10px 0; + list-style-type:disc; } caption { background: #CCCCFF; color:#000000; - text-align: left; - font-size: 150%; - font-weight: bold; - border-left: 2px ridge; - border-right: 2px ridge; - border-top: 2px ridge; - padding-left: 5px; + text-align:left; + font-size:150%; + font-weight:bold; + border-left:2px ridge; + border-right:2px ridge; + border-top:2px ridge; + padding-left:5px; width:auto; } /* @@ -70,11 +46,11 @@ color:#000000; } .legalCopy { - margin:7px; + margin:7px 0; } .bar { font-size:1em; - margin:10px 0 0 10px; + margin:10px 0 0 2px; } .bar a { font-weight:normal; @@ -84,24 +60,21 @@ */ .topNav { border-top:2px solid #C0C0C0; - margin:7px; padding:7px 0; height:2.8em; - width:99%; + width:100%; min-width:600px; } .bottomNav { border-top:2px solid #C0C0C0; - margin:7px; padding:7px 0; height:2.8em; - width:99%; + width:100%; } .subNav { border-bottom:2px solid #C0C0C0; float:left; - width:99%; - margin:7px; + width:100%; min-width:600px; } .subNav div { @@ -120,7 +93,7 @@ /* Navigation bar list styles */ .topNav ul.navList, .bottomNav ul.navList { background-color:#EEEEFF; - padding:7px 5px; + padding:4px 4px; margin:0; float:left; width:80%; @@ -128,7 +101,7 @@ ul.navList li{ list-style:none; float:left; - padding:3px 4px; + padding:0 4px; color:#000000; font-size:0.98em; } @@ -142,14 +115,16 @@ .subNav ul.navList { float:left; margin:0; + padding:0; font-size:0.8em; width:350px; } ul.subNavList { float:left; - margin:0; font-size:0.8em; width:350px; + margin:0; + padding:0; } ul.subNavList li{ list-style:none; @@ -161,16 +136,16 @@ */ .header, .footer { clear:both; - margin:0 7px; + padding:10px 0; } .indexHeader { font-size:0.9em; - margin:10px 0 7px 10px; + margin:10px 0 0 2px; } .header ul { padding-left:20px; } -/* Header and footer title styles */ +/* Header and footer title styles */ .header h1.title { font-size:1.4em; text-align:center; @@ -181,7 +156,16 @@ margin:0; } .subTitle { + padding-top:10px; +} +/* +Content styles +*/ +.deprecatedContent { margin:0; + padding:10px 0; +} +.docSummary { padding-top:10px; } /* @@ -190,11 +174,11 @@ .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { clear:both; - padding:10px 10px; position:relative; + padding-bottom:20px; } .indexContainer { - padding:0 0 10px 10px; + padding:0 0 0 2px; font-size:0.9em; } /* @@ -221,7 +205,8 @@ .indexContainer h2 { font-weight:normal; font-size:1.0em; - padding:10px 0 0 0; + padding:5px 0 0 0; + margin:10px 0 0 0; } .contentContainer h2 { margin:10px 0; @@ -263,7 +248,7 @@ background:#CCCCFF; border:0; border:2px ridge; - padding-left:5px; + margin:0; } div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 { background:#EEEEFF; @@ -274,23 +259,22 @@ div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { font-size:1.15em; font-weight:bold; - padding:0 0 10px 0; + padding:0 0 5px 0; + margin:0; } /* Table styles */ .contentContainer table { - border-collapse: collapse ; + border-collapse:collapse ; width:100%; } .contentContainer table td, .contentContainer table th { border:2px ridge; - padding:3px; } /* Constant values page table styles */ .constantValuesContainer table { - border-collapse: collapse ; - margin:0 0 10px 0; + border-collapse:collapse; } .constantValuesContainer table caption{ font-size:0.95em; @@ -303,12 +287,9 @@ } /* Class-use/Package-use page table styles */ .classUseContainer table { - border-collapse: collapse ; + border-collapse:collapse ; width:100%; - margin:0 0 15px 0; -} -.classUseContainer ul li ul li table { - margin-bottom:30px; + margin:0 0 10px 0; } .classUseContainer ul li ul li table caption{ font-size:0.95em; @@ -365,6 +346,7 @@ /* Container specific list styles */ .indexContainer ul { margin:0; + padding:0; } .indexContainer ul li { list-style:none; @@ -376,6 +358,7 @@ list-style:none; border:0; border-bottom:2px ridge; + height:1%; } .serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast { list-style:none; @@ -395,6 +378,7 @@ div.details ul.blockList ul.blockList ul.blockList li.blockList { border:0; border-bottom:2px ridge; + height:1%; } /* Definition list styles */ ul.blockList li.blockList dl{ @@ -413,9 +397,17 @@ ul.blockList li.blockList pre{ margin:0 0 15px 0; } +.description dl dt { + font-size:0.95em; + font-weight:bold; + margin:5px 0 0 0; +} +.description dl dd { + margin:10px 0 10px 20px; +} /* List content styles */ ul.blockList li.blockList ul.blockList li.blockList pre{ - margin:10px 0 15px 0; + margin:10px 0 10px 0; } ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre, ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{ diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,13 +47,6 @@ /** * {@inheritDoc} */ - public boolean inPackage() { - return false; - } - - /** - * {@inheritDoc} - */ public TagletOutput getTagletOutput(Doc holder, TagletWriter writer) { return writer.deprecatedTagOutput(holder); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2011, 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 @@ -25,8 +25,9 @@ package com.sun.tools.doclets.internal.toolkit.util; +import java.util.*; import com.sun.javadoc.*; -import java.util.*; +import com.sun.tools.doclets.internal.toolkit.Configuration; /** * This class acts as an artificial PackageDoc for classes specified @@ -88,13 +89,16 @@ */ private Map<String,Set<ClassDoc>> interfaces; + private Configuration configuration; + /** * Construct a new ClassDocCatalog. * * @param classdocs the array of ClassDocs to catalog */ - public ClassDocCatalog (ClassDoc[] classdocs) { + public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) { init(); + this.configuration = config; for (int i = 0; i < classdocs.length; i++) { addClassDoc(classdocs[i]); } @@ -151,9 +155,10 @@ private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) { PackageDoc pkg = classdoc.containingPackage(); - if (pkg.isIncluded()) { - //No need to catalog this class since it's package is - //included on the command line + if (pkg.isIncluded() || (configuration.nodeprecated && Util.isDeprecated(pkg))) { + //No need to catalog this class if it's package is + //included on the command line or if -nodeprecated option is set + // and the containing package is marked as deprecated. return; } String key = Util.getPackageName(pkg); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -122,8 +122,12 @@ */ private void buildTree(ClassDoc[] classes, Configuration configuration) { for (int i = 0; i < classes.length; i++) { + // In the tree page (e.g overview-tree.html) do not include + // information of classes which are deprecated or are a part of a + // deprecated package. if (configuration.nodeprecated && - classes[i].tags("deprecated").length > 0) { + (Util.isDeprecated(classes[i]) || + Util.isDeprecated(classes[i].containingPackage()))) { continue; } if (classes[i].isEnum()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,27 +27,29 @@ import com.sun.javadoc.*; import java.util.*; +import com.sun.tools.doclets.internal.toolkit.Configuration; /** - * Build list of all the deprecated classes, constructors, fields and methods. + * Build list of all the deprecated packages, classes, constructors, fields and methods. * * @author Atul M Dambalkar */ public class DeprecatedAPIListBuilder { - public static final int NUM_TYPES = 11; + public static final int NUM_TYPES = 12; - public static final int INTERFACE = 0; - public static final int CLASS = 1; - public static final int ENUM = 2; - public static final int EXCEPTION = 3; - public static final int ERROR = 4; - public static final int ANNOTATION_TYPE = 5; - public static final int FIELD = 6; - public static final int METHOD = 7; - public static final int CONSTRUCTOR = 8; - public static final int ENUM_CONSTANT = 9; - public static final int ANNOTATION_TYPE_MEMBER = 10; + public static final int PACKAGE = 0; + public static final int INTERFACE = 1; + public static final int CLASS = 2; + public static final int ENUM = 3; + public static final int EXCEPTION = 4; + public static final int ERROR = 5; + public static final int ANNOTATION_TYPE = 6; + public static final int FIELD = 7; + public static final int METHOD = 8; + public static final int CONSTRUCTOR = 9; + public static final int ENUM_CONSTANT = 10; + public static final int ANNOTATION_TYPE_MEMBER = 11; /** * List of deprecated type Lists. @@ -58,25 +60,33 @@ /** * Constructor. * - * @param root Root of the tree. + * @param configuration the current configuration of the doclet */ - public DeprecatedAPIListBuilder(RootDoc root) { + public DeprecatedAPIListBuilder(Configuration configuration) { deprecatedLists = new ArrayList<List<Doc>>(); for (int i = 0; i < NUM_TYPES; i++) { deprecatedLists.add(i, new ArrayList<Doc>()); } - buildDeprecatedAPIInfo(root); + buildDeprecatedAPIInfo(configuration); } /** * Build the sorted list of all the deprecated APIs in this run. - * Build separate lists for deprecated classes, constructors, methods and - * fields. + * Build separate lists for deprecated packages, classes, constructors, + * methods and fields. * - * @param root Root of the tree. + * @param configuration the current configuration of the doclet. */ - private void buildDeprecatedAPIInfo(RootDoc root) { - ClassDoc[] classes = root.classes(); + private void buildDeprecatedAPIInfo(Configuration configuration) { + PackageDoc[] packages = configuration.packages; + PackageDoc pkg; + for (int c = 0; c < packages.length; c++) { + pkg = packages[c]; + if (Util.isDeprecated(pkg)) { + getList(PACKAGE).add(pkg); + } + } + ClassDoc[] classes = configuration.root.classes(); for (int i = 0; i < classes.length; i++) { ClassDoc cd = classes[i]; if (Util.isDeprecated(cd)) { @@ -90,7 +100,7 @@ getList(ENUM).add(cd); } else if (cd.isError()) { getList(ERROR).add(cd); - }else if (cd.isAnnotationType()) { + } else if (cd.isAnnotationType()) { getList(ANNOTATION_TYPE).add(cd); } } @@ -102,7 +112,7 @@ } if (cd.isAnnotationType()) { composeDeprecatedList(getList(ANNOTATION_TYPE_MEMBER), - ((AnnotationTypeDoc) cd).elements()); + ((AnnotationTypeDoc) cd).elements()); } } sortDeprecatedLists(); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -207,7 +207,17 @@ * Should this doc element be added to the index map? */ protected boolean shouldAddToIndexMap(Doc element) { - return !(noDeprecated && element.tags("deprecated").length > 0); + if (element instanceof PackageDoc) + // Do not add to index map if -nodeprecated option is set and the + // package is marked as deprecated. + return !(noDeprecated && Util.isDeprecated(element)); + else + // Do not add to index map if -nodeprecated option is set and if the + // Doc is marked as deprecated or the containing package is marked as + // deprecated. + return !(noDeprecated && + (Util.isDeprecated(element) || + Util.isDeprecated(((ProgramElementDoc)element).containingPackage()))); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -76,13 +76,16 @@ protected void generatePackageListFile(RootDoc root) { PackageDoc[] packages = configuration.packages; - String[] names = new String[packages.length]; + ArrayList<String> names = new ArrayList<String>(); for (int i = 0; i < packages.length; i++) { - names[i] = packages[i].name(); + // if the -nodeprecated option is set and the package is marked as + // deprecated, do not include it in the packages list. + if (!(configuration.nodeprecated && Util.isDeprecated(packages[i]))) + names.add(packages[i].name()); } - Arrays.sort(names); - for (int i = 0; i < packages.length; i++) { - println(names[i]); + Collections.sort(names); + for (int i = 0; i < names.size(); i++) { + println(names.get(i)); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Sat May 14 11:52:15 2011 -0700 @@ -861,11 +861,15 @@ * @param doc the Doc to check. * @return true if the given Doc is deprecated. */ - public static boolean isDeprecated(ProgramElementDoc doc) { + public static boolean isDeprecated(Doc doc) { if (doc.tags("deprecated").length > 0) { return true; } - AnnotationDesc[] annotationDescList = doc.annotations(); + AnnotationDesc[] annotationDescList; + if (doc instanceof PackageDoc) + annotationDescList = ((PackageDoc)doc).annotations(); + else + annotationDescList = ((ProgramElementDoc)doc).annotations(); for (int i = 0; i < annotationDescList.length; i++) { if (annotationDescList[i].annotationType().qualifiedName().equals( java.lang.Deprecated.class.getName())){ diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java --- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -34,11 +34,13 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; +import com.sun.source.tree.CatchTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Scope; import com.sun.source.tree.Tree; @@ -49,7 +51,7 @@ import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Symbol.TypeSymbol; import com.sun.tools.javac.code.Symbol; -import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Type.UnionClassType; import com.sun.tools.javac.comp.Attr; import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.Enter; @@ -430,4 +432,16 @@ log.useSource(oldSource); } } + + @Override + public TypeMirror getLub(CatchTree tree) { + JCCatch ct = (JCCatch) tree; + JCVariableDecl v = ct.param; + if (v.type != null && v.type.getKind() == TypeKind.UNION) { + UnionClassType ut = (UnionClassType) v.type; + return ut.getLub(); + } else { + return v.type; + } + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Scope.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Sat May 14 11:52:15 2011 -0700 @@ -649,7 +649,7 @@ public Iterator<Symbol> iterator() { return new CompoundScopeIterator(subScopes) { Iterator<Symbol> nextIterator(Scope s) { - return s.getElements().iterator(); + return s.getElements(sf).iterator(); } }; } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Source.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Sat May 14 11:52:15 2011 -0700 @@ -186,6 +186,9 @@ public boolean allowSimplifiedVarargs() { return compareTo(JDK1_7) >= 0; } + public boolean allowObjectToPrimitiveCast() { + return compareTo(JDK1_7) >= 0; + } public static SourceVersion toSourceVersion(Source source) { switch(source) { case JDK1_2: diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Type.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Sat May 14 11:52:15 2011 -0700 @@ -25,6 +25,8 @@ package com.sun.tools.javac.code; +import java.util.Collections; + import com.sun.tools.javac.util.*; import com.sun.tools.javac.code.Symbol.*; @@ -741,6 +743,38 @@ } } + // a clone of a ClassType that knows about the alternatives of a union type. + public static class UnionClassType extends ClassType implements UnionType { + final List<? extends Type> alternatives_field; + + public UnionClassType(ClassType ct, List<? extends Type> alternatives) { + super(ct.outer_field, ct.typarams_field, ct.tsym); + allparams_field = ct.allparams_field; + supertype_field = ct.supertype_field; + interfaces_field = ct.interfaces_field; + all_interfaces_field = ct.interfaces_field; + alternatives_field = alternatives; + } + + public Type getLub() { + return tsym.type; + } + + public java.util.List<? extends TypeMirror> getAlternatives() { + return Collections.unmodifiableList(alternatives_field); + } + + @Override + public TypeKind getKind() { + return TypeKind.UNION; + } + + @Override + public <R, P> R accept(TypeVisitor<R, P> v, P p) { + return v.visitUnion(this, p); + } + } + public static class ArrayType extends Type implements javax.lang.model.type.ArrayType { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Types.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Sat May 14 11:52:15 2011 -0700 @@ -74,8 +74,9 @@ final JavacMessages messages; final Names names; final boolean allowBoxing; + final boolean allowCovariantReturns; + final boolean allowObjectToPrimitiveCast; final ClassReader reader; - final Source source; final Check chk; List<Warner> warnStack = List.nil(); final Name capturedName; @@ -92,9 +93,11 @@ context.put(typesKey, this); syms = Symtab.instance(context); names = Names.instance(context); - allowBoxing = Source.instance(context).allowBoxing(); + Source source = Source.instance(context); + allowBoxing = source.allowBoxing(); + allowCovariantReturns = source.allowCovariantReturns(); + allowObjectToPrimitiveCast = source.allowObjectToPrimitiveCast(); reader = ClassReader.instance(context); - source = Source.instance(context); chk = Check.instance(context); capturedName = names.fromString("<captured wildcard>"); messages = JavacMessages.instance(context); @@ -409,6 +412,7 @@ return s.tag == BOT || s.tag == CLASS || s.tag == ARRAY || s.tag == TYPEVAR; + case WILDCARD: //we shouldn't be here - avoids crash (see 7034495) case NONE: return false; default: @@ -949,8 +953,9 @@ return true; if (t.isPrimitive() != s.isPrimitive()) - return allowBoxing && (isConvertible(t, s, warn) || isConvertible(s, t, warn)); - + return allowBoxing && ( + isConvertible(t, s, warn) + || (allowObjectToPrimitiveCast && isConvertible(s, t, warn))); if (warn != warnStack.head) { try { warnStack = warnStack.prepend(warn); @@ -2309,7 +2314,7 @@ if (elemtype == t.elemtype) return t; else - return new ArrayType(elemtype, t.tsym); + return new ArrayType(upperBound(elemtype), t.tsym); } @Override @@ -3070,7 +3075,7 @@ if (hasSameArgs(r1, r2)) return covariantReturnType(r1.getReturnType(), r2res, warner); - if (!source.allowCovariantReturns()) + if (!allowCovariantReturns) return false; if (isSubtypeUnchecked(r1.getReturnType(), r2res, warner)) return true; @@ -3087,7 +3092,7 @@ public boolean covariantReturnType(Type t, Type s, Warner warner) { return isSameType(t, s) || - source.allowCovariantReturns() && + allowCovariantReturns && !t.isPrimitive() && !s.isPrimitive() && isAssignable(t, s, warner); @@ -3293,7 +3298,7 @@ } if (giveWarning && !isReifiable(reverse ? from : to)) warn.warn(LintCategory.UNCHECKED); - if (!source.allowCovariantReturns()) + if (!allowCovariantReturns) // reject if there is a common method signature with // incompatible return types. chk.checkCompatibleAbstracts(warn.pos(), from, to); @@ -3320,7 +3325,7 @@ Type t2 = to; if (disjointTypes(t1.getTypeArguments(), t2.getTypeArguments())) return false; - if (!source.allowCovariantReturns()) + if (!allowCovariantReturns) // reject if there is a common method signature with // incompatible return types. chk.checkCompatibleAbstracts(warn.pos(), from, to); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Sat May 14 11:52:15 2011 -0700 @@ -168,11 +168,11 @@ } JCIdent left = (JCIdent)assign.lhs; Symbol method = rs.resolveQualifiedMethod(left.pos(), - env, - a.type, - left.name, - List.<Type>nil(), - null); + env, + a.type, + left.name, + List.<Type>nil(), + null); left.sym = method; left.type = method.type; if (method.owner != a.type.tsym) @@ -190,6 +190,15 @@ Attribute enterAttributeValue(Type expected, JCExpression tree, Env<AttrContext> env) { + //first, try completing the attribution value sym - if a completion + //error is thrown, we should recover gracefully, and display an + //ordinary resolution diagnostic. + try { + expected.tsym.complete(); + } catch(CompletionFailure e) { + log.error(tree.pos(), "cant.resolve", Kinds.kindName(e.sym), e.sym); + return new Attribute.Error(expected); + } if (expected.isPrimitive() || types.isSameType(expected, syms.stringType)) { Type result = attr.attribExpr(tree, env, expected); if (result.isErroneous()) diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Sat May 14 11:52:15 2011 -0700 @@ -2910,6 +2910,7 @@ public void visitTypeUnion(JCTypeUnion tree) { ListBuffer<Type> multicatchTypes = ListBuffer.lb(); + ListBuffer<Type> all_multicatchTypes = null; // lazy, only if needed for (JCExpression typeTree : tree.alternatives) { Type ctype = attribType(typeTree, env); ctype = chk.checkType(typeTree.pos(), @@ -2931,9 +2932,23 @@ } } multicatchTypes.append(ctype); + if (all_multicatchTypes != null) + all_multicatchTypes.append(ctype); + } else { + if (all_multicatchTypes == null) { + all_multicatchTypes = ListBuffer.lb(); + all_multicatchTypes.appendList(multicatchTypes); + } + all_multicatchTypes.append(ctype); } } - tree.type = result = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt); + Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt); + if (t.tag == CLASS) { + List<Type> alternatives = + ((all_multicatchTypes == null) ? multicatchTypes : all_multicatchTypes).toList(); + t = new UnionClassType((ClassType) t, alternatives); + } + tree.type = result = t; } public void visitTypeParameter(JCTypeParameter tree) { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Check.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Sat May 14 11:52:15 2011 -0700 @@ -681,6 +681,12 @@ "cant.apply.diamond.1", t, diags.fragment("diamond.non.generic", t)); return types.createErrorType(t); + } else if (tree.typeargs != null && + tree.typeargs.nonEmpty()) { + log.error(tree.clazz.pos(), + "cant.apply.diamond.1", + t, diags.fragment("diamond.and.explicit.params", t)); + return types.createErrorType(t); } else { return t; } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Sat May 14 11:52:15 2011 -0700 @@ -1153,8 +1153,7 @@ if (chk.subset(exc, caughtInTry)) { log.error(pos, "except.already.caught", exc); } else if (!chk.isUnchecked(pos, exc) && - exc.tsym != syms.throwableType.tsym && - exc.tsym != syms.exceptionType.tsym && + !isExceptionOrThrowable(exc) && !chk.intersects(exc, thrownInTry)) { log.error(pos, "except.never.thrown.in.try", exc); } else if (allowImprovedCatchAnalysis) { @@ -1163,7 +1162,8 @@ // unchecked exception, the result list would not be empty, as the augmented // thrown set includes { RuntimeException, Error }; if 'exc' was a checked // exception, that would have been covered in the branch above - if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty()) { + if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty() && + !isExceptionOrThrowable(exc)) { String key = catchableThrownTypes.length() == 1 ? "unreachable.catch" : "unreachable.catch.1"; @@ -1171,6 +1171,12 @@ } } } + //where + private boolean isExceptionOrThrowable(Type exc) { + return exc.tsym == syms.throwableType.tsym || + exc.tsym == syms.exceptionType.tsym; + } + public void visitConditional(JCConditional tree) { scanCond(tree.cond); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Sat May 14 11:52:15 2011 -0700 @@ -1609,18 +1609,31 @@ // type.tsym.flatName() should == proxy.enumFlatName TypeSymbol enumTypeSym = proxy.enumType.tsym; VarSymbol enumerator = null; - for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator); - e.scope != null; - e = e.next()) { - if (e.sym.kind == VAR) { - enumerator = (VarSymbol)e.sym; - break; + CompletionFailure failure = null; + try { + for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator); + e.scope != null; + e = e.next()) { + if (e.sym.kind == VAR) { + enumerator = (VarSymbol)e.sym; + break; + } } } + catch (CompletionFailure ex) { + failure = ex; + } if (enumerator == null) { - log.error("unknown.enum.constant", - currentClassFile, enumTypeSym, proxy.enumerator); - result = new Attribute.Error(enumTypeSym.type); + if (failure != null) { + log.warning("unknown.enum.constant.reason", + currentClassFile, enumTypeSym, proxy.enumerator, + failure.getDiagnostic()); + } else { + log.warning("unknown.enum.constant", + currentClassFile, enumTypeSym, proxy.enumerator); + } + result = new Attribute.Enum(enumTypeSym.type, + new VarSymbol(0, proxy.enumerator, syms.botType, enumTypeSym)); } else { result = new Attribute.Enum(enumTypeSym.type, enumerator); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Sat May 14 11:52:15 2011 -0700 @@ -479,7 +479,12 @@ state.pop(1);// index Type a = state.stack[state.stacksize-1]; state.pop(1); - state.push(types.erasure(types.elemtype(a))); } + //sometimes 'null type' is treated as a one-dimensional array type + //see Gen.visitLiteral - we should handle this case accordingly + Type stackType = a.tag == BOT ? + syms.objectType : + types.erasure(types.elemtype(a)); + state.push(stackType); } break; case goto_: markDead(); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java --- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Sat May 14 11:52:15 2011 -0700 @@ -72,11 +72,11 @@ } public Element asElement(TypeMirror t) { - Type type = cast(Type.class, t); - switch (type.tag) { - case TypeTags.CLASS: - case TypeTags.ERROR: - case TypeTags.TYPEVAR: + switch (t.getKind()) { + case DECLARED: + case ERROR: + case TYPEVAR: + Type type = cast(Type.class, t); return type.asElement(); default: return null; diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sat May 14 11:52:15 2011 -0700 @@ -762,9 +762,6 @@ compiler.err.unclosed.str.lit=\ unclosed string literal -compiler.err.unknown.enum.constant=\ - in class file {0}: unknown enum constant {1}.{2} - # 0: name compiler.err.unsupported.encoding=\ unsupported encoding: {0} @@ -1307,6 +1304,15 @@ compiler.warn.annotation.method.not.found.reason=\ Cannot find annotation method ''{1}()'' in type ''{0}'': {2} +# 0: symbol, 1: name +compiler.warn.unknown.enum.constant=\ + unknown enum constant {1}.{2} + +# 0: symbol, 1: name, 2: message segment +compiler.warn.unknown.enum.constant.reason=\ + unknown enum constant {1}.{2}\n\ + reason: {3} + # 0: type, 1: type compiler.warn.raw.class.use=\ found raw type: {0}\n\ @@ -1618,6 +1624,9 @@ compiler.misc.diamond.non.generic=\ cannot use ''<>'' with non-generic class {0} +compiler.misc.diamond.and.explicit.params=\ + cannot use ''<>'' with explicit type parameters for constructor + # 0: type, 1: list of type compiler.misc.explicit.param.do.not.conform.to.bounds=\ explicit type argument {0} does not conform to declared bound(s) {1} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -228,6 +228,9 @@ # 0: symbol compiler.err.multicatch.parameter.may.not.be.assigned=\u8907\u6570catch\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +# 0: type, 1: type +compiler.err.multicatch.types.must.be.disjoint=\u8907\u6570catch\u6587\u306E\u4EE3\u66FF\u3092\u30B5\u30D6\u30AF\u30E9\u30B9\u5316\u306B\u3088\u3063\u3066\u95A2\u9023\u4ED8\u3051\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n\u4EE3\u66FF{0}\u306F\u4EE3\u66FF{1}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3067\u3059 + compiler.err.finally.without.try=''finally''\u3078\u306E''try''\u304C\u3042\u308A\u307E\u305B\u3093 # 0: type, 1: message segment @@ -436,8 +439,12 @@ # Errors related to annotation processing +# 0: symbol, 1: string, 2: stack-trace compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2} +# 0: symbol, 1: string +compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1} + # 0: string compiler.err.proc.cant.find.class=''{0}''\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002 @@ -535,8 +542,6 @@ compiler.err.unclosed.str.lit=\u6587\u5B57\u5217\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093 -compiler.err.unknown.enum.constant=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u5185: \u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2} - # 0: name compiler.err.unsupported.encoding=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3059: {0} @@ -686,6 +691,7 @@ # 0: file name compiler.note.sunapi.filename={0}\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 + compiler.note.sunapi.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 # The following string may appear after one of the above sunapi messages. @@ -796,6 +802,12 @@ # 0: type, 1: type compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059 +# 0: list of type +compiler.warn.unreachable.catch=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: list of type +compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059 + # 0: symbol compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 @@ -888,6 +900,9 @@ # 0: symbol compiler.warn.try.resource.not.referenced=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306F\u5BFE\u5FDC\u3059\u308Btry\u6587\u306E\u672C\u4F53\u3067\u306F\u53C2\u7167\u3055\u308C\u307E\u305B\u3093 +# 0: type +compiler.warn.try.resource.throws.interrupted.exc=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306B\u3001InterruptedException\u3092\u30B9\u30ED\u30FC\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u30E1\u30F3\u30D0\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9close()\u304C\u3042\u308A\u307E\u3059 + compiler.warn.unchecked.assign={0}\u304B\u3089{1}\u3078\u306E\u7121\u691C\u67FB\u4EE3\u5165\u3067\u3059 # 0: symbol, 1: type @@ -924,6 +939,12 @@ compiler.warn.annotation.method.not.found.reason=\u30BF\u30A4\u30D7''{0}''\u5185\u306B\u6CE8\u91C8\u30E1\u30BD\u30C3\u30C9''{1}()''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {2} +# 0: symbol, 1: name +compiler.warn.unknown.enum.constant=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2} + +# 0: symbol, 1: name, 2: message segment +compiler.warn.unknown.enum.constant.reason=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}\n\u7406\u7531: {3} + # 0: type, 1: type compiler.warn.raw.class.use=raw\u578B\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {0}\n\u6C4E\u7528\u30AF\u30E9\u30B9{1}\u306E\u578B\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093 @@ -1011,7 +1032,11 @@ ## above strings. compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059 -compiler.misc.bad.enclosing.method=\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0} +#0: symbol, 1: symbol +compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1} + +# 0: symbol +compiler.misc.bad.enclosing.method=\u30AF\u30E9\u30B9{0}\u306E\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059 compiler.misc.bad.runtime.invisible.param.annotations=RuntimeInvisibleParameterAnnotations\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0} @@ -1140,11 +1165,7 @@ # 0: type compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.arg={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093 - -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.args={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093 +compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: list of type compiler.misc.explicit.param.do.not.conform.to.bounds=\u660E\u793A\u7684\u306A\u578B\u5F15\u6570{0}\u306F\u3001\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 @@ -1291,7 +1312,7 @@ # 0: symbol, 1: symbol, 2: symbol, 3: symbol compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059 -compiler.misc.non.denotable.type=\u3053\u3053\u3067\u975E\u578B\u6307\u5B9A\u578B{0}\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +compiler.misc.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment compiler.misc.inapplicable.method={0} {1}.{2}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({3}) diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -228,6 +228,9 @@ # 0: symbol compiler.err.multicatch.parameter.may.not.be.assigned=\u53EF\u80FD\u672A\u5206\u914D multi-catch \u53C2\u6570{0} +# 0: type, 1: type +compiler.err.multicatch.types.must.be.disjoint=multi-catch \u8BED\u53E5\u4E2D\u7684\u66FF\u4EE3\u65E0\u6CD5\u901A\u8FC7\u5B50\u7C7B\u5316\u5173\u8054\n\u66FF\u4EE3{0}\u662F\u66FF\u4EE3{1}\u7684\u5B50\u7C7B + compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''try'' # 0: type, 1: message segment @@ -436,8 +439,12 @@ # Errors related to annotation processing +# 0: symbol, 1: string, 2: stack-trace compiler.err.proc.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n{2} +# 0: symbol, 1: string +compiler.err.proc.cant.access.1=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1} + # 0: string compiler.err.proc.cant.find.class=\u627E\u4E0D\u5230 ''{0}'' \u7684\u7C7B\u6587\u4EF6\u3002 @@ -535,8 +542,6 @@ compiler.err.unclosed.str.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u4E32\u6587\u5B57 -compiler.err.unknown.enum.constant=\u5728\u7C7B\u6587\u4EF6{0}\u4E2D: \u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2} - # 0: name compiler.err.unsupported.encoding=\u4E0D\u652F\u6301\u7684\u7F16\u7801: {0} @@ -686,6 +691,7 @@ # 0: file name compiler.note.sunapi.filename={0}\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002 + compiler.note.sunapi.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002 # The following string may appear after one of the above sunapi messages. @@ -796,6 +802,12 @@ # 0: type, 1: type compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A +# 0: list of type +compiler.warn.unreachable.catch=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0} + +# 0: list of type +compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0} + # 0: symbol compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B @@ -888,6 +900,9 @@ # 0: symbol compiler.warn.try.resource.not.referenced=\u4E0D\u80FD\u5728\u76F8\u5E94\u7684 try \u8BED\u53E5\u7684\u6B63\u6587\u4E2D\u5F15\u7528\u53EF\u81EA\u52A8\u7ED3\u675F\u7684\u8D44\u6E90{0} +# 0: type +compiler.warn.try.resource.throws.interrupted.exc=\u53EF\u81EA\u52A8\u5173\u95ED\u7684\u8D44\u6E90{0}\u5305\u542B\u7684\u6210\u5458\u65B9\u6CD5 close() \u53EF\u80FD\u629B\u51FA InterruptedException + compiler.warn.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u5206\u914D: \u5C06{0}\u5206\u914D\u7ED9{1} # 0: symbol, 1: type @@ -924,6 +939,12 @@ compiler.warn.annotation.method.not.found.reason=\u65E0\u6CD5\u627E\u5230\u7C7B\u578B ''{0}'' \u7684\u6CE8\u91CA\u65B9\u6CD5 ''{1}()'': {2} +# 0: symbol, 1: name +compiler.warn.unknown.enum.constant=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2} + +# 0: symbol, 1: name, 2: message segment +compiler.warn.unknown.enum.constant.reason=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}\n\u539F\u56E0: {3} + # 0: type, 1: type compiler.warn.raw.class.use=\u627E\u5230\u539F\u59CB\u7C7B\u578B: {0}\n\u7F3A\u5C11\u6CDB\u578B\u7C7B{1}\u7684\u7C7B\u578B\u53C2\u6570 @@ -1011,7 +1032,11 @@ ## above strings. compiler.misc.bad.class.signature=\u9519\u8BEF\u7684\u7C7B\u7B7E\u540D: {0} -compiler.misc.bad.enclosing.method=\u9519\u8BEF\u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027: {0} +#0: symbol, 1: symbol +compiler.misc.bad.enclosing.class={0}\u7684\u5C01\u95ED\u7C7B\u9519\u8BEF: {1} + +# 0: symbol +compiler.misc.bad.enclosing.method=\u7C7B {0} \u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027\u9519\u8BEF compiler.misc.bad.runtime.invisible.param.annotations=\u9519\u8BEF\u7684 RuntimeInvisibleParameterAnnotations \u5C5E\u6027: {0} @@ -1140,11 +1165,7 @@ # 0: type compiler.misc.diamond.non.generic=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u975E\u6CDB\u578B\u7C7B{0}\u4E00\u8D77\u4F7F\u7528 -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.arg=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0} - -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.args=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0} +compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528 # 0: type, 1: list of type compiler.misc.explicit.param.do.not.conform.to.bounds=\u663E\u5F0F\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4{1} @@ -1291,7 +1312,7 @@ # 0: symbol, 1: symbol, 2: symbol, 3: symbol compiler.misc.varargs.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2} -compiler.misc.non.denotable.type=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E0D\u53EF\u6307\u793A\u7684\u7C7B\u578B{0} +compiler.misc.diamond.and.anon.class=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u533F\u540D\u5185\u90E8\u7C7B\u4E00\u8D77\u4F7F\u7528 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment compiler.misc.inapplicable.method={0} {1}.{2}\u4E0D\u9002\u7528\n({3}) diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -87,6 +87,7 @@ javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B javac.opt.prefer=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u3001\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3068\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4E21\u65B9\u304C\u898B\u3064\u304B\u3063\u305F\u969B\u3069\u3061\u3089\u3092\u8AAD\u307F\u8FBC\u3080\u304B\u6307\u5B9A\u3059\u308B +javac.opt.AT=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u540D ## errors @@ -96,6 +97,7 @@ javac.err.invalid.flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059 javac.err.invalid.target={0}\u306F\u7121\u52B9\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059 javac.err.no.source.files=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093 +javac.err.no.source.files.classes=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u540D\u304C\u3042\u308A\u307E\u305B\u3093 javac.err.req.arg={0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059 javac.err.invalid.source={0}\u306F\u7121\u52B9\u306A\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059 javac.err.error.writing.file={0}\u306E\u66F8\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002{1} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -87,6 +87,7 @@ javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F javac.opt.prefer=\u6307\u5B9A\u8BFB\u53D6\u6587\u4EF6, \u5F53\u540C\u65F6\u627E\u5230\u9690\u5F0F\u7F16\u8BD1\u7C7B\u7684\u6E90\u6587\u4EF6\u548C\u7C7B\u6587\u4EF6\u65F6 +javac.opt.AT=\u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C\u6587\u4EF6\u540D ## errors @@ -96,6 +97,7 @@ javac.err.invalid.flag=\u65E0\u6548\u7684\u6807\u8BB0: {0} javac.err.invalid.target=\u65E0\u6548\u7684\u76EE\u6807\u53D1\u884C\u7248: {0} javac.err.no.source.files=\u65E0\u6E90\u6587\u4EF6 +javac.err.no.source.files.classes=\u65E0\u6E90\u6587\u4EF6\u6216\u7C7B\u540D javac.err.req.arg={0}\u9700\u8981\u53C2\u6570 javac.err.invalid.source=\u65E0\u6548\u7684\u6E90\u53D1\u884C\u7248: {0} javac.err.error.writing.file=\u5199\u5165{0}\u65F6\u51FA\u9519; {1} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Sat May 14 11:52:15 2011 -0700 @@ -266,6 +266,8 @@ com.sun.swing.internal.plaf.basic.resources = tiger legacy com.sun.swing.internal.plaf.metal.resources = tiger legacy com.sun.swing.internal.plaf.synth.resources = tiger legacy +com.sun.tracing = tiger legacy +com.sun.tracing.dtrace = tiger legacy java.applet = tiger legacy java.awt = tiger legacy java.awt.color = tiger legacy diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties --- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -75,7 +75,7 @@ tag.End_delimiter_missing_for_possible_SeeTag=\u30B3\u30E1\u30F3\u30C8\u6587\u5B57\u5217"{0}"\u3067\u3001\u6709\u52B9\u306Asee\u30BF\u30B0\u306B\u7D42\u7AEF\u30C7\u30EA\u30DF\u30BF}\u304C\u3042\u308A\u307E\u305B\u3093 tag.Improper_Use_Of_Link_Tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0"{0}"\u306B\u7D42\u4E86\u6587\u5B57''}''\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.File_Read_Error=\u30D5\u30A1\u30A4\u30EB{0}\u306E\u8AAD\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F -javadoc.Body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 +javadoc.Body_missing_from_html_file=HTML\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.End_body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u306E\u9589\u3058\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.Multiple_package_comments=\u30D1\u30C3\u30B1\u30FC\u30B8"{0}"\u306B\u8907\u6570\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u30BD\u30FC\u30B9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -43,7 +43,7 @@ main.no_source_files_for_package=\u6CA1\u6709\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6 main.fatal.error=\u81F4\u547D\u9519\u8BEF main.fatal.exception=\u81F4\u547D\u5F02\u5E38\u9519\u8BEF -main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216\u70ED\u70B9 VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002 +main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216 HotSpot VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002 main.done_in=[\u5728 {0} \u6BEB\u79D2\u5185\u5B8C\u6210] main.doclet_method_must_be_static=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u4E3A\u9759\u6001\u3002 main.must_return_int=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u8FD4\u56DE\u6574\u578B\u503C\u3002 @@ -75,7 +75,7 @@ tag.End_delimiter_missing_for_possible_SeeTag=\u6CE8\u91CA\u5B57\u7B26\u4E32\u4E2D\u53EF\u80FD\u51FA\u73B0\u7684 See \u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F\u5206\u9694\u7B26 }: "{0}" tag.Improper_Use_Of_Link_Tag=\u5185\u5D4C\u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F ''}'' \u5B57\u7B26: "{0}" javadoc.File_Read_Error=\u8BFB\u53D6\u6587\u4EF6{0}\u65F6\u51FA\u9519 -javadoc.Body_missing_from_html_file=HTML \u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0 +javadoc.Body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0 javadoc.End_body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u7ED3\u675F\u6807\u8BB0 javadoc.Multiple_package_comments=\u627E\u5230\u7A0B\u5E8F\u5305 "{0}" \u7684\u591A\u4E2A\u7A0B\u5E8F\u5305\u6CE8\u91CA\u6E90 javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2011, 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 6553182 + * @summary This test verifies the -Xdocrootparent option. + * @author Bhavesh Patel + * @library ../lib/ + * @build JavadocTester TestDocRootLink + * @run main TestDocRootLink + */ +public class TestDocRootLink extends JavadocTester { + + private static final String BUG_ID = "6553182"; + private static final String[][] TEST1 = { + {BUG_ID + FS + "pkg1" + FS + "C1.html", + "<a href=\"../../technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + "<a href=\"../../technotes/guides/index.html\">" + } + }; + private static final String[][] NEGATED_TEST1 = { + {BUG_ID + FS + "pkg1" + FS + "C1.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + } + }; + private static final String[][] TEST2 = { + {BUG_ID + FS + "pkg2" + FS + "C2.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + } + }; + private static final String[][] NEGATED_TEST2 = { + {BUG_ID + FS + "pkg2" + FS + "C2.html", + "<a href=\"../../technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + "<a href=\"../../technotes/guides/index.html\">" + } + }; + private static final String[] ARGS1 = + new String[]{ + "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1" + }; + private static final String[] ARGS2 = + new String[]{ + "-d", BUG_ID, "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg2" + }; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestDocRootLink tester = new TestDocRootLink(); + run(tester, ARGS1, TEST1, NEGATED_TEST1); + run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2011, 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. + */ + +package pkg1; + +/** + * Class 1. This is a test. + * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. Lets see if this works + * or not. + */ +public class C1 {} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,18 @@ +<html> +<head> +<title>javax.management package

Since JDWP version 1.6. " (int requestID @@ -2743,6 +2746,8 @@ (Alt MonitorContendedEntered=JDWP.EventKind.MONITOR_CONTENDED_ENTERED "Notification of a thread in the target VM is entering a monitor " "after waiting for it to be released by another thread. " + "Requires canRequestMonitorEvents capability - see " + "CapabilitiesNew. " "

Since JDWP version 1.6. " (int requestID @@ -2753,6 +2758,8 @@ ) (Alt MonitorWait=JDWP.EventKind.MONITOR_WAIT "Notification of a thread about to wait on a monitor object. " + "Requires canRequestMonitorEvents capability - see " + "CapabilitiesNew. " "

Since JDWP version 1.6. " (int requestID @@ -2764,6 +2771,8 @@ ) (Alt MonitorWaited=JDWP.EventKind.MONITOR_WAITED "Notification that a thread in the target VM has finished waiting on " + "Requires canRequestMonitorEvents capability - see " + "CapabilitiesNew. " "a monitor object. " "

Since JDWP version 1.6. " @@ -3050,9 +3059,9 @@ (Constant METHOD_EXIT =41 ) (Constant METHOD_EXIT_WITH_RETURN_VALUE =42 ) (Constant MONITOR_CONTENDED_ENTER =43 ) - (Constant MONITOR_CONTENDED_ENTERED =44 ) - (Constant MONITOR_WAIT =45 ) - (Constant MONITOR_WAITED =46 ) + (Constant MONITOR_CONTENDED_ENTERED =44 ) + (Constant MONITOR_WAIT =45 ) + (Constant MONITOR_WAITED =46 ) (Constant VM_START =90 ) (Constant VM_INIT =90 "obsolete - was used in jvmdi") (Constant VM_DEATH =99 ) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/sun/javazic/tzdata/VERSION --- a/jdk/make/sun/javazic/tzdata/VERSION Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/sun/javazic/tzdata/VERSION Sat May 14 11:52:15 2011 -0700 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2011e +tzdata2011g diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/sun/javazic/tzdata/africa --- a/jdk/make/sun/javazic/tzdata/africa Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/sun/javazic/tzdata/africa Sat May 14 11:52:15 2011 -0700 @@ -234,7 +234,21 @@ Rule Egypt 1990 1994 - May 1 1:00 1:00 S # IATA (after 1990) says transitions are at 0:00. # Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29. -Rule Egypt 1995 max - Apr lastFri 0:00s 1:00 S + +# From Alexander Krivenyshev (2011-04-20): +# "...Egypt's interim cabinet decided on Wednesday to cancel daylight +# saving time after a poll posted on its website showed the majority of +# Egyptians would approve the cancellation." +# +# Egypt to cancel daylight saving time +# +# http://www.almasryalyoum.com/en/node/407168 +# +# or +# +# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html +# +Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: @@ -335,7 +349,7 @@ Rule Egypt 2009 only - Aug 20 23:00s 0 - Rule Egypt 2010 only - Aug 11 0:00 0 - Rule Egypt 2010 only - Sep 10 0:00 1:00 S -Rule Egypt 2010 max - Sep lastThu 23:00s 0 - +Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:00 - LMT 1900 Oct diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/sun/javazic/tzdata/europe --- a/jdk/make/sun/javazic/tzdata/europe Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/sun/javazic/tzdata/europe Sat May 14 11:52:15 2011 -0700 @@ -168,7 +168,7 @@ # A monument to Willett was unveiled on 1927-05-21, in an open space in # a 45-acre wood near Chislehurst, Kent that was purchased by popular # subscription and open to the public. On the south face of the monolith, -# designed by G. W. Miller, is the the William Willett Memorial Sundial, +# designed by G. W. Miller, is the...William Willett Memorial Sundial, # which is permanently set to Summer Time. # From Winston Churchill (1934-04-28): @@ -1808,7 +1808,7 @@ # # All these events predate our cutoff date of 1970. Unless we can # come up with more definitive info about the timekeeping during the -# war years it's probably best just do do the following for now: +# war years it's probably best just do...the following for now: Link Europe/Oslo Arctic/Longyearbyen # Poland diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/sun/javazic/tzdata/southamerica --- a/jdk/make/sun/javazic/tzdata/southamerica Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/sun/javazic/tzdata/southamerica Sat May 14 11:52:15 2011 -0700 @@ -767,7 +767,7 @@ # # As a result of the above Decree I believe the America/Rio_Branco # timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall -# be created to represent the the west side of the Para State. I +# be created to represent the...west side of the Para State. I # suggest this new timezone be called Santarem as the most # important/populated city in the affected area. # @@ -1365,6 +1365,24 @@ # For now, we'll just record the time in Stanley, since we have no # better info. +# From Steffen Thorsen (2011-04-01): +# The Falkland Islands will not turn back clocks this winter, but stay on +# daylight saving time. +# +# One source: +# +# http://www.falklandnews.com/public/story.cfm?get=5914&source=3 +# +# +# We have gotten this confirmed by a clerk of the legislative assembly: +# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the +# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3 +# hours) on the first Sunday of September at 0200hrs. +# +# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands +# will not revert to local mean time, but clocks will remain on Summer +# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term +# change to local time following the trial period will be notified. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - @@ -1376,7 +1394,8 @@ Rule Falk 1984 only - Sep 16 0:00 1:00 S Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - -Rule Falk 2001 max - Apr Sun>=15 2:00 0 - +Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - +Rule Falk 2012 max - Apr Sun>=15 2:00 0 - Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Atlantic/Stanley -3:51:24 - LMT 1890 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/sun/security/Makefile --- a/jdk/make/sun/security/Makefile Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/sun/security/Makefile Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2011, 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 @@ -52,12 +52,10 @@ endif endif -# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform. +# Build Microsoft CryptoAPI provider only on Windows platform. MSCAPI = ifeq ($(PLATFORM), windows) - ifneq ($(ARCH_DATA_MODEL), 64) - MSCAPI = mscapi - endif + MSCAPI = mscapi endif # Build in-tree elliptic curve crypto provider only when diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/GenerateCharacter/CharacterData00.java.template --- a/jdk/make/tools/GenerateCharacter/CharacterData00.java.template Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/tools/GenerateCharacter/CharacterData00.java.template Sat May 14 11:52:15 2011 -0700 @@ -73,11 +73,37 @@ return props; } + int getPropertiesEx(int ch) { + char offset = (char)ch; + int props = $$LookupEx(offset); + return props; + } + int getType(int ch) { int props = getProperties(ch); return (props & $$maskType); } + boolean isOtherLowercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherLowercase) != 0; + } + + boolean isOtherUppercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherUppercase) != 0; + } + + boolean isOtherAlphabetic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherAlphabetic) != 0; + } + + boolean isIdeographic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskIdeographic) != 0; + } + boolean isJavaIdentifierStart(int ch) { int props = getProperties(ch); return ((props & $$maskIdentifierInfo) >= $$lowJavaStart); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/GenerateCharacter/CharacterData01.java.template --- a/jdk/make/tools/GenerateCharacter/CharacterData01.java.template Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/tools/GenerateCharacter/CharacterData01.java.template Sat May 14 11:52:15 2011 -0700 @@ -72,11 +72,37 @@ return props; } + int getPropertiesEx(int ch) { + char offset = (char)ch; + int props = $$LookupEx(offset); + return props; + } + int getType(int ch) { int props = getProperties(ch); return (props & $$maskType); } + boolean isOtherLowercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherLowercase) != 0; + } + + boolean isOtherUppercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherUppercase) != 0; + } + + boolean isOtherAlphabetic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherAlphabetic) != 0; + } + + boolean isIdeographic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskIdeographic) != 0; + } + boolean isJavaIdentifierStart(int ch) { int props = getProperties(ch); return ((props & $$maskIdentifierInfo) >= $$lowJavaStart); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/GenerateCharacter/CharacterData02.java.template --- a/jdk/make/tools/GenerateCharacter/CharacterData02.java.template Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/tools/GenerateCharacter/CharacterData02.java.template Sat May 14 11:52:15 2011 -0700 @@ -66,11 +66,37 @@ */ int getProperties(int ch) { - char offset = (char)ch; + char offset = (char)ch; int props = $$Lookup(offset); return props; } + int getPropertiesEx(int ch) { + char offset = (char)ch; + int props = $$LookupEx(offset); + return props; + } + + boolean isOtherLowercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherLowercase) != 0; + } + + boolean isOtherUppercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherUppercase) != 0; + } + + boolean isOtherAlphabetic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherAlphabetic) != 0; + } + + boolean isIdeographic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskIdeographic) != 0; + } + int getType(int ch) { int props = getProperties(ch); return (props & $$maskType); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/GenerateCharacter/CharacterData0E.java.template --- a/jdk/make/tools/GenerateCharacter/CharacterData0E.java.template Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/tools/GenerateCharacter/CharacterData0E.java.template Sat May 14 11:52:15 2011 -0700 @@ -66,11 +66,37 @@ */ int getProperties(int ch) { - char offset = (char)ch; + char offset = (char)ch; int props = $$Lookup(offset); return props; } + int getPropertiesEx(int ch) { + char offset = (char)ch; + int props = $$LookupEx(offset); + return props; + } + + boolean isOtherLowercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherLowercase) != 0; + } + + boolean isOtherUppercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherUppercase) != 0; + } + + boolean isOtherAlphabetic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherAlphabetic) != 0; + } + + boolean isIdeographic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskIdeographic) != 0; + } + int getType(int ch) { int props = getProperties(ch); return (props & $$maskType); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/GenerateCharacter/CharacterDataLatin1.java.template --- a/jdk/make/tools/GenerateCharacter/CharacterDataLatin1.java.template Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/tools/GenerateCharacter/CharacterDataLatin1.java.template Sat May 14 11:52:15 2011 -0700 @@ -67,11 +67,37 @@ */ int getProperties(int ch) { - char offset = (char)ch; + char offset = (char)ch; int props = $$Lookup(offset); return props; } + int getPropertiesEx(int ch) { + char offset = (char)ch; + int props = $$LookupEx(offset); + return props; + } + + boolean isOtherLowercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherLowercase) != 0; + } + + boolean isOtherUppercase(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherUppercase) != 0; + } + + boolean isOtherAlphabetic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskOtherAlphabetic) != 0; + } + + boolean isIdeographic(int ch) { + int props = getPropertiesEx(ch); + return (props & $$maskIdeographic) != 0; + } + int getType(int ch) { int props = getProperties(ch); return (props & $$maskType); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/UnicodeData/PropList.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/make/tools/UnicodeData/PropList.txt Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,1296 @@ +# PropList-6.0.0.txt +# Date: 2010-08-19, 00:48:28 GMT [MD] +# +# Unicode Character Database +# Copyright (c) 1991-2010 Unicode, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# For documentation, see http://www.unicode.org/reports/tr44/ + +# ================================================ + +0009..000D ; White_Space # Cc [5] .. +0020 ; White_Space # Zs SPACE +0085 ; White_Space # Cc +00A0 ; White_Space # Zs NO-BREAK SPACE +1680 ; White_Space # Zs OGHAM SPACE MARK +180E ; White_Space # Zs MONGOLIAN VOWEL SEPARATOR +2000..200A ; White_Space # Zs [11] EN QUAD..HAIR SPACE +2028 ; White_Space # Zl LINE SEPARATOR +2029 ; White_Space # Zp PARAGRAPH SEPARATOR +202F ; White_Space # Zs NARROW NO-BREAK SPACE +205F ; White_Space # Zs MEDIUM MATHEMATICAL SPACE +3000 ; White_Space # Zs IDEOGRAPHIC SPACE + +# Total code points: 26 + +# ================================================ + +200E..200F ; Bidi_Control # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK +202A..202E ; Bidi_Control # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE + +# Total code points: 7 + +# ================================================ + +200C..200D ; Join_Control # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER + +# Total code points: 2 + +# ================================================ + +002D ; Dash # Pd HYPHEN-MINUS +058A ; Dash # Pd ARMENIAN HYPHEN +05BE ; Dash # Pd HEBREW PUNCTUATION MAQAF +1400 ; Dash # Pd CANADIAN SYLLABICS HYPHEN +1806 ; Dash # Pd MONGOLIAN TODO SOFT HYPHEN +2010..2015 ; Dash # Pd [6] HYPHEN..HORIZONTAL BAR +2053 ; Dash # Po SWUNG DASH +207B ; Dash # Sm SUPERSCRIPT MINUS +208B ; Dash # Sm SUBSCRIPT MINUS +2212 ; Dash # Sm MINUS SIGN +2E17 ; Dash # Pd DOUBLE OBLIQUE HYPHEN +2E1A ; Dash # Pd HYPHEN WITH DIAERESIS +301C ; Dash # Pd WAVE DASH +3030 ; Dash # Pd WAVY DASH +30A0 ; Dash # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +FE31..FE32 ; Dash # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE58 ; Dash # Pd SMALL EM DASH +FE63 ; Dash # Pd SMALL HYPHEN-MINUS +FF0D ; Dash # Pd FULLWIDTH HYPHEN-MINUS + +# Total code points: 25 + +# ================================================ + +002D ; Hyphen # Pd HYPHEN-MINUS +00AD ; Hyphen # Cf SOFT HYPHEN +058A ; Hyphen # Pd ARMENIAN HYPHEN +1806 ; Hyphen # Pd MONGOLIAN TODO SOFT HYPHEN +2010..2011 ; Hyphen # Pd [2] HYPHEN..NON-BREAKING HYPHEN +2E17 ; Hyphen # Pd DOUBLE OBLIQUE HYPHEN +30FB ; Hyphen # Po KATAKANA MIDDLE DOT +FE63 ; Hyphen # Pd SMALL HYPHEN-MINUS +FF0D ; Hyphen # Pd FULLWIDTH HYPHEN-MINUS +FF65 ; Hyphen # Po HALFWIDTH KATAKANA MIDDLE DOT + +# Total code points: 11 + +# ================================================ + +0022 ; Quotation_Mark # Po QUOTATION MARK +0027 ; Quotation_Mark # Po APOSTROPHE +00AB ; Quotation_Mark # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00BB ; Quotation_Mark # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +2018 ; Quotation_Mark # Pi LEFT SINGLE QUOTATION MARK +2019 ; Quotation_Mark # Pf RIGHT SINGLE QUOTATION MARK +201A ; Quotation_Mark # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; Quotation_Mark # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; Quotation_Mark # Pf RIGHT DOUBLE QUOTATION MARK +201E ; Quotation_Mark # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; Quotation_Mark # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2039 ; Quotation_Mark # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Quotation_Mark # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +300C ; Quotation_Mark # Ps LEFT CORNER BRACKET +300D ; Quotation_Mark # Pe RIGHT CORNER BRACKET +300E ; Quotation_Mark # Ps LEFT WHITE CORNER BRACKET +300F ; Quotation_Mark # Pe RIGHT WHITE CORNER BRACKET +301D ; Quotation_Mark # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Quotation_Mark # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +FE41 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE42 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE43 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE44 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FF02 ; Quotation_Mark # Po FULLWIDTH QUOTATION MARK +FF07 ; Quotation_Mark # Po FULLWIDTH APOSTROPHE +FF62 ; Quotation_Mark # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; Quotation_Mark # Pe HALFWIDTH RIGHT CORNER BRACKET + +# Total code points: 29 + +# ================================================ + +0021 ; Terminal_Punctuation # Po EXCLAMATION MARK +002C ; Terminal_Punctuation # Po COMMA +002E ; Terminal_Punctuation # Po FULL STOP +003A..003B ; Terminal_Punctuation # Po [2] COLON..SEMICOLON +003F ; Terminal_Punctuation # Po QUESTION MARK +037E ; Terminal_Punctuation # Po GREEK QUESTION MARK +0387 ; Terminal_Punctuation # Po GREEK ANO TELEIA +0589 ; Terminal_Punctuation # Po ARMENIAN FULL STOP +05C3 ; Terminal_Punctuation # Po HEBREW PUNCTUATION SOF PASUQ +060C ; Terminal_Punctuation # Po ARABIC COMMA +061B ; Terminal_Punctuation # Po ARABIC SEMICOLON +061F ; Terminal_Punctuation # Po ARABIC QUESTION MARK +06D4 ; Terminal_Punctuation # Po ARABIC FULL STOP +0700..070A ; Terminal_Punctuation # Po [11] SYRIAC END OF PARAGRAPH..SYRIAC CONTRACTION +070C ; Terminal_Punctuation # Po SYRIAC HARKLEAN METOBELUS +07F8..07F9 ; Terminal_Punctuation # Po [2] NKO COMMA..NKO EXCLAMATION MARK +0830..083E ; Terminal_Punctuation # Po [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU +085E ; Terminal_Punctuation # Po MANDAIC PUNCTUATION +0964..0965 ; Terminal_Punctuation # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0E5A..0E5B ; Terminal_Punctuation # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0F08 ; Terminal_Punctuation # Po TIBETAN MARK SBRUL SHAD +0F0D..0F12 ; Terminal_Punctuation # Po [6] TIBETAN MARK SHAD..TIBETAN MARK RGYA GRAM SHAD +104A..104B ; Terminal_Punctuation # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION +1361..1368 ; Terminal_Punctuation # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +166D..166E ; Terminal_Punctuation # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +16EB..16ED ; Terminal_Punctuation # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +17D4..17D6 ; Terminal_Punctuation # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17DA ; Terminal_Punctuation # Po KHMER SIGN KOOMUUT +1802..1805 ; Terminal_Punctuation # Po [4] MONGOLIAN COMMA..MONGOLIAN FOUR DOTS +1808..1809 ; Terminal_Punctuation # Po [2] MONGOLIAN MANCHU COMMA..MONGOLIAN MANCHU FULL STOP +1944..1945 ; Terminal_Punctuation # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK +1AA8..1AAB ; Terminal_Punctuation # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B5A..1B5B ; Terminal_Punctuation # Po [2] BALINESE PANTI..BALINESE PAMADA +1B5D..1B5F ; Terminal_Punctuation # Po [3] BALINESE CARIK PAMUNGKAH..BALINESE CARIK PAREREN +1C3B..1C3F ; Terminal_Punctuation # Po [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK +1C7E..1C7F ; Terminal_Punctuation # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +203C..203D ; Terminal_Punctuation # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +2047..2049 ; Terminal_Punctuation # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2E2E ; Terminal_Punctuation # Po REVERSED QUESTION MARK +3001..3002 ; Terminal_Punctuation # Po [2] IDEOGRAPHIC COMMA..IDEOGRAPHIC FULL STOP +A4FE..A4FF ; Terminal_Punctuation # Po [2] LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP +A60D..A60F ; Terminal_Punctuation # Po [3] VAI COMMA..VAI QUESTION MARK +A6F3..A6F7 ; Terminal_Punctuation # Po [5] BAMUM FULL STOP..BAMUM QUESTION MARK +A876..A877 ; Terminal_Punctuation # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD +A8CE..A8CF ; Terminal_Punctuation # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA +A92F ; Terminal_Punctuation # Po KAYAH LI SIGN SHYA +A9C7..A9C9 ; Terminal_Punctuation # Po [3] JAVANESE PADA PANGKAT..JAVANESE PADA LUNGSI +AA5D..AA5F ; Terminal_Punctuation # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA +AADF ; Terminal_Punctuation # Po TAI VIET SYMBOL KOI KOI +ABEB ; Terminal_Punctuation # Po MEETEI MAYEK CHEIKHEI +FE50..FE52 ; Terminal_Punctuation # Po [3] SMALL COMMA..SMALL FULL STOP +FE54..FE57 ; Terminal_Punctuation # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK +FF01 ; Terminal_Punctuation # Po FULLWIDTH EXCLAMATION MARK +FF0C ; Terminal_Punctuation # Po FULLWIDTH COMMA +FF0E ; Terminal_Punctuation # Po FULLWIDTH FULL STOP +FF1A..FF1B ; Terminal_Punctuation # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON +FF1F ; Terminal_Punctuation # Po FULLWIDTH QUESTION MARK +FF61 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF64 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC COMMA +1039F ; Terminal_Punctuation # Po UGARITIC WORD DIVIDER +103D0 ; Terminal_Punctuation # Po OLD PERSIAN WORD DIVIDER +10857 ; Terminal_Punctuation # Po IMPERIAL ARAMAIC SECTION SIGN +1091F ; Terminal_Punctuation # Po PHOENICIAN WORD SEPARATOR +10B3A..10B3F ; Terminal_Punctuation # Po [6] TINY TWO DOTS OVER ONE DOT PUNCTUATION..LARGE ONE RING OVER TWO RINGS PUNCTUATION +11047..1104D ; Terminal_Punctuation # Po [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS +110BE..110C1 ; Terminal_Punctuation # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA +12470..12473 ; Terminal_Punctuation # Po [4] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON + +# Total code points: 169 + +# ================================================ + +005E ; Other_Math # Sk CIRCUMFLEX ACCENT +03D0..03D2 ; Other_Math # L& [3] GREEK BETA SYMBOL..GREEK UPSILON WITH HOOK SYMBOL +03D5 ; Other_Math # L& GREEK PHI SYMBOL +03F0..03F1 ; Other_Math # L& [2] GREEK KAPPA SYMBOL..GREEK RHO SYMBOL +03F4..03F5 ; Other_Math # L& [2] GREEK CAPITAL THETA SYMBOL..GREEK LUNATE EPSILON SYMBOL +2016 ; Other_Math # Po DOUBLE VERTICAL LINE +2032..2034 ; Other_Math # Po [3] PRIME..TRIPLE PRIME +2040 ; Other_Math # Pc CHARACTER TIE +2061..2064 ; Other_Math # Cf [4] FUNCTION APPLICATION..INVISIBLE PLUS +207D ; Other_Math # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; Other_Math # Pe SUPERSCRIPT RIGHT PARENTHESIS +208D ; Other_Math # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; Other_Math # Pe SUBSCRIPT RIGHT PARENTHESIS +20D0..20DC ; Other_Math # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE +20E1 ; Other_Math # Mn COMBINING LEFT RIGHT ARROW ABOVE +20E5..20E6 ; Other_Math # Mn [2] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING DOUBLE VERTICAL STROKE OVERLAY +20EB..20EF ; Other_Math # Mn [5] COMBINING LONG DOUBLE SOLIDUS OVERLAY..COMBINING RIGHT ARROW BELOW +2102 ; Other_Math # L& DOUBLE-STRUCK CAPITAL C +2107 ; Other_Math # L& EULER CONSTANT +210A..2113 ; Other_Math # L& [10] SCRIPT SMALL G..SCRIPT SMALL L +2115 ; Other_Math # L& DOUBLE-STRUCK CAPITAL N +2119..211D ; Other_Math # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +2124 ; Other_Math # L& DOUBLE-STRUCK CAPITAL Z +2128 ; Other_Math # L& BLACK-LETTER CAPITAL Z +2129 ; Other_Math # So TURNED GREEK SMALL LETTER IOTA +212C..212D ; Other_Math # L& [2] SCRIPT CAPITAL B..BLACK-LETTER CAPITAL C +212F..2131 ; Other_Math # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F +2133..2134 ; Other_Math # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O +2135..2138 ; Other_Math # Lo [4] ALEF SYMBOL..DALET SYMBOL +213C..213F ; Other_Math # L& [4] DOUBLE-STRUCK SMALL PI..DOUBLE-STRUCK CAPITAL PI +2145..2149 ; Other_Math # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J +2195..2199 ; Other_Math # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219C..219F ; Other_Math # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A1..21A2 ; Other_Math # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A4..21A5 ; Other_Math # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A7 ; Other_Math # So DOWNWARDS ARROW FROM BAR +21A9..21AD ; Other_Math # So [5] LEFTWARDS ARROW WITH HOOK..LEFT RIGHT WAVE ARROW +21B0..21B1 ; Other_Math # So [2] UPWARDS ARROW WITH TIP LEFTWARDS..UPWARDS ARROW WITH TIP RIGHTWARDS +21B6..21B7 ; Other_Math # So [2] ANTICLOCKWISE TOP SEMICIRCLE ARROW..CLOCKWISE TOP SEMICIRCLE ARROW +21BC..21CD ; Other_Math # So [18] LEFTWARDS HARPOON WITH BARB UPWARDS..LEFTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; Other_Math # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D3 ; Other_Math # So DOWNWARDS DOUBLE ARROW +21D5..21DB ; Other_Math # So [7] UP DOWN DOUBLE ARROW..RIGHTWARDS TRIPLE ARROW +21DD ; Other_Math # So RIGHTWARDS SQUIGGLE ARROW +21E4..21E5 ; Other_Math # So [2] LEFTWARDS ARROW TO BAR..RIGHTWARDS ARROW TO BAR +23B4..23B5 ; Other_Math # So [2] TOP SQUARE BRACKET..BOTTOM SQUARE BRACKET +23B7 ; Other_Math # So RADICAL SYMBOL BOTTOM +23D0 ; Other_Math # So VERTICAL LINE EXTENSION +23E2 ; Other_Math # So WHITE TRAPEZIUM +25A0..25A1 ; Other_Math # So [2] BLACK SQUARE..WHITE SQUARE +25AE..25B6 ; Other_Math # So [9] BLACK VERTICAL RECTANGLE..BLACK RIGHT-POINTING TRIANGLE +25BC..25C0 ; Other_Math # So [5] BLACK DOWN-POINTING TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C6..25C7 ; Other_Math # So [2] BLACK DIAMOND..WHITE DIAMOND +25CA..25CB ; Other_Math # So [2] LOZENGE..WHITE CIRCLE +25CF..25D3 ; Other_Math # So [5] BLACK CIRCLE..CIRCLE WITH UPPER HALF BLACK +25E2 ; Other_Math # So BLACK LOWER RIGHT TRIANGLE +25E4 ; Other_Math # So BLACK UPPER LEFT TRIANGLE +25E7..25EC ; Other_Math # So [6] SQUARE WITH LEFT HALF BLACK..WHITE UP-POINTING TRIANGLE WITH DOT +2605..2606 ; Other_Math # So [2] BLACK STAR..WHITE STAR +2640 ; Other_Math # So FEMALE SIGN +2642 ; Other_Math # So MALE SIGN +2660..2663 ; Other_Math # So [4] BLACK SPADE SUIT..BLACK CLUB SUIT +266D..266E ; Other_Math # So [2] MUSIC FLAT SIGN..MUSIC NATURAL SIGN +27C5 ; Other_Math # Ps LEFT S-SHAPED BAG DELIMITER +27C6 ; Other_Math # Pe RIGHT S-SHAPED BAG DELIMITER +27E6 ; Other_Math # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Other_Math # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Other_Math # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Other_Math # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Other_Math # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Other_Math # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27EC ; Other_Math # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET +27ED ; Other_Math # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET +27EE ; Other_Math # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS +27EF ; Other_Math # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS +2983 ; Other_Math # Ps LEFT WHITE CURLY BRACKET +2984 ; Other_Math # Pe RIGHT WHITE CURLY BRACKET +2985 ; Other_Math # Ps LEFT WHITE PARENTHESIS +2986 ; Other_Math # Pe RIGHT WHITE PARENTHESIS +2987 ; Other_Math # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Other_Math # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Other_Math # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Other_Math # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Other_Math # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Other_Math # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Other_Math # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Other_Math # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Other_Math # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Other_Math # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Other_Math # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Other_Math # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Other_Math # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Other_Math # Pe RIGHT BLACK TORTOISE SHELL BRACKET +29D8 ; Other_Math # Ps LEFT WIGGLY FENCE +29D9 ; Other_Math # Pe RIGHT WIGGLY FENCE +29DA ; Other_Math # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Other_Math # Pe RIGHT DOUBLE WIGGLY FENCE +29FC ; Other_Math # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Other_Math # Pe RIGHT-POINTING CURVED ANGLE BRACKET +FE61 ; Other_Math # Po SMALL ASTERISK +FE63 ; Other_Math # Pd SMALL HYPHEN-MINUS +FE68 ; Other_Math # Po SMALL REVERSE SOLIDUS +FF3C ; Other_Math # Po FULLWIDTH REVERSE SOLIDUS +FF3E ; Other_Math # Sk FULLWIDTH CIRCUMFLEX ACCENT +1D400..1D454 ; Other_Math # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G +1D456..1D49C ; Other_Math # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; Other_Math # L& MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; Other_Math # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B9 ; Other_Math # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D +1D4BB ; Other_Math # L& MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C3 ; Other_Math # L& [7] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D505 ; Other_Math # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; Other_Math # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; Other_Math # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; Other_Math # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D51E..1D539 ; Other_Math # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; Other_Math # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; Other_Math # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; Other_Math # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; Other_Math # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D552..1D6A5 ; Other_Math # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D6A8..1D6C0 ; Other_Math # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6C2..1D6DA ; Other_Math # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DC..1D6FA ; Other_Math # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA +1D6FC..1D714 ; Other_Math # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D716..1D734 ; Other_Math # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D736..1D74E ; Other_Math # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D750..1D76E ; Other_Math # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D770..1D788 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D78A..1D7A8 ; Other_Math # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA +1D7AA..1D7C2 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C4..1D7CB ; Other_Math # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1D7CE..1D7FF ; Other_Math # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 1217 + +# ================================================ + +0030..0039 ; Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE +0041..0046 ; Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F +0061..0066 ; Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F +FF10..FF19 ; Hex_Digit # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +FF21..FF26 ; Hex_Digit # L& [6] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER F +FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER F + +# Total code points: 44 + +# ================================================ + +0030..0039 ; ASCII_Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE +0041..0046 ; ASCII_Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F +0061..0066 ; ASCII_Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F + +# Total code points: 22 + +# ================================================ + +0345 ; Other_Alphabetic # Mn COMBINING GREEK YPOGEGRAMMENI +05B0..05BD ; Other_Alphabetic # Mn [14] HEBREW POINT SHEVA..HEBREW POINT METEG +05BF ; Other_Alphabetic # Mn HEBREW POINT RAFE +05C1..05C2 ; Other_Alphabetic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4..05C5 ; Other_Alphabetic # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT +05C7 ; Other_Alphabetic # Mn HEBREW POINT QAMATS QATAN +0610..061A ; Other_Alphabetic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA +064B..0657 ; Other_Alphabetic # Mn [13] ARABIC FATHATAN..ARABIC INVERTED DAMMA +0659..065F ; Other_Alphabetic # Mn [7] ARABIC ZWARAKAY..ARABIC WAVY HAMZA BELOW +0670 ; Other_Alphabetic # Mn ARABIC LETTER SUPERSCRIPT ALEF +06D6..06DC ; Other_Alphabetic # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06E1..06E4 ; Other_Alphabetic # Mn [4] ARABIC SMALL HIGH DOTLESS HEAD OF KHAH..ARABIC SMALL HIGH MADDA +06E7..06E8 ; Other_Alphabetic # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06ED ; Other_Alphabetic # Mn ARABIC SMALL LOW MEEM +0711 ; Other_Alphabetic # Mn SYRIAC LETTER SUPERSCRIPT ALAPH +0730..073F ; Other_Alphabetic # Mn [16] SYRIAC PTHAHA ABOVE..SYRIAC RWAHA +07A6..07B0 ; Other_Alphabetic # Mn [11] THAANA ABAFILI..THAANA SUKUN +0816..0817 ; Other_Alphabetic # Mn [2] SAMARITAN MARK IN..SAMARITAN MARK IN-ALAF +081B..0823 ; Other_Alphabetic # Mn [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A +0825..0827 ; Other_Alphabetic # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U +0829..082C ; Other_Alphabetic # Mn [4] SAMARITAN VOWEL SIGN LONG I..SAMARITAN VOWEL SIGN SUKUN +0900..0902 ; Other_Alphabetic # Mn [3] DEVANAGARI SIGN INVERTED CANDRABINDU..DEVANAGARI SIGN ANUSVARA +0903 ; Other_Alphabetic # Mc DEVANAGARI SIGN VISARGA +093A ; Other_Alphabetic # Mn DEVANAGARI VOWEL SIGN OE +093B ; Other_Alphabetic # Mc DEVANAGARI VOWEL SIGN OOE +093E..0940 ; Other_Alphabetic # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0941..0948 ; Other_Alphabetic # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +0949..094C ; Other_Alphabetic # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +094E..094F ; Other_Alphabetic # Mc [2] DEVANAGARI VOWEL SIGN PRISHTHAMATRA E..DEVANAGARI VOWEL SIGN AW +0955..0957 ; Other_Alphabetic # Mn [3] DEVANAGARI VOWEL SIGN CANDRA LONG E..DEVANAGARI VOWEL SIGN UUE +0962..0963 ; Other_Alphabetic # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0981 ; Other_Alphabetic # Mn BENGALI SIGN CANDRABINDU +0982..0983 ; Other_Alphabetic # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +09BE..09C0 ; Other_Alphabetic # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C1..09C4 ; Other_Alphabetic # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09C7..09C8 ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09D7 ; Other_Alphabetic # Mc BENGALI AU LENGTH MARK +09E2..09E3 ; Other_Alphabetic # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +0A01..0A02 ; Other_Alphabetic # Mn [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI +0A03 ; Other_Alphabetic # Mc GURMUKHI SIGN VISARGA +0A3E..0A40 ; Other_Alphabetic # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A41..0A42 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4C ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN OO..GURMUKHI VOWEL SIGN AU +0A51 ; Other_Alphabetic # Mn GURMUKHI SIGN UDAAT +0A70..0A71 ; Other_Alphabetic # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A75 ; Other_Alphabetic # Mn GURMUKHI SIGN YAKASH +0A81..0A82 ; Other_Alphabetic # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0A83 ; Other_Alphabetic # Mc GUJARATI SIGN VISARGA +0ABE..0AC0 ; Other_Alphabetic # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC1..0AC5 ; Other_Alphabetic # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0AC9 ; Other_Alphabetic # Mc GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; Other_Alphabetic # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0AE2..0AE3 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL +0B01 ; Other_Alphabetic # Mn ORIYA SIGN CANDRABINDU +0B02..0B03 ; Other_Alphabetic # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B3E ; Other_Alphabetic # Mc ORIYA VOWEL SIGN AA +0B3F ; Other_Alphabetic # Mn ORIYA VOWEL SIGN I +0B40 ; Other_Alphabetic # Mc ORIYA VOWEL SIGN II +0B41..0B44 ; Other_Alphabetic # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR +0B47..0B48 ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B56 ; Other_Alphabetic # Mn ORIYA AI LENGTH MARK +0B57 ; Other_Alphabetic # Mc ORIYA AU LENGTH MARK +0B62..0B63 ; Other_Alphabetic # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL +0B82 ; Other_Alphabetic # Mn TAMIL SIGN ANUSVARA +0BBE..0BBF ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC0 ; Other_Alphabetic # Mn TAMIL VOWEL SIGN II +0BC1..0BC2 ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BD7 ; Other_Alphabetic # Mc TAMIL AU LENGTH MARK +0C01..0C03 ; Other_Alphabetic # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C3E..0C40 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C41..0C44 ; Other_Alphabetic # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C46..0C48 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4C ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU +0C55..0C56 ; Other_Alphabetic # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK +0C62..0C63 ; Other_Alphabetic # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL +0C82..0C83 ; Other_Alphabetic # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0CBE ; Other_Alphabetic # Mc KANNADA VOWEL SIGN AA +0CBF ; Other_Alphabetic # Mn KANNADA VOWEL SIGN I +0CC0..0CC4 ; Other_Alphabetic # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC6 ; Other_Alphabetic # Mn KANNADA VOWEL SIGN E +0CC7..0CC8 ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CCC ; Other_Alphabetic # Mn KANNADA VOWEL SIGN AU +0CD5..0CD6 ; Other_Alphabetic # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0CE2..0CE3 ; Other_Alphabetic # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL +0D02..0D03 ; Other_Alphabetic # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D3E..0D40 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D41..0D44 ; Other_Alphabetic # Mn [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR +0D46..0D48 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D57 ; Other_Alphabetic # Mc MALAYALAM AU LENGTH MARK +0D62..0D63 ; Other_Alphabetic # Mn [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL +0D82..0D83 ; Other_Alphabetic # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0DCF..0DD1 ; Other_Alphabetic # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD2..0DD4 ; Other_Alphabetic # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; Other_Alphabetic # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA +0DD8..0DDF ; Other_Alphabetic # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; Other_Alphabetic # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0E31 ; Other_Alphabetic # Mn THAI CHARACTER MAI HAN-AKAT +0E34..0E3A ; Other_Alphabetic # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU +0E4D ; Other_Alphabetic # Mn THAI CHARACTER NIKHAHIT +0EB1 ; Other_Alphabetic # Mn LAO VOWEL SIGN MAI KAN +0EB4..0EB9 ; Other_Alphabetic # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU +0EBB..0EBC ; Other_Alphabetic # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0ECD ; Other_Alphabetic # Mn LAO NIGGAHITA +0F71..0F7E ; Other_Alphabetic # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO +0F7F ; Other_Alphabetic # Mc TIBETAN SIGN RNAM BCAD +0F80..0F81 ; Other_Alphabetic # Mn [2] TIBETAN VOWEL SIGN REVERSED I..TIBETAN VOWEL SIGN REVERSED II +0F8D..0F97 ; Other_Alphabetic # Mn [11] TIBETAN SUBJOINED SIGN LCE TSA CAN..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; Other_Alphabetic # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +102B..102C ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN TALL AA..MYANMAR VOWEL SIGN AA +102D..1030 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1031 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN E +1032..1036 ; Other_Alphabetic # Mn [5] MYANMAR VOWEL SIGN AI..MYANMAR SIGN ANUSVARA +1038 ; Other_Alphabetic # Mc MYANMAR SIGN VISARGA +103B..103C ; Other_Alphabetic # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA +103D..103E ; Other_Alphabetic # Mn [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA +1056..1057 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +1058..1059 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +105E..1060 ; Other_Alphabetic # Mn [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA +1062 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN SGAW KAREN EU +1067..1068 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN WESTERN PWO KAREN EU..MYANMAR VOWEL SIGN WESTERN PWO KAREN UE +1071..1074 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN GEBA KAREN I..MYANMAR VOWEL SIGN KAYAH EE +1082 ; Other_Alphabetic # Mn MYANMAR CONSONANT SIGN SHAN MEDIAL WA +1083..1084 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN SHAN AA..MYANMAR VOWEL SIGN SHAN E +1085..1086 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN SHAN E ABOVE..MYANMAR VOWEL SIGN SHAN FINAL Y +109C ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN AITON A +109D ; Other_Alphabetic # Mn MYANMAR VOWEL SIGN AITON AI +135F ; Other_Alphabetic # Mn ETHIOPIC COMBINING GEMINATION MARK +1712..1713 ; Other_Alphabetic # Mn [2] TAGALOG VOWEL SIGN I..TAGALOG VOWEL SIGN U +1732..1733 ; Other_Alphabetic # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1752..1753 ; Other_Alphabetic # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1772..1773 ; Other_Alphabetic # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +17B6 ; Other_Alphabetic # Mc KHMER VOWEL SIGN AA +17B7..17BD ; Other_Alphabetic # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17BE..17C5 ; Other_Alphabetic # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C6 ; Other_Alphabetic # Mn KHMER SIGN NIKAHIT +17C7..17C8 ; Other_Alphabetic # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +18A9 ; Other_Alphabetic # Mn MONGOLIAN LETTER ALI GALI DAGALGA +1920..1922 ; Other_Alphabetic # Mn [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U +1923..1926 ; Other_Alphabetic # Mc [4] LIMBU VOWEL SIGN EE..LIMBU VOWEL SIGN AU +1927..1928 ; Other_Alphabetic # Mn [2] LIMBU VOWEL SIGN E..LIMBU VOWEL SIGN O +1929..192B ; Other_Alphabetic # Mc [3] LIMBU SUBJOINED LETTER YA..LIMBU SUBJOINED LETTER WA +1930..1931 ; Other_Alphabetic # Mc [2] LIMBU SMALL LETTER KA..LIMBU SMALL LETTER NGA +1932 ; Other_Alphabetic # Mn LIMBU SMALL LETTER ANUSVARA +1933..1938 ; Other_Alphabetic # Mc [6] LIMBU SMALL LETTER TA..LIMBU SMALL LETTER LA +19B0..19C0 ; Other_Alphabetic # Mc [17] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE VOWEL SIGN IY +19C8..19C9 ; Other_Alphabetic # Mc [2] NEW TAI LUE TONE MARK-1..NEW TAI LUE TONE MARK-2 +1A17..1A18 ; Other_Alphabetic # Mn [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U +1A19..1A1B ; Other_Alphabetic # Mc [3] BUGINESE VOWEL SIGN E..BUGINESE VOWEL SIGN AE +1A55 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN MEDIAL RA +1A56 ; Other_Alphabetic # Mn TAI THAM CONSONANT SIGN MEDIAL LA +1A57 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN LA TANG LAI +1A58..1A5E ; Other_Alphabetic # Mn [7] TAI THAM SIGN MAI KANG LAI..TAI THAM CONSONANT SIGN SA +1A61 ; Other_Alphabetic # Mc TAI THAM VOWEL SIGN A +1A62 ; Other_Alphabetic # Mn TAI THAM VOWEL SIGN MAI SAT +1A63..1A64 ; Other_Alphabetic # Mc [2] TAI THAM VOWEL SIGN AA..TAI THAM VOWEL SIGN TALL AA +1A65..1A6C ; Other_Alphabetic # Mn [8] TAI THAM VOWEL SIGN I..TAI THAM VOWEL SIGN OA BELOW +1A6D..1A72 ; Other_Alphabetic # Mc [6] TAI THAM VOWEL SIGN OY..TAI THAM VOWEL SIGN THAM AI +1A73..1A74 ; Other_Alphabetic # Mn [2] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN MAI KANG +1B00..1B03 ; Other_Alphabetic # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG +1B04 ; Other_Alphabetic # Mc BALINESE SIGN BISAH +1B35 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN TEDUNG +1B36..1B3A ; Other_Alphabetic # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA +1B3B ; Other_Alphabetic # Mc BALINESE VOWEL SIGN RA REPA TEDUNG +1B3C ; Other_Alphabetic # Mn BALINESE VOWEL SIGN LA LENGA +1B3D..1B41 ; Other_Alphabetic # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG +1B42 ; Other_Alphabetic # Mn BALINESE VOWEL SIGN PEPET +1B43 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN PEPET TEDUNG +1B80..1B81 ; Other_Alphabetic # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR +1B82 ; Other_Alphabetic # Mc SUNDANESE SIGN PANGWISAD +1BA1 ; Other_Alphabetic # Mc SUNDANESE CONSONANT SIGN PAMINGKAL +1BA2..1BA5 ; Other_Alphabetic # Mn [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU +1BA6..1BA7 ; Other_Alphabetic # Mc [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG +1BA8..1BA9 ; Other_Alphabetic # Mn [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG +1BE7 ; Other_Alphabetic # Mc BATAK VOWEL SIGN E +1BE8..1BE9 ; Other_Alphabetic # Mn [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE +1BEA..1BEC ; Other_Alphabetic # Mc [3] BATAK VOWEL SIGN I..BATAK VOWEL SIGN O +1BED ; Other_Alphabetic # Mn BATAK VOWEL SIGN KARO O +1BEE ; Other_Alphabetic # Mc BATAK VOWEL SIGN U +1BEF..1BF1 ; Other_Alphabetic # Mn [3] BATAK VOWEL SIGN U FOR SIMALUNGUN SA..BATAK CONSONANT SIGN H +1C24..1C2B ; Other_Alphabetic # Mc [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU +1C2C..1C33 ; Other_Alphabetic # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T +1C34..1C35 ; Other_Alphabetic # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG +1CF2 ; Other_Alphabetic # Mc VEDIC SIGN ARDHAVISARGA +24B6..24E9 ; Other_Alphabetic # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z +2DE0..2DFF ; Other_Alphabetic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS +A823..A824 ; Other_Alphabetic # Mc [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I +A825..A826 ; Other_Alphabetic # Mn [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E +A827 ; Other_Alphabetic # Mc SYLOTI NAGRI VOWEL SIGN OO +A880..A881 ; Other_Alphabetic # Mc [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA +A8B4..A8C3 ; Other_Alphabetic # Mc [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU +A926..A92A ; Other_Alphabetic # Mn [5] KAYAH LI VOWEL UE..KAYAH LI VOWEL O +A947..A951 ; Other_Alphabetic # Mn [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R +A952 ; Other_Alphabetic # Mc REJANG CONSONANT SIGN H +A980..A982 ; Other_Alphabetic # Mn [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR +A983 ; Other_Alphabetic # Mc JAVANESE SIGN WIGNYAN +A9B4..A9B5 ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TARUNG..JAVANESE VOWEL SIGN TOLONG +A9B6..A9B9 ; Other_Alphabetic # Mn [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT +A9BA..A9BB ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TALING..JAVANESE VOWEL SIGN DIRGA MURE +A9BC ; Other_Alphabetic # Mn JAVANESE VOWEL SIGN PEPET +A9BD..A9BF ; Other_Alphabetic # Mc [3] JAVANESE CONSONANT SIGN KERET..JAVANESE CONSONANT SIGN CAKRA +AA29..AA2E ; Other_Alphabetic # Mn [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE +AA2F..AA30 ; Other_Alphabetic # Mc [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI +AA31..AA32 ; Other_Alphabetic # Mn [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE +AA33..AA34 ; Other_Alphabetic # Mc [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA +AA35..AA36 ; Other_Alphabetic # Mn [2] CHAM CONSONANT SIGN LA..CHAM CONSONANT SIGN WA +AA43 ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL NG +AA4C ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL M +AA4D ; Other_Alphabetic # Mc CHAM CONSONANT SIGN FINAL H +AAB0 ; Other_Alphabetic # Mn TAI VIET MAI KANG +AAB2..AAB4 ; Other_Alphabetic # Mn [3] TAI VIET VOWEL I..TAI VIET VOWEL U +AAB7..AAB8 ; Other_Alphabetic # Mn [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA +AABE ; Other_Alphabetic # Mn TAI VIET VOWEL AM +ABE3..ABE4 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP +ABE5 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN ANAP +ABE6..ABE7 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN YENAP..MEETEI MAYEK VOWEL SIGN SOUNAP +ABE8 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN UNAP +ABE9..ABEA ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN CHEINAP..MEETEI MAYEK VOWEL SIGN NUNG +FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA +10A01..10A03 ; Other_Alphabetic # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R +10A05..10A06 ; Other_Alphabetic # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O +10A0C..10A0F ; Other_Alphabetic # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA +11000 ; Other_Alphabetic # Mc BRAHMI SIGN CANDRABINDU +11001 ; Other_Alphabetic # Mn BRAHMI SIGN ANUSVARA +11002 ; Other_Alphabetic # Mc BRAHMI SIGN VISARGA +11038..11045 ; Other_Alphabetic # Mn [14] BRAHMI VOWEL SIGN AA..BRAHMI VOWEL SIGN AU +11082 ; Other_Alphabetic # Mc KAITHI SIGN VISARGA +110B0..110B2 ; Other_Alphabetic # Mc [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II +110B3..110B6 ; Other_Alphabetic # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI +110B7..110B8 ; Other_Alphabetic # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU + +# Total code points: 795 + +# ================================================ + +3006 ; Ideographic # Lo IDEOGRAPHIC CLOSING MARK +3007 ; Ideographic # Nl IDEOGRAPHIC NUMBER ZERO +3021..3029 ; Ideographic # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3038..303A ; Ideographic # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +3400..4DB5 ; Ideographic # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FCB ; Ideographic # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB +F900..FA2D ; Ideographic # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6D ; Ideographic # Lo [62] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6D +FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9 +20000..2A6D6 ; Ideographic # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2A700..2B734 ; Ideographic # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +2B740..2B81D ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D +2F800..2FA1D ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D + +# Total code points: 75630 + +# ================================================ + +005E ; Diacritic # Sk CIRCUMFLEX ACCENT +0060 ; Diacritic # Sk GRAVE ACCENT +00A8 ; Diacritic # Sk DIAERESIS +00AF ; Diacritic # Sk MACRON +00B4 ; Diacritic # Sk ACUTE ACCENT +00B7 ; Diacritic # Po MIDDLE DOT +00B8 ; Diacritic # Sk CEDILLA +02B0..02C1 ; Diacritic # Lm [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP +02C2..02C5 ; Diacritic # Sk [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD +02C6..02D1 ; Diacritic # Lm [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON +02D2..02DF ; Diacritic # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT +02E0..02E4 ; Diacritic # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02E5..02EB ; Diacritic # Sk [7] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER YANG DEPARTING TONE MARK +02EC ; Diacritic # Lm MODIFIER LETTER VOICING +02ED ; Diacritic # Sk MODIFIER LETTER UNASPIRATED +02EE ; Diacritic # Lm MODIFIER LETTER DOUBLE APOSTROPHE +02EF..02FF ; Diacritic # Sk [17] MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW +0300..034E ; Diacritic # Mn [79] COMBINING GRAVE ACCENT..COMBINING UPWARDS ARROW BELOW +0350..0357 ; Diacritic # Mn [8] COMBINING RIGHT ARROWHEAD ABOVE..COMBINING RIGHT HALF RING ABOVE +035D..0362 ; Diacritic # Mn [6] COMBINING DOUBLE BREVE..COMBINING DOUBLE RIGHTWARDS ARROW BELOW +0374 ; Diacritic # Lm GREEK NUMERAL SIGN +0375 ; Diacritic # Sk GREEK LOWER NUMERAL SIGN +037A ; Diacritic # Lm GREEK YPOGEGRAMMENI +0384..0385 ; Diacritic # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS +0483..0487 ; Diacritic # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE +0559 ; Diacritic # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0591..05A1 ; Diacritic # Mn [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER +05A3..05BD ; Diacritic # Mn [27] HEBREW ACCENT MUNAH..HEBREW POINT METEG +05BF ; Diacritic # Mn HEBREW POINT RAFE +05C1..05C2 ; Diacritic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4 ; Diacritic # Mn HEBREW MARK UPPER DOT +064B..0652 ; Diacritic # Mn [8] ARABIC FATHATAN..ARABIC SUKUN +0657..0658 ; Diacritic # Mn [2] ARABIC INVERTED DAMMA..ARABIC MARK NOON GHUNNA +06DF..06E0 ; Diacritic # Mn [2] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO +06E5..06E6 ; Diacritic # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH +06EA..06EC ; Diacritic # Mn [3] ARABIC EMPTY CENTRE LOW STOP..ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE +0730..074A ; Diacritic # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH +07A6..07B0 ; Diacritic # Mn [11] THAANA ABAFILI..THAANA SUKUN +07EB..07F3 ; Diacritic # Mn [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE +07F4..07F5 ; Diacritic # Lm [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE +0818..0819 ; Diacritic # Mn [2] SAMARITAN MARK OCCLUSION..SAMARITAN MARK DAGESH +093C ; Diacritic # Mn DEVANAGARI SIGN NUKTA +094D ; Diacritic # Mn DEVANAGARI SIGN VIRAMA +0951..0954 ; Diacritic # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT +0971 ; Diacritic # Lm DEVANAGARI SIGN HIGH SPACING DOT +09BC ; Diacritic # Mn BENGALI SIGN NUKTA +09CD ; Diacritic # Mn BENGALI SIGN VIRAMA +0A3C ; Diacritic # Mn GURMUKHI SIGN NUKTA +0A4D ; Diacritic # Mn GURMUKHI SIGN VIRAMA +0ABC ; Diacritic # Mn GUJARATI SIGN NUKTA +0ACD ; Diacritic # Mn GUJARATI SIGN VIRAMA +0B3C ; Diacritic # Mn ORIYA SIGN NUKTA +0B4D ; Diacritic # Mn ORIYA SIGN VIRAMA +0BCD ; Diacritic # Mn TAMIL SIGN VIRAMA +0C4D ; Diacritic # Mn TELUGU SIGN VIRAMA +0CBC ; Diacritic # Mn KANNADA SIGN NUKTA +0CCD ; Diacritic # Mn KANNADA SIGN VIRAMA +0D4D ; Diacritic # Mn MALAYALAM SIGN VIRAMA +0DCA ; Diacritic # Mn SINHALA SIGN AL-LAKUNA +0E47..0E4C ; Diacritic # Mn [6] THAI CHARACTER MAITAIKHU..THAI CHARACTER THANTHAKHAT +0E4E ; Diacritic # Mn THAI CHARACTER YAMAKKAN +0EC8..0ECC ; Diacritic # Mn [5] LAO TONE MAI EK..LAO CANCELLATION MARK +0F18..0F19 ; Diacritic # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F35 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG NYI ZLA +0F37 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS +0F39 ; Diacritic # Mn TIBETAN MARK TSA -PHRU +0F3E..0F3F ; Diacritic # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F82..0F84 ; Diacritic # Mn [3] TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA +0F86..0F87 ; Diacritic # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +0FC6 ; Diacritic # Mn TIBETAN SYMBOL PADMA GDAN +1037 ; Diacritic # Mn MYANMAR SIGN DOT BELOW +1039..103A ; Diacritic # Mn [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT +1087..108C ; Diacritic # Mc [6] MYANMAR SIGN SHAN TONE-2..MYANMAR SIGN SHAN COUNCIL TONE-3 +108D ; Diacritic # Mn MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE +108F ; Diacritic # Mc MYANMAR SIGN RUMAI PALAUNG TONE-5 +109A..109B ; Diacritic # Mc [2] MYANMAR SIGN KHAMTI TONE-1..MYANMAR SIGN KHAMTI TONE-3 +17C9..17D3 ; Diacritic # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT +17DD ; Diacritic # Mn KHMER SIGN ATTHACAN +1939..193B ; Diacritic # Mn [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I +1A75..1A7C ; Diacritic # Mn [8] TAI THAM SIGN TONE-1..TAI THAM SIGN KHUEN-LUE KARAN +1A7F ; Diacritic # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT +1B34 ; Diacritic # Mn BALINESE SIGN REREKAN +1B44 ; Diacritic # Mc BALINESE ADEG ADEG +1B6B..1B73 ; Diacritic # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG +1BAA ; Diacritic # Mc SUNDANESE SIGN PAMAAEH +1C36..1C37 ; Diacritic # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA +1C78..1C7D ; Diacritic # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD +1CD0..1CD2 ; Diacritic # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA +1CD3 ; Diacritic # Po VEDIC SIGN NIHSHVASA +1CD4..1CE0 ; Diacritic # Mn [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA +1CE1 ; Diacritic # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA +1CE2..1CE8 ; Diacritic # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL +1CED ; Diacritic # Mn VEDIC SIGN TIRYAK +1D2C..1D61 ; Diacritic # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI +1D62..1D6A ; Diacritic # L& [9] LATIN SUBSCRIPT SMALL LETTER I..GREEK SUBSCRIPT SMALL LETTER CHI +1DC4..1DCF ; Diacritic # Mn [12] COMBINING MACRON-ACUTE..COMBINING ZIGZAG BELOW +1DFD..1DFF ; Diacritic # Mn [3] COMBINING ALMOST EQUAL TO BELOW..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1FBD ; Diacritic # Sk GREEK KORONIS +1FBF..1FC1 ; Diacritic # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FCD..1FCF ; Diacritic # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FDD..1FDF ; Diacritic # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FED..1FEF ; Diacritic # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FFD..1FFE ; Diacritic # Sk [2] GREEK OXIA..GREEK DASIA +2CEF..2CF1 ; Diacritic # Mn [3] COPTIC COMBINING NI ABOVE..COPTIC COMBINING SPIRITUS LENIS +2E2F ; Diacritic # Lm VERTICAL TILDE +302A..302F ; Diacritic # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK +3099..309A ; Diacritic # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309B..309C ; Diacritic # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +30FC ; Diacritic # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK +A66F ; Diacritic # Mn COMBINING CYRILLIC VZMET +A67C..A67D ; Diacritic # Mn [2] COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK +A67F ; Diacritic # Lm CYRILLIC PAYEROK +A6F0..A6F1 ; Diacritic # Mn [2] BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS +A717..A71F ; Diacritic # Lm [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK +A720..A721 ; Diacritic # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE +A788 ; Diacritic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT +A8C4 ; Diacritic # Mn SAURASHTRA SIGN VIRAMA +A8E0..A8F1 ; Diacritic # Mn [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA +A92B..A92D ; Diacritic # Mn [3] KAYAH LI TONE PLOPHU..KAYAH LI TONE CALYA PLOPHU +A92E ; Diacritic # Po KAYAH LI SIGN CWI +A953 ; Diacritic # Mc REJANG VIRAMA +A9B3 ; Diacritic # Mn JAVANESE SIGN CECAK TELU +A9C0 ; Diacritic # Mc JAVANESE PANGKON +AA7B ; Diacritic # Mc MYANMAR SIGN PAO KAREN TONE +AABF ; Diacritic # Mn TAI VIET TONE MAI EK +AAC0 ; Diacritic # Lo TAI VIET TONE MAI NUENG +AAC1 ; Diacritic # Mn TAI VIET TONE MAI THO +AAC2 ; Diacritic # Lo TAI VIET TONE MAI SONG +ABEC ; Diacritic # Mc MEETEI MAYEK LUM IYEK +ABED ; Diacritic # Mn MEETEI MAYEK APUN IYEK +FB1E ; Diacritic # Mn HEBREW POINT JUDEO-SPANISH VARIKA +FE20..FE26 ; Diacritic # Mn [7] COMBINING LIGATURE LEFT HALF..COMBINING CONJOINING MACRON +FF3E ; Diacritic # Sk FULLWIDTH CIRCUMFLEX ACCENT +FF40 ; Diacritic # Sk FULLWIDTH GRAVE ACCENT +FF70 ; Diacritic # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF9E..FF9F ; Diacritic # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +FFE3 ; Diacritic # Sk FULLWIDTH MACRON +110B9..110BA ; Diacritic # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA +1D167..1D169 ; Diacritic # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 +1D16D..1D172 ; Diacritic # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 +1D17B..1D182 ; Diacritic # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D185..1D18B ; Diacritic # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE +1D1AA..1D1AD ; Diacritic # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO + +# Total code points: 639 + +# ================================================ + +00B7 ; Extender # Po MIDDLE DOT +02D0..02D1 ; Extender # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON +0640 ; Extender # Lm ARABIC TATWEEL +07FA ; Extender # Lm NKO LAJANYALAN +0E46 ; Extender # Lm THAI CHARACTER MAIYAMOK +0EC6 ; Extender # Lm LAO KO LA +1843 ; Extender # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN +1AA7 ; Extender # Lm TAI THAM SIGN MAI YAMOK +1C36 ; Extender # Mn LEPCHA SIGN RAN +1C7B ; Extender # Lm OL CHIKI RELAA +3005 ; Extender # Lm IDEOGRAPHIC ITERATION MARK +3031..3035 ; Extender # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +309D..309E ; Extender # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +30FC..30FE ; Extender # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +A015 ; Extender # Lm YI SYLLABLE WU +A60C ; Extender # Lm VAI SYLLABLE LENGTHENER +A9CF ; Extender # Lm JAVANESE PANGRANGKEP +AA70 ; Extender # Lm MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION +AADD ; Extender # Lm TAI VIET SYMBOL SAM +FF70 ; Extender # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK + +# Total code points: 28 + +# ================================================ + +02B0..02B8 ; Other_Lowercase # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02C0..02C1 ; Other_Lowercase # Lm [2] MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP +02E0..02E4 ; Other_Lowercase # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +0345 ; Other_Lowercase # Mn COMBINING GREEK YPOGEGRAMMENI +037A ; Other_Lowercase # Lm GREEK YPOGEGRAMMENI +1D2C..1D61 ; Other_Lowercase # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI +1D78 ; Other_Lowercase # Lm MODIFIER LETTER CYRILLIC EN +1D9B..1DBF ; Other_Lowercase # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA +2090..2094 ; Other_Lowercase # Lm [5] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER SCHWA +2170..217F ; Other_Lowercase # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND +24D0..24E9 ; Other_Lowercase # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +2C7D ; Other_Lowercase # Lm MODIFIER LETTER CAPITAL V +A770 ; Other_Lowercase # Lm MODIFIER LETTER US + +# Total code points: 159 + +# ================================================ + +2160..216F ; Other_Uppercase # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND +24B6..24CF ; Other_Uppercase # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z + +# Total code points: 42 + +# ================================================ + +FDD0..FDEF ; Noncharacter_Code_Point # Cn [32] .. +FFFE..FFFF ; Noncharacter_Code_Point # Cn [2] .. +1FFFE..1FFFF ; Noncharacter_Code_Point # Cn [2] .. +2FFFE..2FFFF ; Noncharacter_Code_Point # Cn [2] .. +3FFFE..3FFFF ; Noncharacter_Code_Point # Cn [2] .. +4FFFE..4FFFF ; Noncharacter_Code_Point # Cn [2] .. +5FFFE..5FFFF ; Noncharacter_Code_Point # Cn [2] .. +6FFFE..6FFFF ; Noncharacter_Code_Point # Cn [2] .. +7FFFE..7FFFF ; Noncharacter_Code_Point # Cn [2] .. +8FFFE..8FFFF ; Noncharacter_Code_Point # Cn [2] .. +9FFFE..9FFFF ; Noncharacter_Code_Point # Cn [2] .. +AFFFE..AFFFF ; Noncharacter_Code_Point # Cn [2] .. +BFFFE..BFFFF ; Noncharacter_Code_Point # Cn [2] .. +CFFFE..CFFFF ; Noncharacter_Code_Point # Cn [2] .. +DFFFE..DFFFF ; Noncharacter_Code_Point # Cn [2] .. +EFFFE..EFFFF ; Noncharacter_Code_Point # Cn [2] .. +FFFFE..FFFFF ; Noncharacter_Code_Point # Cn [2] .. +10FFFE..10FFFF; Noncharacter_Code_Point # Cn [2] .. + +# Total code points: 66 + +# ================================================ + +09BE ; Other_Grapheme_Extend # Mc BENGALI VOWEL SIGN AA +09D7 ; Other_Grapheme_Extend # Mc BENGALI AU LENGTH MARK +0B3E ; Other_Grapheme_Extend # Mc ORIYA VOWEL SIGN AA +0B57 ; Other_Grapheme_Extend # Mc ORIYA AU LENGTH MARK +0BBE ; Other_Grapheme_Extend # Mc TAMIL VOWEL SIGN AA +0BD7 ; Other_Grapheme_Extend # Mc TAMIL AU LENGTH MARK +0CC2 ; Other_Grapheme_Extend # Mc KANNADA VOWEL SIGN UU +0CD5..0CD6 ; Other_Grapheme_Extend # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0D3E ; Other_Grapheme_Extend # Mc MALAYALAM VOWEL SIGN AA +0D57 ; Other_Grapheme_Extend # Mc MALAYALAM AU LENGTH MARK +0DCF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN AELA-PILLA +0DDF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN GAYANUKITTA +200C..200D ; Other_Grapheme_Extend # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER +FF9E..FF9F ; Other_Grapheme_Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +1D165 ; Other_Grapheme_Extend # Mc MUSICAL SYMBOL COMBINING STEM +1D16E..1D172 ; Other_Grapheme_Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 + +# Total code points: 23 + +# ================================================ + +2FF0..2FF1 ; IDS_Binary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW +2FF4..2FFB ; IDS_Binary_Operator # So [8] IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID + +# Total code points: 10 + +# ================================================ + +2FF2..2FF3 ; IDS_Trinary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW + +# Total code points: 2 + +# ================================================ + +2E80..2E99 ; Radical # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; Radical # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; Radical # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE + +# Total code points: 329 + +# ================================================ + +3400..4DB5 ; Unified_Ideograph # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FCB ; Unified_Ideograph # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB +FA0E..FA0F ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F +FA11 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA11 +FA13..FA14 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14 +FA1F ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA1F +FA21 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA21 +FA23..FA24 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24 +FA27..FA29 ; Unified_Ideograph # Lo [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29 +20000..2A6D6 ; Unified_Ideograph # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2A700..2B734 ; Unified_Ideograph # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +2B740..2B81D ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D + +# Total code points: 74616 + +# ================================================ + +034F ; Other_Default_Ignorable_Code_Point # Mn COMBINING GRAPHEME JOINER +115F..1160 ; Other_Default_Ignorable_Code_Point # Lo [2] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER +2065..2069 ; Other_Default_Ignorable_Code_Point # Cn [5] .. +3164 ; Other_Default_Ignorable_Code_Point # Lo HANGUL FILLER +FFA0 ; Other_Default_Ignorable_Code_Point # Lo HALFWIDTH HANGUL FILLER +FFF0..FFF8 ; Other_Default_Ignorable_Code_Point # Cn [9] .. +E0000 ; Other_Default_Ignorable_Code_Point # Cn +E0002..E001F ; Other_Default_Ignorable_Code_Point # Cn [30] .. +E0080..E00FF ; Other_Default_Ignorable_Code_Point # Cn [128] .. +E01F0..E0FFF ; Other_Default_Ignorable_Code_Point # Cn [3600] .. + +# Total code points: 3778 + +# ================================================ + +0149 ; Deprecated # L& LATIN SMALL LETTER N PRECEDED BY APOSTROPHE +0673 ; Deprecated # Lo ARABIC LETTER ALEF WITH WAVY HAMZA BELOW +0F77 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC RR +0F79 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC LL +17A3..17A4 ; Deprecated # Lo [2] KHMER INDEPENDENT VOWEL QAQ..KHMER INDEPENDENT VOWEL QAA +206A..206F ; Deprecated # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +2329 ; Deprecated # Ps LEFT-POINTING ANGLE BRACKET +232A ; Deprecated # Pe RIGHT-POINTING ANGLE BRACKET +E0001 ; Deprecated # Cf LANGUAGE TAG +E0020..E007F ; Deprecated # Cf [96] TAG SPACE..CANCEL TAG + +# Total code points: 111 + +# ================================================ + +0069..006A ; Soft_Dotted # L& [2] LATIN SMALL LETTER I..LATIN SMALL LETTER J +012F ; Soft_Dotted # L& LATIN SMALL LETTER I WITH OGONEK +0249 ; Soft_Dotted # L& LATIN SMALL LETTER J WITH STROKE +0268 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH STROKE +029D ; Soft_Dotted # L& LATIN SMALL LETTER J WITH CROSSED-TAIL +02B2 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J +03F3 ; Soft_Dotted # L& GREEK LETTER YOT +0456 ; Soft_Dotted # L& CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I +0458 ; Soft_Dotted # L& CYRILLIC SMALL LETTER JE +1D62 ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER I +1D96 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH RETROFLEX HOOK +1DA4 ; Soft_Dotted # Lm MODIFIER LETTER SMALL I WITH STROKE +1DA8 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J WITH CROSSED-TAIL +1E2D ; Soft_Dotted # L& LATIN SMALL LETTER I WITH TILDE BELOW +1ECB ; Soft_Dotted # L& LATIN SMALL LETTER I WITH DOT BELOW +2071 ; Soft_Dotted # Lm SUPERSCRIPT LATIN SMALL LETTER I +2148..2149 ; Soft_Dotted # L& [2] DOUBLE-STRUCK ITALIC SMALL I..DOUBLE-STRUCK ITALIC SMALL J +2C7C ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER J +1D422..1D423 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SMALL I..MATHEMATICAL BOLD SMALL J +1D456..1D457 ; Soft_Dotted # L& [2] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL J +1D48A..1D48B ; Soft_Dotted # L& [2] MATHEMATICAL BOLD ITALIC SMALL I..MATHEMATICAL BOLD ITALIC SMALL J +1D4BE..1D4BF ; Soft_Dotted # L& [2] MATHEMATICAL SCRIPT SMALL I..MATHEMATICAL SCRIPT SMALL J +1D4F2..1D4F3 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SCRIPT SMALL I..MATHEMATICAL BOLD SCRIPT SMALL J +1D526..1D527 ; Soft_Dotted # L& [2] MATHEMATICAL FRAKTUR SMALL I..MATHEMATICAL FRAKTUR SMALL J +1D55A..1D55B ; Soft_Dotted # L& [2] MATHEMATICAL DOUBLE-STRUCK SMALL I..MATHEMATICAL DOUBLE-STRUCK SMALL J +1D58E..1D58F ; Soft_Dotted # L& [2] MATHEMATICAL BOLD FRAKTUR SMALL I..MATHEMATICAL BOLD FRAKTUR SMALL J +1D5C2..1D5C3 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF SMALL I..MATHEMATICAL SANS-SERIF SMALL J +1D5F6..1D5F7 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD SMALL I..MATHEMATICAL SANS-SERIF BOLD SMALL J +1D62A..1D62B ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF ITALIC SMALL I..MATHEMATICAL SANS-SERIF ITALIC SMALL J +1D65E..1D65F ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J +1D692..1D693 ; Soft_Dotted # L& [2] MATHEMATICAL MONOSPACE SMALL I..MATHEMATICAL MONOSPACE SMALL J + +# Total code points: 46 + +# ================================================ + +0E40..0E44 ; Logical_Order_Exception # Lo [5] THAI CHARACTER SARA E..THAI CHARACTER SARA AI MAIMALAI +0EC0..0EC4 ; Logical_Order_Exception # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +AAB5..AAB6 ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL E..TAI VIET VOWEL O +AAB9 ; Logical_Order_Exception # Lo TAI VIET VOWEL UEA +AABB..AABC ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL AUE..TAI VIET VOWEL AY + +# Total code points: 15 + +# ================================================ + +2118 ; Other_ID_Start # Sm SCRIPT CAPITAL P +212E ; Other_ID_Start # So ESTIMATED SYMBOL +309B..309C ; Other_ID_Start # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK + +# Total code points: 4 + +# ================================================ + +00B7 ; Other_ID_Continue # Po MIDDLE DOT +0387 ; Other_ID_Continue # Po GREEK ANO TELEIA +1369..1371 ; Other_ID_Continue # No [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +19DA ; Other_ID_Continue # No NEW TAI LUE THAM DIGIT ONE + +# Total code points: 12 + +# ================================================ + +0021 ; STerm # Po EXCLAMATION MARK +002E ; STerm # Po FULL STOP +003F ; STerm # Po QUESTION MARK +055C ; STerm # Po ARMENIAN EXCLAMATION MARK +055E ; STerm # Po ARMENIAN QUESTION MARK +0589 ; STerm # Po ARMENIAN FULL STOP +061F ; STerm # Po ARABIC QUESTION MARK +06D4 ; STerm # Po ARABIC FULL STOP +0700..0702 ; STerm # Po [3] SYRIAC END OF PARAGRAPH..SYRIAC SUBLINEAR FULL STOP +07F9 ; STerm # Po NKO EXCLAMATION MARK +0964..0965 ; STerm # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +104A..104B ; STerm # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION +1362 ; STerm # Po ETHIOPIC FULL STOP +1367..1368 ; STerm # Po [2] ETHIOPIC QUESTION MARK..ETHIOPIC PARAGRAPH SEPARATOR +166E ; STerm # Po CANADIAN SYLLABICS FULL STOP +1735..1736 ; STerm # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1803 ; STerm # Po MONGOLIAN FULL STOP +1809 ; STerm # Po MONGOLIAN MANCHU FULL STOP +1944..1945 ; STerm # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK +1AA8..1AAB ; STerm # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B5A..1B5B ; STerm # Po [2] BALINESE PANTI..BALINESE PAMADA +1B5E..1B5F ; STerm # Po [2] BALINESE CARIK SIKI..BALINESE CARIK PAREREN +1C3B..1C3C ; STerm # Po [2] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION NYET THYOOM TA-ROL +1C7E..1C7F ; STerm # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +203C..203D ; STerm # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +2047..2049 ; STerm # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2E2E ; STerm # Po REVERSED QUESTION MARK +3002 ; STerm # Po IDEOGRAPHIC FULL STOP +A4FF ; STerm # Po LISU PUNCTUATION FULL STOP +A60E..A60F ; STerm # Po [2] VAI FULL STOP..VAI QUESTION MARK +A6F3 ; STerm # Po BAMUM FULL STOP +A6F7 ; STerm # Po BAMUM QUESTION MARK +A876..A877 ; STerm # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD +A8CE..A8CF ; STerm # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA +A92F ; STerm # Po KAYAH LI SIGN SHYA +A9C8..A9C9 ; STerm # Po [2] JAVANESE PADA LINGSA..JAVANESE PADA LUNGSI +AA5D..AA5F ; STerm # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA +ABEB ; STerm # Po MEETEI MAYEK CHEIKHEI +FE52 ; STerm # Po SMALL FULL STOP +FE56..FE57 ; STerm # Po [2] SMALL QUESTION MARK..SMALL EXCLAMATION MARK +FF01 ; STerm # Po FULLWIDTH EXCLAMATION MARK +FF0E ; STerm # Po FULLWIDTH FULL STOP +FF1F ; STerm # Po FULLWIDTH QUESTION MARK +FF61 ; STerm # Po HALFWIDTH IDEOGRAPHIC FULL STOP +10A56..10A57 ; STerm # Po [2] KHAROSHTHI PUNCTUATION DANDA..KHAROSHTHI PUNCTUATION DOUBLE DANDA +11047..11048 ; STerm # Po [2] BRAHMI DANDA..BRAHMI DOUBLE DANDA +110BE..110C1 ; STerm # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA + +# Total code points: 76 + +# ================================================ + +180B..180D ; Variation_Selector # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +FE00..FE0F ; Variation_Selector # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +E0100..E01EF ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 + +# Total code points: 259 + +# ================================================ + +0009..000D ; Pattern_White_Space # Cc [5] .. +0020 ; Pattern_White_Space # Zs SPACE +0085 ; Pattern_White_Space # Cc +200E..200F ; Pattern_White_Space # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK +2028 ; Pattern_White_Space # Zl LINE SEPARATOR +2029 ; Pattern_White_Space # Zp PARAGRAPH SEPARATOR + +# Total code points: 11 + +# ================================================ + +0021..0023 ; Pattern_Syntax # Po [3] EXCLAMATION MARK..NUMBER SIGN +0024 ; Pattern_Syntax # Sc DOLLAR SIGN +0025..0027 ; Pattern_Syntax # Po [3] PERCENT SIGN..APOSTROPHE +0028 ; Pattern_Syntax # Ps LEFT PARENTHESIS +0029 ; Pattern_Syntax # Pe RIGHT PARENTHESIS +002A ; Pattern_Syntax # Po ASTERISK +002B ; Pattern_Syntax # Sm PLUS SIGN +002C ; Pattern_Syntax # Po COMMA +002D ; Pattern_Syntax # Pd HYPHEN-MINUS +002E..002F ; Pattern_Syntax # Po [2] FULL STOP..SOLIDUS +003A..003B ; Pattern_Syntax # Po [2] COLON..SEMICOLON +003C..003E ; Pattern_Syntax # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN +003F..0040 ; Pattern_Syntax # Po [2] QUESTION MARK..COMMERCIAL AT +005B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET +005C ; Pattern_Syntax # Po REVERSE SOLIDUS +005D ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET +005E ; Pattern_Syntax # Sk CIRCUMFLEX ACCENT +0060 ; Pattern_Syntax # Sk GRAVE ACCENT +007B ; Pattern_Syntax # Ps LEFT CURLY BRACKET +007C ; Pattern_Syntax # Sm VERTICAL LINE +007D ; Pattern_Syntax # Pe RIGHT CURLY BRACKET +007E ; Pattern_Syntax # Sm TILDE +00A1 ; Pattern_Syntax # Po INVERTED EXCLAMATION MARK +00A2..00A5 ; Pattern_Syntax # Sc [4] CENT SIGN..YEN SIGN +00A6..00A7 ; Pattern_Syntax # So [2] BROKEN BAR..SECTION SIGN +00A9 ; Pattern_Syntax # So COPYRIGHT SIGN +00AB ; Pattern_Syntax # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00AC ; Pattern_Syntax # Sm NOT SIGN +00AE ; Pattern_Syntax # So REGISTERED SIGN +00B0 ; Pattern_Syntax # So DEGREE SIGN +00B1 ; Pattern_Syntax # Sm PLUS-MINUS SIGN +00B6 ; Pattern_Syntax # So PILCROW SIGN +00BB ; Pattern_Syntax # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +00BF ; Pattern_Syntax # Po INVERTED QUESTION MARK +00D7 ; Pattern_Syntax # Sm MULTIPLICATION SIGN +00F7 ; Pattern_Syntax # Sm DIVISION SIGN +2010..2015 ; Pattern_Syntax # Pd [6] HYPHEN..HORIZONTAL BAR +2016..2017 ; Pattern_Syntax # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE +2018 ; Pattern_Syntax # Pi LEFT SINGLE QUOTATION MARK +2019 ; Pattern_Syntax # Pf RIGHT SINGLE QUOTATION MARK +201A ; Pattern_Syntax # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; Pattern_Syntax # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; Pattern_Syntax # Pf RIGHT DOUBLE QUOTATION MARK +201E ; Pattern_Syntax # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; Pattern_Syntax # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2020..2027 ; Pattern_Syntax # Po [8] DAGGER..HYPHENATION POINT +2030..2038 ; Pattern_Syntax # Po [9] PER MILLE SIGN..CARET +2039 ; Pattern_Syntax # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Pattern_Syntax # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +203B..203E ; Pattern_Syntax # Po [4] REFERENCE MARK..OVERLINE +2041..2043 ; Pattern_Syntax # Po [3] CARET INSERTION POINT..HYPHEN BULLET +2044 ; Pattern_Syntax # Sm FRACTION SLASH +2045 ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH QUILL +2047..2051 ; Pattern_Syntax # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2052 ; Pattern_Syntax # Sm COMMERCIAL MINUS SIGN +2053 ; Pattern_Syntax # Po SWUNG DASH +2055..205E ; Pattern_Syntax # Po [10] FLOWER PUNCTUATION MARK..VERTICAL FOUR DOTS +2190..2194 ; Pattern_Syntax # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +2195..2199 ; Pattern_Syntax # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219A..219B ; Pattern_Syntax # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +219C..219F ; Pattern_Syntax # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A0 ; Pattern_Syntax # Sm RIGHTWARDS TWO HEADED ARROW +21A1..21A2 ; Pattern_Syntax # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A3 ; Pattern_Syntax # Sm RIGHTWARDS ARROW WITH TAIL +21A4..21A5 ; Pattern_Syntax # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A6 ; Pattern_Syntax # Sm RIGHTWARDS ARROW FROM BAR +21A7..21AD ; Pattern_Syntax # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AE ; Pattern_Syntax # Sm LEFT RIGHT ARROW WITH STROKE +21AF..21CD ; Pattern_Syntax # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21CE..21CF ; Pattern_Syntax # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; Pattern_Syntax # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D2 ; Pattern_Syntax # Sm RIGHTWARDS DOUBLE ARROW +21D3 ; Pattern_Syntax # So DOWNWARDS DOUBLE ARROW +21D4 ; Pattern_Syntax # Sm LEFT RIGHT DOUBLE ARROW +21D5..21F3 ; Pattern_Syntax # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW +21F4..22FF ; Pattern_Syntax # Sm [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP +2300..2307 ; Pattern_Syntax # So [8] DIAMETER SIGN..WAVY LINE +2308..230B ; Pattern_Syntax # Sm [4] LEFT CEILING..RIGHT FLOOR +230C..231F ; Pattern_Syntax # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER +2320..2321 ; Pattern_Syntax # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2322..2328 ; Pattern_Syntax # So [7] FROWN..KEYBOARD +2329 ; Pattern_Syntax # Ps LEFT-POINTING ANGLE BRACKET +232A ; Pattern_Syntax # Pe RIGHT-POINTING ANGLE BRACKET +232B..237B ; Pattern_Syntax # So [81] ERASE TO THE LEFT..NOT CHECK MARK +237C ; Pattern_Syntax # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +237D..239A ; Pattern_Syntax # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL +239B..23B3 ; Pattern_Syntax # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +23B4..23DB ; Pattern_Syntax # So [40] TOP SQUARE BRACKET..FUSE +23DC..23E1 ; Pattern_Syntax # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET +23E2..23F3 ; Pattern_Syntax # So [18] WHITE TRAPEZIUM..HOURGLASS WITH FLOWING SAND +23F4..23FF ; Pattern_Syntax # Cn [12] .. +2400..2426 ; Pattern_Syntax # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2427..243F ; Pattern_Syntax # Cn [25] .. +2440..244A ; Pattern_Syntax # So [11] OCR HOOK..OCR DOUBLE BACKSLASH +244B..245F ; Pattern_Syntax # Cn [21] .. +2500..25B6 ; Pattern_Syntax # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE +25B7 ; Pattern_Syntax # Sm WHITE RIGHT-POINTING TRIANGLE +25B8..25C0 ; Pattern_Syntax # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C1 ; Pattern_Syntax # Sm WHITE LEFT-POINTING TRIANGLE +25C2..25F7 ; Pattern_Syntax # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +25F8..25FF ; Pattern_Syntax # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +2600..266E ; Pattern_Syntax # So [111] BLACK SUN WITH RAYS..MUSIC NATURAL SIGN +266F ; Pattern_Syntax # Sm MUSIC SHARP SIGN +2670..26FF ; Pattern_Syntax # So [144] WEST SYRIAC CROSS..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE +2700 ; Pattern_Syntax # Cn +2701..2767 ; Pattern_Syntax # So [103] UPPER BLADE SCISSORS..ROTATED FLORAL HEART BULLET +2768 ; Pattern_Syntax # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; Pattern_Syntax # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; Pattern_Syntax # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; Pattern_Syntax # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; Pattern_Syntax # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; Pattern_Syntax # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; Pattern_Syntax # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; Pattern_Syntax # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; Pattern_Syntax # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; Pattern_Syntax # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +2794..27BF ; Pattern_Syntax # So [44] HEAVY WIDE-HEADED RIGHTWARDS ARROW..DOUBLE CURLY LOOP +27C0..27C4 ; Pattern_Syntax # Sm [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET +27C5 ; Pattern_Syntax # Ps LEFT S-SHAPED BAG DELIMITER +27C6 ; Pattern_Syntax # Pe RIGHT S-SHAPED BAG DELIMITER +27C7..27CA ; Pattern_Syntax # Sm [4] OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE +27CB ; Pattern_Syntax # Cn +27CC ; Pattern_Syntax # Sm LONG DIVISION +27CD ; Pattern_Syntax # Cn +27CE..27E5 ; Pattern_Syntax # Sm [24] SQUARED LOGICAL AND..WHITE SQUARE WITH RIGHTWARDS TICK +27E6 ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Pattern_Syntax # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Pattern_Syntax # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Pattern_Syntax # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27EC ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET +27ED ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET +27EE ; Pattern_Syntax # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS +27EF ; Pattern_Syntax # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS +27F0..27FF ; Pattern_Syntax # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2800..28FF ; Pattern_Syntax # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2900..2982 ; Pattern_Syntax # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2983 ; Pattern_Syntax # Ps LEFT WHITE CURLY BRACKET +2984 ; Pattern_Syntax # Pe RIGHT WHITE CURLY BRACKET +2985 ; Pattern_Syntax # Ps LEFT WHITE PARENTHESIS +2986 ; Pattern_Syntax # Pe RIGHT WHITE PARENTHESIS +2987 ; Pattern_Syntax # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Pattern_Syntax # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Pattern_Syntax # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Pattern_Syntax # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Pattern_Syntax # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Pattern_Syntax # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Pattern_Syntax # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Pattern_Syntax # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Pattern_Syntax # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Pattern_Syntax # Pe RIGHT BLACK TORTOISE SHELL BRACKET +2999..29D7 ; Pattern_Syntax # Sm [63] DOTTED FENCE..BLACK HOURGLASS +29D8 ; Pattern_Syntax # Ps LEFT WIGGLY FENCE +29D9 ; Pattern_Syntax # Pe RIGHT WIGGLY FENCE +29DA ; Pattern_Syntax # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Pattern_Syntax # Pe RIGHT DOUBLE WIGGLY FENCE +29DC..29FB ; Pattern_Syntax # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FC ; Pattern_Syntax # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Pattern_Syntax # Pe RIGHT-POINTING CURVED ANGLE BRACKET +29FE..2AFF ; Pattern_Syntax # Sm [258] TINY..N-ARY WHITE VERTICAL BAR +2B00..2B2F ; Pattern_Syntax # So [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE +2B30..2B44 ; Pattern_Syntax # Sm [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET +2B45..2B46 ; Pattern_Syntax # So [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW +2B47..2B4C ; Pattern_Syntax # Sm [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR +2B4D..2B4F ; Pattern_Syntax # Cn [3] .. +2B50..2B59 ; Pattern_Syntax # So [10] WHITE MEDIUM STAR..HEAVY CIRCLED SALTIRE +2B5A..2BFF ; Pattern_Syntax # Cn [166] .. +2E00..2E01 ; Pattern_Syntax # Po [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER +2E02 ; Pattern_Syntax # Pi LEFT SUBSTITUTION BRACKET +2E03 ; Pattern_Syntax # Pf RIGHT SUBSTITUTION BRACKET +2E04 ; Pattern_Syntax # Pi LEFT DOTTED SUBSTITUTION BRACKET +2E05 ; Pattern_Syntax # Pf RIGHT DOTTED SUBSTITUTION BRACKET +2E06..2E08 ; Pattern_Syntax # Po [3] RAISED INTERPOLATION MARKER..DOTTED TRANSPOSITION MARKER +2E09 ; Pattern_Syntax # Pi LEFT TRANSPOSITION BRACKET +2E0A ; Pattern_Syntax # Pf RIGHT TRANSPOSITION BRACKET +2E0B ; Pattern_Syntax # Po RAISED SQUARE +2E0C ; Pattern_Syntax # Pi LEFT RAISED OMISSION BRACKET +2E0D ; Pattern_Syntax # Pf RIGHT RAISED OMISSION BRACKET +2E0E..2E16 ; Pattern_Syntax # Po [9] EDITORIAL CORONIS..DOTTED RIGHT-POINTING ANGLE +2E17 ; Pattern_Syntax # Pd DOUBLE OBLIQUE HYPHEN +2E18..2E19 ; Pattern_Syntax # Po [2] INVERTED INTERROBANG..PALM BRANCH +2E1A ; Pattern_Syntax # Pd HYPHEN WITH DIAERESIS +2E1B ; Pattern_Syntax # Po TILDE WITH RING ABOVE +2E1C ; Pattern_Syntax # Pi LEFT LOW PARAPHRASE BRACKET +2E1D ; Pattern_Syntax # Pf RIGHT LOW PARAPHRASE BRACKET +2E1E..2E1F ; Pattern_Syntax # Po [2] TILDE WITH DOT ABOVE..TILDE WITH DOT BELOW +2E20 ; Pattern_Syntax # Pi LEFT VERTICAL BAR WITH QUILL +2E21 ; Pattern_Syntax # Pf RIGHT VERTICAL BAR WITH QUILL +2E22 ; Pattern_Syntax # Ps TOP LEFT HALF BRACKET +2E23 ; Pattern_Syntax # Pe TOP RIGHT HALF BRACKET +2E24 ; Pattern_Syntax # Ps BOTTOM LEFT HALF BRACKET +2E25 ; Pattern_Syntax # Pe BOTTOM RIGHT HALF BRACKET +2E26 ; Pattern_Syntax # Ps LEFT SIDEWAYS U BRACKET +2E27 ; Pattern_Syntax # Pe RIGHT SIDEWAYS U BRACKET +2E28 ; Pattern_Syntax # Ps LEFT DOUBLE PARENTHESIS +2E29 ; Pattern_Syntax # Pe RIGHT DOUBLE PARENTHESIS +2E2A..2E2E ; Pattern_Syntax # Po [5] TWO DOTS OVER ONE DOT PUNCTUATION..REVERSED QUESTION MARK +2E2F ; Pattern_Syntax # Lm VERTICAL TILDE +2E30..2E31 ; Pattern_Syntax # Po [2] RING POINT..WORD SEPARATOR MIDDLE DOT +2E32..2E7F ; Pattern_Syntax # Cn [78] .. +3001..3003 ; Pattern_Syntax # Po [3] IDEOGRAPHIC COMMA..DITTO MARK +3008 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET +3009 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET +300A ; Pattern_Syntax # Ps LEFT DOUBLE ANGLE BRACKET +300B ; Pattern_Syntax # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; Pattern_Syntax # Ps LEFT CORNER BRACKET +300D ; Pattern_Syntax # Pe RIGHT CORNER BRACKET +300E ; Pattern_Syntax # Ps LEFT WHITE CORNER BRACKET +300F ; Pattern_Syntax # Pe RIGHT WHITE CORNER BRACKET +3010 ; Pattern_Syntax # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; Pattern_Syntax # Pe RIGHT BLACK LENTICULAR BRACKET +3012..3013 ; Pattern_Syntax # So [2] POSTAL MARK..GETA MARK +3014 ; Pattern_Syntax # Ps LEFT TORTOISE SHELL BRACKET +3015 ; Pattern_Syntax # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; Pattern_Syntax # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; Pattern_Syntax # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; Pattern_Syntax # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; Pattern_Syntax # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; Pattern_Syntax # Ps LEFT WHITE SQUARE BRACKET +301B ; Pattern_Syntax # Pe RIGHT WHITE SQUARE BRACKET +301C ; Pattern_Syntax # Pd WAVE DASH +301D ; Pattern_Syntax # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Pattern_Syntax # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +3020 ; Pattern_Syntax # So POSTAL MARK FACE +3030 ; Pattern_Syntax # Pd WAVY DASH +FD3E ; Pattern_Syntax # Ps ORNATE LEFT PARENTHESIS +FD3F ; Pattern_Syntax # Pe ORNATE RIGHT PARENTHESIS +FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT + +# Total code points: 2760 + +# EOF diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java --- a/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,3 @@ - /* * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,6 +33,7 @@ import java.io.BufferedWriter; import java.io.FileWriter; import java.io.File; +import java.util.List; import build.tools.generatecharacter.CharacterName; @@ -68,18 +68,17 @@ final static boolean DEBUG = false; - final static int MAX_UNICODE_VALUE = 0xFFFF; final static String commandMarker = "$$"; static String ROOT = ""; static String DefaultUnicodeSpecFileName = ROOT + "UnicodeData.txt"; static String DefaultSpecialCasingFileName = ROOT + "SpecialCasing.txt"; + static String DefaultPropListFileName = ROOT + "PropList.txt"; static String DefaultJavaTemplateFileName = ROOT + "Character.java.template"; static String DefaultJavaOutputFileName = ROOT + "Character.java"; static String DefaultCTemplateFileName = ROOT + "Character.c.template"; static String DefaultCOutputFileName = ROOT + "Character.c"; - static String CharacterDataClassName = "CharacterData"; - static int plane = 0; + static int plane = 0; /* The overall idea is that, in the generated Character class source code, most character property data is stored in a special multi-level table whose @@ -105,7 +104,11 @@ entries are short rather than byte). */ - /* The character properties are currently encoded into 32 bits in the following manner: + /* The character properties are currently encoded into A (32 bits)and B (16 bits) + two parts. + + A: the low 32 bits are defined in the following manner: + 1 bit Mirrored property. 4 bits Bidirectional category (see below) (unused if -nobidi switch specified) 9 bits A signed offset used for converting case . @@ -148,6 +151,14 @@ will produce the desired numeric value. 5 bits The digit offset (see description of previous field) 5 bits Character type (see below) + + B: the high 16 bits are defined as: + 1 bit Other_Lowercase property + 1 bit Other_Uppercase property + 1 bit Other_Alphabetic property + 1 bit Other_Math property + 1 bit Ideographic property + 1 bit Noncharacter codepoint property */ @@ -173,9 +184,22 @@ // case offset are 9 bits maskCase = 0x01FF, shiftBidi = 27, maskBidi = 0x78000000, - shiftMirrored = 31, maskMirrored = 0x80000000, + shiftMirrored = 31, //maskMirrored = 0x80000000, shiftPlane = 16, maskPlane = 0xFF0000; + // maskMirrored needs to be long, if up 16-bit + private static final long maskMirrored = 0x80000000L; + + // bit masks identify the 16-bit priperty field described above, in B + // table + private static final long + maskOtherLowercase = 0x100000000L, + maskOtherUppercase = 0x200000000L, + maskOtherAlphabetic = 0x400000000L, + maskOtherMath = 0x800000000L, + maskIdeographic = 0x1000000000L, + maskNoncharacterCP = 0x2000000000L; + // Can compare masked values with these to determine // numeric or lexical types. public static int @@ -258,7 +282,7 @@ * The specification file is assumed to contain its data in sorted order by * character code; as a result, the array passed as an argument to this method * has its components in the same sorted order, with one entry for each defined - * Unicode character or character range. (A range is indicated by two consecutive + * Unicode character or character range. (A range is indicated by two consecutive * entries, such that the name of the first entry begins with "<" and ends with * "First>" and the second entry begins with "<" and ends with "Last>".) This is * therefore a sparse representation of the character property data. @@ -282,7 +306,8 @@ * @see GenerateCharacter#buildOne */ - static long[] buildMap(UnicodeSpec[] data, SpecialCaseMap[] specialMaps) { + static long[] buildMap(UnicodeSpec[] data, SpecialCaseMap[] specialMaps, PropList propList) + { long[] result; if (bLatin1 == true) { result = new long[256]; @@ -290,13 +315,13 @@ result = new long[1<<16]; } int k=0; - int codePoint = plane<<16; + int codePoint = plane<<16; UnicodeSpec nonCharSpec = new UnicodeSpec(); for (int j = 0; j < data.length && k < result.length; j++) { if (data[j].codePoint == codePoint) { result[k] = buildOne(codePoint, data[j], specialMaps); ++k; - ++codePoint; + ++codePoint; } else if(data[j].codePoint > codePoint) { if (data[j].name.endsWith("Last>")) { @@ -304,7 +329,7 @@ while (codePoint < data[j].codePoint && k < result.length) { result[k] = buildOne(codePoint, data[j], specialMaps); ++k; - ++codePoint; + ++codePoint; } } else { @@ -312,15 +337,14 @@ while (codePoint < data[j].codePoint && k < result.length) { result[k] = buildOne(codePoint, nonCharSpec, specialMaps); ++k; - ++codePoint; + ++codePoint; } } k = data[j].codePoint & 0xFFFF; - codePoint = data[j].codePoint; + codePoint = data[j].codePoint; result[k] = buildOne(codePoint, data[j], specialMaps); ++k; - ++codePoint; - + ++codePoint; } else { System.out.println("An error has occured during spec mapping."); @@ -333,8 +357,17 @@ while (k < result.length) { result[k] = buildOne(codePoint, nonCharSpec, specialMaps); ++k; - ++codePoint; + ++codePoint; } + // now add all extra supported properties from PropList, to the + // upper 16-bit + addExProp(result, propList, "Other_Lowercase", maskOtherLowercase); + addExProp(result, propList, "Other_Uppercase", maskOtherUppercase); + addExProp(result, propList, "Other_Alphabetic", maskOtherAlphabetic); + addExProp(result, propList, "Ideographic", maskIdeographic); + //addExProp(result, propList, "Other_Math", maskOtherMath); + //addExProp(result, propList, "Noncharacter_CodePoint", maskNoncharacterCP); + return result; } @@ -381,15 +414,15 @@ // record the general category resultA |= us.generalCategory; - // record the numeric properties - NUMERIC: { + // record the numeric properties + NUMERIC: { STRANGE: { int val = 0; - // c is A-Z + // c is A-Z if ((c >= 0x0041) && (c <= 0x005A)) { val = c - 0x0041; resultA |= valueJavaSupradecimal; - // c is a-z + // c is a-z } else if ((c >= 0x0061) && (c <= 0x007A)) { val = c - 0x0061; resultA |= valueJavaSupradecimal; @@ -428,7 +461,7 @@ resultA |= valueStrangeNumeric; } // end NUMERIC - // record case mapping + // record case mapping int offset = 0; // might have a 1:M mapping int specialMap = SpecialCaseMap.find(c, specialCaseMaps); @@ -458,12 +491,12 @@ } } if ((us.hasTitleMap() && us.titleMap != us.upperMap) || - (bHasUpper && us.hasLowerMap())) { + (bHasUpper && us.hasLowerMap())) { resultA |= maskTitleCase; } if (bHasUpper && !us.hasLowerMap() && !us.hasTitleMap() && verbose) { - System.out.println("Warning: Character " + hex4(c) + " has upper but " + - "no title case; Java won't know this"); + System.out.println("Warning: Character " + hex4(c) + " has upper but " + + "no title case; Java won't know this"); } if (offset < minOffsetSeen) minOffsetSeen = offset; if (offset > maxOffsetSeen) maxOffsetSeen = offset; @@ -475,8 +508,7 @@ } resultA |= ((offset & maskCase) << shiftCaseOffset); - - // record lexical info about this character + // record lexical info about this character if (us.generalCategory == UnicodeSpec.LOWERCASE_LETTER || us.generalCategory == UnicodeSpec.UPPERCASE_LETTER || us.generalCategory == UnicodeSpec.TITLECASE_LETTER @@ -539,6 +571,16 @@ return resultA; } + static void addExProp(long[] map, PropList propList, String prop, long mask) { + List cps = propList.codepoints(prop); + if (cps != null) { + for (Integer cp : cps) { + if (cp < map.length) + map[cp] |= mask; + } + } + } + /** * This is the heart of the table compression strategy. The inputs are a map * and a number of bits (size). The map is simply an array of long integer values; @@ -645,8 +687,8 @@ */ static void generateCharacterClass(String theTemplateFileName, - String theOutputFileName) - throws FileNotFoundException, IOException { + String theOutputFileName) + throws FileNotFoundException, IOException { BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName))); out.println(commentStart + @@ -719,6 +761,9 @@ if (x.length() >= 9 && x.substring(0, 7).equals("Lookup(") && x.substring(x.length()-1).equals(")") ) return genAccess("A", x.substring(7, x.length()-1), (identifiers ? 2 : 32)); + if (x.length() >= 11 && x.substring(0, 9).equals("LookupEx(") && + x.substring(x.length()-1).equals(")") ) + return genAccess("B", x.substring(9, x.length()-1), 16); if (x.equals("shiftType")) return Long.toString(shiftType); if (x.equals("shiftIdentifierInfo")) return Long.toString(shiftIdentifierInfo); if (x.equals("maskIdentifierInfo")) return "0x" + hex8(maskIdentifierInfo); @@ -731,6 +776,10 @@ if (x.equals("maskLowerCase")) return "0x" + hex8(maskLowerCase); if (x.equals("maskUpperCase")) return "0x" + hex8(maskUpperCase); if (x.equals("maskTitleCase")) return "0x" + hex8(maskTitleCase); + if (x.equals("maskOtherLowercase")) return "0x" + hex4(maskOtherLowercase >> 32); + if (x.equals("maskOtherUppercase")) return "0x" + hex4(maskOtherUppercase >> 32); + if (x.equals("maskOtherAlphabetic")) return "0x" + hex4(maskOtherAlphabetic >> 32); + if (x.equals("maskIdeographic")) return "0x" + hex4(maskIdeographic >> 32); if (x.equals("valueIgnorable")) return "0x" + hex8(valueIgnorable); if (x.equals("valueJavaUnicodeStart")) return "0x" + hex8(valueJavaUnicodeStart); if (x.equals("valueJavaOnlyStart")) return "0x" + hex8(valueJavaOnlyStart); @@ -899,7 +948,7 @@ // If we ever need more than 32 bits to represent the character properties, // then a table "B" may be needed as well. - // genTable(result, "B", tables[n - 1], 32, 16, sizes[n - 1], false, 0, true, true, false); + genTable(result, "B", tables[n - 1], 32, 16, sizes[n - 1], false, 0, true, true, false); totalBytes += ((((tables[n - 1].length * (identifiers ? 2 : 32)) + 31) >> 5) << 2); result.append(commentStart); @@ -1080,9 +1129,9 @@ */ static void genTable(StringBuffer result, String name, - long[] table, int extract, int bits, int size, - boolean preshifted, int shift, boolean hexFormat, - boolean properties, boolean hexComment) { + long[] table, int extract, int bits, int size, + boolean preshifted, int shift, boolean hexFormat, + boolean properties, boolean hexComment) { String atype = bits == 1 ? (Csyntax ? "unsigned long" : "int") : bits == 2 ? (Csyntax ? "unsigned long" : "int") : @@ -1137,7 +1186,12 @@ char ch = '\u0000'; int charsPerEntry = -entriesPerChar; for (int j=0; j> extract; + //long entry = table[j] >> extract; + long entry; + if ("A".equals(name)) + entry = (table[j] & 0xffffffffL) >> extract; + else + entry = (table[j] >> extract); if (shiftEntries) entry <<= shift; if (entry >= (1L << bits)) { FAIL("Entry too big"); @@ -1549,6 +1603,7 @@ static String OutputFileName = null; static String UnicodeSpecFileName = null; // liu static String SpecialCasingFileName = null; + static String PropListFileName = null; static boolean useCharForByte = false; static int[] sizes; static int bins = 0; // liu; if > 0, then perform search @@ -1668,20 +1723,28 @@ SpecialCasingFileName = args[++j]; } } - else if (args[j].equals("-plane")) { - if (j == args.length -1) { - FAIL("Plane number missing after -plane"); - } - else { - plane = Integer.parseInt(args[++j]); - } - if (plane > 0) { - bLatin1 = false; - } - } - else if ("-usecharforbyte".equals(args[j])) { - useCharForByte = true; - } + else if (args[j].equals("-proplist")) { + if (j == args.length -1) { + FAIL("File name missing after -proplist"); + } + else { + PropListFileName = args[++j]; + } + } + else if (args[j].equals("-plane")) { + if (j == args.length -1) { + FAIL("Plane number missing after -plane"); + } + else { + plane = Integer.parseInt(args[++j]); + } + if (plane > 0) { + bLatin1 = false; + } + } + else if ("-usecharforbyte".equals(args[j])) { + useCharForByte = true; + } else if (args[j].equals("-latin1")) { bLatin1 = true; plane = 0; @@ -1728,6 +1791,10 @@ SpecialCasingFileName = DefaultSpecialCasingFileName; desc.append(" [-specialcasing " + SpecialCasingFileName + ']'); } + if (PropListFileName == null) { + PropListFileName = DefaultPropListFileName; + desc.append(" [-proplist " + PropListFileName + ']'); + } if (TemplateFileName == null) { TemplateFileName = (Csyntax ? DefaultCTemplateFileName : DefaultJavaTemplateFileName); @@ -1877,12 +1944,13 @@ try { UnicodeSpec[] data = UnicodeSpec.readSpecFile(new File(UnicodeSpecFileName), plane); + specialCaseMaps = SpecialCaseMap.readSpecFile(new File(SpecialCasingFileName), plane); + PropList propList = PropList.readSpecFile(new File(PropListFileName), plane); - specialCaseMaps = SpecialCaseMap.readSpecFile(new File(SpecialCasingFileName), plane); if (verbose) { System.out.println(data.length + " items read from Unicode spec file " + UnicodeSpecFileName); // liu } - long[] map = buildMap(data, specialCaseMaps); + long[] map = buildMap(data, specialCaseMaps, propList); if (verbose) { System.err.println("Completed building of initial map"); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/make/tools/src/build/tools/generatecharacter/PropList.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/make/tools/src/build/tools/generatecharacter/PropList.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package build.tools.generatecharacter; + +import java.util.regex.*; +import java.util.*; +import java.io.*; + +/** + * A PropList object contains the lists of code points that have + * the same Unicode property defined in PropList.txt + * + * @author Xueming Shen + */ +public class PropList { + + public static PropList readSpecFile(File file, int plane) + throws IOException + { + return new PropList(file, plane); + } + + public List codepoints(String name) { + return propMap.get(name); + } + + public Set names() { + return propMap.keySet(); + } + + private Map> propMap = + new LinkedHashMap>(); + + private PropList(File file, int plane) throws IOException { + + int i, j; + BufferedReader sbfr = new BufferedReader(new FileReader(file)); + Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher(""); + String line = null; + int lineNo = 0; + while ((line = sbfr.readLine()) != null) { + lineNo++; + if (line.length() <= 1 || line.charAt(0) == '#') { + continue; + } + m.reset(line); + if (m.matches()) { + int start = Integer.parseInt(m.group(1), 16); + if ((start >> 16) != plane) + continue; + int end = (m.group(2)==null)?start + :Integer.parseInt(m.group(2), 16); + String name = m.group(3); + + start &= 0xffff; + end &= 0xffff; + + ArrayList list = propMap.get(name); + if (list == null) { + list = new ArrayList(); + propMap.put(name, list); + } + while (start <= end) + list.add(start++); + } else { + System.out.printf("Warning: Unrecognized line %d <%s>%n", lineNo, line); + } + } + sbfr.close(); + + //for (String name: propMap.keySet()) { + // System.out.printf("%s %d%n", name, propMap.get(name).size()); + //} + } + + public static void main(String[] args) throws IOException { + readSpecFile(new File(args[0]), Integer.decode(args[1])); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/appletviewer.1 --- a/jdk/src/linux/doc/man/appletviewer.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/appletviewer.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,44 +19,34 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH appletviewer 1 "02 Jun 2010" +.TH appletviewer 1 "10 May 2011" .LP .SH "Name" appletviewer \- The Java Applet Viewer. .LP -.RS 3 - -.LP .LP The \f3appletviewer\fP command allows you to run applets outside of a web browser. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .LP \f4appletviewer\fP \f2[\fP \f2options\fP \f2] \fP\f2urls\fP ... .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3appletviewer\fP command connects to the documents or resources designated by \f2urls\fP and displays each applet referenced by the documents in its own window. Note: if the documents referred to by \f2urls\fP do not reference any applets with the \f2OBJECT\fP, \f2EMBED\fP, or \f2APPLET\fP tag, then \f3appletviewer\fP does nothing. For details on the HTML tags that \f3appletviewer\fP supports, see .na \f2AppletViewer Tags\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/appletviewertags.html. +http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html. .LP .LP \f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-debug diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/apt.1 --- a/jdk/src/linux/doc/man/apt.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/apt.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH apt 1 "02 Jun 2010" +.TH apt 1 "10 May 2011" .LP .SH "NAME" @@ -50,21 +50,17 @@ .SH "DESCRIPTION" .LP .LP -The tool \f2apt\fP, annotation processing tool, includes a set of new reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. +\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. +.LP +.LP +The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. .LP .LP A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in .na \f4Getting Started with \fP\f4apt\fP. @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html -.LP -.RS 3 -.TP 3 -Note: -\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac(1)\fP tool and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool. -.RE - +http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html .LP .SH "OPTIONS" .LP @@ -90,6 +86,12 @@ .TP 3 \-factory classname Name of annotation processor factory to use; bypasses default discovery process +.TP 3 +\-version +Print version information. +.TP 3 +\-X +Display information about non\-standard options. .RE .LP @@ -109,10 +111,35 @@ .LP Consult the javac(1) man page for information on \f2javac\fP options. .LP +.SS +Non\-Standard Options +.LP +.RS 3 +.TP 3 +\-XListAnnotationTypes +List found annotation types. +.TP 3 +\-XListDeclarations +List specified and included declarations. +.TP 3 +\-XPrintAptRounds +Print information about initial and recursive \f2apt\fP rounds. +.TP 3 +\-XPrintFactoryInfo +Print information about which annotations a factory is asked to process. +.TP 3 +\-XclassesAsDecls +Treat both class and source files as declarations to process. +.RE + +.LP +.LP +\f3Note\fP: Because these options are non\-standard, they are subject to change without notice. +.LP .SH "NOTES" .LP .LP -The functionality of \f2apt\fP has been subsumed by the standard annotation\-processing infrastructure now offered by \f2javac\fP. Support for \f2apt\fP and its associated APIs may be discontinued in some future JDK release. +The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. .LP .SH "SEE ALSO" .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/extcheck.1 --- a/jdk/src/linux/doc/man/extcheck.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/extcheck.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH extcheck 1 "02 Jun 2010" +.TH extcheck 1 "10 May 2011" .LP .SH "Name" extcheck \- A utility to detect jar conflicts .LP -.RS 3 - -.LP .LP \f3extcheck\fP detects version conflicts between a target jar file and currently installed extension jar files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3extcheck\fP utility checks a specified Jar file for title and version conflicts with any extensions installed in the Java(TM) SDK. Before installing an extension, you can use this utility to see if the same or a more recent version of the extension is already installed. .LP @@ -63,8 +55,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-verbose @@ -77,8 +67,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP jar(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/idlj.1 --- a/jdk/src/linux/doc/man/idlj.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/idlj.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH idlj 1 "02 Jun 2010" +.TH idlj 1 "10 May 2011" .LP .SH "Name" idlj \- The IDL\-to\-Java Compiler .LP -.RS 3 - -.LP -\f3idlj\fP generates Java bindings from a given IDL file. -.RE +\f3idlj\fP generates Java bindings from a given IDL file. .SH "Synopsis" .LP - -.LP .nf \f3 .fl @@ -48,28 +42,62 @@ .LP .SH "Description" .LP - .LP The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the .na \f2OMG IDL to Java Language Language Mapping Specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP. +.LP .SS Emitting Client and Server Bindings .LP -.RS 3 +.LP +To generate Java bindings for an IDL file named My.idl: +.LP +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +This generates the client\-side bindings and is equivalent to: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-fclient\fP My.idl +.fl +.fi .LP -To generate Java bindings for an IDL file named My.idl: \f2idlj My.idl\fP +.LP +The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: .LP -This generates the client\-side bindings and is equivalent to: \f2idlj \fP\f4\-fclient\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fserver\fP My.idl +.fl +.fi + +.LP .LP -The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: \f2idlj \fP\f4\-fserver\fP\f2 My.idl\fP +Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: .LP -Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: \f2idlj \fP\f4\-fclient \-fserver\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fclient \-fserver\fP My.idl +.fl +idlj \f3\-fall\fP My.idl +.fl +.fi + .LP .LP There are two possible server\-side models: the Inheritance Model and the Tie Delegation Model. @@ -82,31 +110,47 @@ .na \f2org.omg.PortableServer.Servant\fP @ .fi -http://java.sun.com/javase/6/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements. +http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements. .LP .LP The \f2PortableServer\fP module for the .na \f2Portable Object Adapter (POA)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. .LP .LP Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible: .LP -\f2idlj \fP\f4\-fclient \-fserver\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fall\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fclient \-fserver\fP \f3\-oldImplBase\fP My.idl +.fl +idlj \f3\-fall\fP \f3\-oldImplBase\fP My.idl +.fl +.fi + .LP -Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP. +.LP +Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP. +.LP .LP The other server\-side model is called the Tie Model. This is a delegation model. Because it is not possible to generate ties and skeletons at the same time, they must be generated separately. The following commands generate the bindings for the Tie Model: .LP -\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fallTIE\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fall\fP My.idl +.fl +idlj \f3\-fallTIE\fP My.idl +.fl +.fi + .LP -For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance: +.LP +For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance: +.LP .nf \f3 .fl @@ -144,13 +188,21 @@ .fi .LP -You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method. +.LP +You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method. +.LP .LP To generate server\-side, Tie model bindings that are compatible with versions of the IDL to Java language mapping in versions prior to J2SE 1.4. .LP -\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fall\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fallTIE\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-oldImplBase\fP \f3\-fall\fP My.idl +.fl +idlj \f3\-oldImplBase\fP \f3\-fallTIE\fP My.idl +.fl +.fi + .LP .LP For the interface \f2My\fP, this will generate \f2My_Tie.java\fP. The constructor to \f2My_Tie\fP takes a \f2impl\fP. You must provide the implementation for \f2impl\fP, but it does not have to inherit from any other class, only the interface \f2HelloOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2My_Tie\fP. For instance: @@ -184,201 +236,383 @@ .fi .LP -.RE .SS Specifying Alternate Locations for Emitted Files .LP -.RS 3 +.LP +If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-td /altdir\fP My.idl +.fl +.fi .LP -If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as: -.RS 3 - .LP -\f2idlj \fP\f4\-td /altdir\fP\f2 My.idl\fP -.RE For the interface \f2My\fP, the bindings will be emitted to \f2/altdir/My.java\fP, etc., instead of \f2./My.java\fP. -.RE +.LP .SS Specifying Alternate Locations for Include Files .LP -.RS 3 +.LP +If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-i /includes\fP My.idl +.fl +.fi .LP -If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes\fP\f2 My.idl\fP +.LP +If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-i /includes \-i /moreIncludes\fP My.idl +.fl +.fi + +.LP .LP -If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes \-i /moreIncludes\fP\f2 My.idl\fP +Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: .LP -Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: \f2includes=/includes;/moreIncludes\fP +.nf +\f3 +.fl +includes=/includes;/moreIncludes +.fl +\fP +.fi + +.LP .LP The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the .na \f2Setting the Classpath\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general. -.RE +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general. +.LP .SS Emitting Bindings for Include Files .LP -.RS 3 +.LP +By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: +.LP + +.LP +.LP +\f4My.idl\fP +.LP +.nf +\f3 +.fl +#include +.fl +interface My +.fl +{ +.fl +}; +.fl +\fP +.fi + +.LP + +.LP +.LP +\f4MyOther.idl\fP +.LP +.nf +\f3 +.fl +interface MyOther +.fl +{ +.fl +}; +.fl +\fP +.fi + +.LP + +.LP +.LP +The following command will only generate the java bindings for \f2My\fP: +.LP +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-emitAll\fP My.idl +.fl +.fi + +.LP +.LP +There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: +.LP .LP -By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: \f4My.idl\fP +.LP +\f4My.idl\fP .LP -\f2#include \fP -.br -\f2interface My\fP -.br -\f2{\fP -.br -\f2};\fP -.br -\f4MyOther.idl\fP +.nf +\f3 +.fl +#include +.fl +interface My +.fl +{ +.fl + #include +.fl +}; +.fl +\fP +.fi + .LP -\f2interface MyOther\fP -.br -\f2{\fP -.br -\f2};\fP\ + +.LP +.LP +\f4MyOther.idl\fP .LP -The following command will only generate the java bindings for \f2My\fP: \f2idlj My.idl\fP +.nf +\f3 +.fl +interface MyOther +.fl +{ +.fl +}; +.fl +\fP +.fi + .LP -To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: \f2idlj \fP\f4\-emitAll\fP\f2 My.idl\fP + .LP -There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: \f4My.idl\fP +.LP +\f4Embedded.idl\fP .LP -\f2#include \fP -.br -\f2interface My\fP -.br -\f2{\fP -.br -\f2\ #include \fP -.br -\f2};\ \fP \f4MyOther.idl\fP +.nf +\f3 +.fl +enum E {one, two, three}; +.fl +\fP +.fi + +.LP + +.LP .LP -\f2interface MyOther\fP -.br -\f2{\fP -.br -\f2};\ \fP \f4Embedded.idl\fP +Running the following command: .LP -\f2enum E {one, two, three};\fP\ +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +will generate the following list of Java files: .LP -Running the following command: \f2idlj My.idl\fP +.nf +\f3 +.fl +./MyHolder.java +.fl +./MyHelper.java +.fl +./_MyStub.java +.fl +./MyPackage +.fl +./MyPackage/EHolder.java +.fl +./MyPackage/EHelper.java +.fl +./MyPackage/E.java +.fl +./My.java +.fl +\fP +.fi + .LP -will generate the following list of Java files: \f2./MyHolder.java\fP -.br -\f2./MyHelper.java\fP -.br -\f2./_MyStub.java\fP -.br -\f2./MyPackage\fP -.br -\f2./MyPackage/EHolder.java\fP -.br -\f2./MyPackage/EHelper.java\fP -.br -\f2./MyPackage/E.java\fP -.br -\f2./My.java\fP .LP -Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP). +Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP). +.LP .LP If the \f2\-emitAll\fP flag had been used in the previous example, then all types in all included files would be emitted. .LP -.RE .SS Inserting Package Prefixes .LP -.RS 3 +.LP +Suppose that you work for a company named ABC that has constructed the following IDL file: +.LP .LP -Suppose that you work for a company named ABC that has constructed the following IDL file: -.br -\f4Widgets.idl\fP +.LP +\f4Widgets.idl\fP .LP -\f2module Widgets\fP -.br -\f2{\fP -.br -\f2\ interface W1 {...};\fP -.br -\f2\ interface W2 {...};\fP -.br -\f2};\fP\ +.nf +\f3 +.fl +module Widgets +.fl +{ +.fl + interface W1 {...}; +.fl + interface W2 {...}; +.fl +}; +.fl +\fP +.fi + .LP -Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: \f2idlj \fP\f4\-pkgPrefix Widgets com.abc\fP\f2 Widgets.idl\fP + +.LP +.LP +Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: .LP -If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package. +.nf +\f3 +.fl +idlj \fP\f3\-pkgPrefix Widgets com.abc\fP Widgets.idl +.fl +.fi + +.LP +.LP +If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package. +.LP .LP If you have a number of these packages that require prefixes, it might be easier to place them into the \f2idl.config\fP file described above. Each package prefix line should be of the form: .LP -\f2PkgPrefix.=\fP +.nf +\f3 +.fl +PkgPrefix.= +.fl +\fP +.fi + .LP -So the line for the above example would be: \f2PkgPrefix.Widgets=com.abc\fP +So the line for the above example would be: +.nf +\f3 +.fl +PkgPrefix.Widgets=com.abc +.fl +\fP +.fi + .LP .LP The use of this option does not affect the Repository ID. .LP -.RE .SS Defining Symbols Before Compilation .LP -.RS 3 +.LP +You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command +.LP +.nf +\f3 +.fl +idlj \fP\f3\-d\fP MYDEF My.idl +.fl +.fi .LP -You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command \f2idlj \fP\f4\-d\fP\f2 MYDEF My.idl\fP .LP is the equivalent of putting the line \f2#define MYDEF\fP inside \f2My.idl\fP. -.RE +.LP .SS Preserving Pre\-Existing Bindings .LP -.RS 3 +.LP +If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command +.LP +.nf +\f3 +.fl +idlj \fP\f3\-keep\fP My.idl +.fl +.fi .LP -If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command \f2idlj \fP\f4\-keep\fP\f2 My.idl\fP .LP -emit all client\-side bindings that do not already exist. -.RE +emits all client\-side bindings that do not already exist. +.LP .SS Viewing Progress of Compilation .LP -.RS 3 +.LP +The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-v\fP My.idl +.fl +.fi .LP -The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: \f2idlj \fP\f4\-v\fP\f2 My.idl\fP .LP By default the compiler does not operate in verbose mode. -.RE +.LP .SS Displaying Version Information .LP -.RS 3 - -.LP .LP To display the build version of the IDL\-to\-Java compiler, specify the \f2\-version\fP option on the command\-line: .LP -.LP -\f2idlj \-version\fP +.nf +\f3 +.fl +idlj \-version +.fl +\fP +.fi + .LP .LP Version information also appears within the bindings generated by the compiler. Any additional options appearing on the command\-line are ignored. .LP -.RE .SH "Options" .LP - -.LP .RS 3 .TP 3 \-d symbol This is equivalent to the following line in an IDL file: -.RS 3 - -.LP .nf \f3 .fl @@ -386,7 +620,6 @@ .fl \fP .fi -.RE .TP 3 \-emitAll Emit all types, including those found in \f2#include\fP files. @@ -410,8 +643,9 @@ Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module. .TP 3 \-pkgTranslate type package -Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly. -.LP +Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly. +.br +.br If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include: .nf \f3 @@ -420,7 +654,6 @@ .fl \fP .fi -.LP The following translations would occur: .nf \f3 @@ -435,7 +668,6 @@ .fl \fP .fi -.LP The following package names cannot be translated: .RS 3 .TP 2 @@ -445,8 +677,7 @@ o \f2org.omg\fP or any subpackages of \f2org.omg\fP .RE -.LP -Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. +Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. .TP 3 \-skeletonName xxx%yyy Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are: @@ -481,11 +712,11 @@ .RE .LP -See the Description section for more option information. +.LP +See the Description section for more option information. +.LP .SH "Restrictions:" .LP - -.LP .RS 3 .TP 2 o @@ -498,8 +729,6 @@ .LP .SH "Known Problems:" .LP - -.LP .RS 3 .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/appletviewer.1 --- a/jdk/src/linux/doc/man/ja/appletviewer.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/appletviewer.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH appletviewer 1 "14 Apr 2011" +.TH appletviewer 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/apt.1 --- a/jdk/src/linux/doc/man/ja/apt.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/apt.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH apt 1 "14 Apr 2011" +.TH apt 1 "07 May 2011" .LP .SH "NAME" @@ -50,7 +50,10 @@ .SH "��" .LP .LP -��ġ�� \f2apt\fP �ϡ��ե쥯�� API �ȥ��ݡ��ȥ��ե饹�ȥ饯��㡼��鹽��졢�ץ��ޤ��\f2apt\fP ��ե쥯�� API �ϡ� ��ۻ��Υ��١��ǡ��ץ��๽¤�˴ؤ��ɤ߼��ѥӥ塼��󶡤��ޤ��Υ�ե쥯�� API �ϡ��Τ��ɲä��ˡ�Java(TM) �ץ��ߥ󥰸��η��ƥ��ǥ벽��褦��߷פ��Ƥ��ޤ��ǽ�ˡ�\f2apt\fP �ϡ��ɤ�¾�Υե��ץ��å��¹Ԥ��ޤ��ˡ�\f2apt\fP �ϡ��Υ��ե��ե��ξ��򥳥�ѥ��뤹�뤿�ᡢ��ȯ��ڤˤʤ�ޤ��ġ��ȤΥ��󥿥ե��˻��Ѥ��ե쥯�� API �ʤɤ� API �ϡ�\f2com.sun.mirror\fP �Υ��֥ѥå��Ǥ�� +\f3��\fP: \f2apt\fP �ġ��ȡ��ѥå�� \f2com.sun.mirror\fP �˴ޤޤ�Ƥ��뤽��˴�Ϣ�� API �ϡ�JDK 7 �ʹ��侩�ˤʤäƤ��ꡢJDK �μ��Υ᥸�㡼��꡼��Ǻ��ͽ��Ǥ��\f2javac(1)\fP �ġ��Ѳ�ǽ�ʥ��ץ��ȡ��ѥå�� \f2javax.annotation.processing\fP �� \f2javax.lang.model\fP �˴ޤޤ�Ƥ�� API ��Ѥ��ơ��Ƥ�� +.LP +.LP +��ġ�� \f2apt\fP �ϡ��ե쥯�� API �ȥ��ݡ��ȥ��ե饹�ȥ饯��㡼��鹽��졢�ץ��ޤ��\f2apt\fP ��ե쥯�� API �ϡ� ��ۻ��Υ��١��ǡ��ץ��๽¤�˴ؤ��ɤ߼��ѥӥ塼��󶡤��ޤ��Υ�ե쥯�� API �ϡ��Τ��ɲä��ˡ�Java(TM) �ץ��ߥ󥰸��η��ƥ��ǥ벽��褦��߷פ��Ƥ��ޤ��ǽ�ˡ�\f2apt\fP �ϡ��ɤ�¾�Υե��ץ��å��¹Ԥ��ޤ��ˡ�\f2apt\fP �ϡ��Υ��ե��ե��ξ��򥳥�ѥ��뤹�뤿�ᡢ��ȯ��ڤˤʤ�ޤ��ġ��ȤΥ��󥿥ե��˻��Ѥ��ե쥯�� API �ʤɤ� API �ϡ�\f2com.sun.mirror\fP �Υ��֥ѥå��Ǥ�� .LP .LP �ġ��ε�ǽ�˴ؤ��ܺ٤ȡ�\f2apt\fP ��Ѥ��ȯ��ˡ�ˤĤ��Ƥϡ� @@ -59,13 +62,6 @@ .fi http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html�򻲾Ȥ��Ƥ�� .LP -.RS 3 -.TP 3 -��: -\f2apt\fP �ε�ǽ�ϡ�\f2javac(1)\fP �ġ��ΰ��Ȥʤä��ե饹�ȥ饯��㡼��Ȥ߹��ޤ졢��٤Ƥ� Java ��ѥ��ǻ��ѤǤ��褦��ɸ�ಽ��ޤ��ο��ե饹�ȥ饯��㡼�ϡ��ǥ뤪�� Java �ץ�åȥե��ΰ��Ȥʤä�� API �˰�¸��ޤ��ץ��å��γ�ȯ�ϡ�� API �� \f2javac\fP �ġ��˴�Ť��ƹԤ��褦��ᤷ�ޤ�� -.RE - -.LP .SH "��ץ��" .LP .SS @@ -143,7 +139,7 @@ .SH "��" .LP .LP -\f2apt\fP �ε�ǽ�ϡ�\f2javac\fP �ˤ��󶡤��ɸ��ե饹�ȥ饯��㡼��Ȥ߹��ޤ�ޤ�� JDK ��꡼��Ǥϡ�\f2apt\fP ��Ӵ�Ϣ�� API �Υ��ݡ��Ȥ��ߤ��ǽ��ޤ�� +\f2apt\fP �ġ��ȡ��ѥå�� \f2com.sun.mirror\fP �˴ޤޤ�Ƥ��뤽��˴�Ϣ�� API �ϡ�JDK 7 �ʹ��侩�ˤʤäƤ��ꡢJDK �μ��Υ᥸�㡼��꡼��Ǻ��ͽ��Ǥ��\f2javac(1)\fP �ġ��Ѳ�ǽ�ʥ��ץ��ȡ��ѥå�� \f2javax.annotation.processing\fP �� \f2javax.lang.model\fP �˴ޤޤ�Ƥ�� API ��Ѥ��ơ��Ƥ�� .LP .SH "��Ϣ��" .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/extcheck.1 --- a/jdk/src/linux/doc/man/ja/extcheck.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/extcheck.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH extcheck 1 "14 Apr 2011" +.TH extcheck 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/idlj.1 --- a/jdk/src/linux/doc/man/ja/idlj.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/idlj.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH idlj 1 "14 Apr 2011" +.TH idlj 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jar.1 --- a/jdk/src/linux/doc/man/ja/jar.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jar.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jar 1 "14 Apr 2011" +.TH jar 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jarsigner.1 --- a/jdk/src/linux/doc/man/ja/jarsigner.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jarsigner.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jarsigner 1 "14 Apr 2011" +.TH jarsigner 1 "07 May 2011" .LP .SH "̾��" @@ -110,16 +110,16 @@ .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<��ȥ��Υѥ����>\fP\f3 .fl - \-keypass dukekeypasswd MyJARFile.jar duke + \-keypass \fP\f4<��Υѥ����>\fP\f3 MyJARFile.jar duke .fl \fP .fi .LP .LP -��ȥ��ϥѥ���ɤ��ݸ��Ƥ��Τǡ��ȥ��Υѥ���� (��Ǥ� mypass) ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤǥ��ȥ��Υѥ���ɤ��ꤷ�ʤ��ȡ��ѥ���ɤ��Ϥ��ޤ��Ʊ�ͤˡ��⥭��ȥ��ǥѥ���ɤˤ�ä��ݸ��Ƥ��뤿�ᡢ��Υѥ���� (��Ǥ� dukekeypasswd) ��ꤹ��ɬ�פ��ޤ�� ޥ�ɹԤ��Υѥ���ɤ��ꤷ�Ƥ��ʤ��ޤ��ꤷ��ѥ���Ȥ��¸��Ƥ��ѥ���ɤȰ�äƤ��ˤϡ��Υѥ���ɤ��Ϥ��ޤ�� +��ȥ��ϥѥ���ɤ��ݸ��Ƥ��Τǡ��ȥ��Υѥ���ɤ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤǥ��ȥ��Υѥ���ɤ��ꤷ�ʤ��ȡ��ѥ���ɤ��Ϥ��ޤ��Ʊ�ͤˡ��⥭��ȥ��ǥѥ���ɤˤ�ä��ݸ��Ƥ��뤿�ᡢ��Υѥ���ɤ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤ��Υѥ���ɤ��ꤷ�Ƥ��ʤ��ޤ��ꤷ��ѥ���Ȥ��¸��Ƥ��ѥ���ɤȰ�äƤ��ˤϡ��Υѥ���ɤ��Ϥ��ޤ�� .LP .SS ��ȥ��ξ�� @@ -500,7 +500,7 @@ .LP \f2file\fP �˻��ѤǤ��ʸ��ϡ�a\-zA\-Z0\-9_\-�פǤ��Ĥޤꡢʸ��ӥϥ��ե��ѤǤ��ޤ��: .SF �� .DSA �Υե��̾�Ǥϡ��ʸ��Ϥ��٤��ʸ��Ѵ��ޤ�� .LP -\-sigfile \f2��ץ��\fP ��ꤷ�ʤ��ä��硢.SF �ե�� .DSA �ե��Υ١��ե��̾�ϡ��ޥ�ɹԤǻ��ꤵ�줿��̾��Ƭ�� 8 ʸ��򤹤٤��ʸ��Ѵ��Τˤʤ�ޤ��̾�� 8 ʸ��̤��ξ��ϡ��̾��Τޤ޻Ȥ��ޤ��̾��ˡ��̾�ե��̾�˻��ѤǤ��ʤ�ʸ��ޤޤ�Ƥ��ϡ��ʸ�� (_) ��֤��ƥե��̾��ޤ�� +\-sigfile \f2\-sigfile\fP ��ץ��ꤷ�ʤ��ä��硢.SF �ե�� .DSA �ե��Υ١��ե��̾�ϡ��ޥ�ɹԤǻ��ꤵ�줿��̾��Ƭ�� 8 ʸ��򤹤٤��ʸ��Ѵ��Τˤʤ�ޤ��̾�� 8 ʸ��̤��ξ��ϡ��̾��Τޤ޻Ȥ��ޤ��̾��ˡ��̾�ե��̾�˻��ѤǤ��ʤ�ʸ��ޤޤ�Ƥ��ϡ��ʸ�� (_) ��֤��ƥե��̾��ޤ�� .TP 3 \-sigalg algorithm JAR �ե��ν�̾�˻��Ѥ��̾��르�ꥺ��̾��ꤷ�ޤ�� @@ -609,7 +609,7 @@ \fP .fi .TP 3 -\-Jjavaoption +�Ǥ��ޤ�javaoption ��ꤵ�줿 \f2javaoption\fP ʸ�� Java ��󥿥ץ꥿��ľ��Ϥ��ޤ��\f3jarsigner\fP �ϡ��ºݤˤ� Java ��󥿥ץ꥿��Ф��֥�åѡ��פǤ��Υ��ץ��ˤϡ��ޤ�뤳�ȤϤǤ��ޤ��󡣤��Υ��ץ��ϡ��¹ԴĶ��ޤ��ϥ��꡼��Ѥ�Ĵ��Ǥ��Ѳ�ǽ�ʥ��󥿥ץ꥿��ץ��ΰ��ɽ��ˤϡ� \f2java \-h\fP �ޤ�� \f2java \-X\fP �ȥ��ޥ�ɹԤ��Ϥ��ޤ�� .LP .TP 3 @@ -676,14 +676,14 @@ JAR �ե��ν�̾ .LP .LP -bundle.jar �Ȥ��̾�� JAR �ե��뤬��Ȥ��ޤ��Υե��ˡ��ȥ��̾�� jane �Ǥ��桼��Ȥäơ��̾��դ��Ȥ��ޤ��ȥ��ϡ�mystore �Ȥ��̾��ǡ�C �ɥ饤�֤� working �ǥ��쥯�ȥ�ˤ��ꡢ��ȥ��Υѥ���ɤ� mypass��\f2jane\fP ��Υѥ���ɤ� j638klm �Ȥ��ޤ��ξ�硢��Υ��ޥ�ɤ�¹Ԥ��ȡ�JAR �ե��˽�̾��դ�� sbundle.jar �Ȥ��̾�դ� JAR �ե��Ǥ��ޤ�� +bundle.jar �Ȥ��̾�� JAR �ե��뤬��Ȥ��ޤ��Υե��ˡ��ȥ��̾�� jane �Ǥ��桼��Ȥäơ��̾��դ��Ȥ��ޤ��ξ�硢��Υ��ޥ�ɤ�¹Ԥ��ȡ�JAR �ե��˽�̾��դ�� sbundle.jar �Ȥ��̾�դ� JAR �ե��Ǥ��ޤ�� .LP .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<��ȥ��Υѥ����>\fP\f3 .fl - \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane + \-keypass \fP\f4<��Υѥ����>\fP\f3 \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -800,7 +800,7 @@ ��Ȥä�� .LP .LP -��ڻ�� \-verify �� \-verbose ��ץ��˲ä�� \f2\-certs\fP ��ץ��ꤷ��ϡ� JAR �ե��γƽ�̾�Ԥξ��Ϥ��ޤ��ˤϡ��񥿥��ס��̾�Լ��̾�� (X.509 ��ξ��Τ�)�� JAR �ե��θ��ξ��񤬥��ȥ��ȥ�ξ��˰��פ��ˤϡ��̤ǰϤޤ줿��̾�ԤΥ��ȥ��̾��ޤޤ�ޤ��򼨤��ޤ�� +��ڻ�� \-verify �� \-verbose ��ץ��˲ä�� \f2\-certs\fP ��ץ��ꤷ��ϡ� �� JAR �ե��γƽ�̾�Ԥξ��Ϥ��ޤ��ˤϡ��񥿥��ס��̾�Լ��̾�� (X.509 ��ξ��Τ�)�� JAR �ե��θ��ξ��񤬥��ȥ��ȥ�ξ��˰��פ��ˤϡ��̤ǰϤޤ줿��̾�ԤΥ��ȥ��̾��ޤޤ�ޤ��Ȥ��С� .LP .nf \f3 @@ -862,7 +862,7 @@ JAR �ե��뤬��JDK 1.1 �� \f3javakey\fP �ġ��Ȥäƽ�̾��Ƥ��硢��̾�Ԥϥ��ǥ�ƥ��ƥ��ǡ��١��̾�Ǥ��ξ�硢��ڤν��Ϥˤ� i �Ȥ��椬�ޤޤ�ޤ��JAR �ե��뤬��ǥ�ƥ��ƥ��ǡ��١��̾�ȥ��ȥ��̾��ξ��ˤ�äƽ�̾��Ƥ��ϡ�k �� i ��ξ��ɽ��ޤ�� .LP .LP -\f2\-certs\fP ��ץ��ꤷ��硢��ȥ��̾�ϳ�̤ǰϤޤ��Τ��Ф��ǥ�ƥ��ƥ��ǡ��١��̾�ϳѳ�̤ǰϤޤ��ɽ��ޤ��Ȥ��С� +\f2\-certs\fP ��ץ��ꤷ��硢��ȥ��̾�ϳ�̤ǰϤޤ��Τ��Ф��ǥ�ƥ��ƥ��ǡ��١��̾�ϳѳ�̤ǰϤޤ��ɽ��ޤ��򼨤��ޤ�� .LP .nf \f3 @@ -978,7 +978,7 @@ .fl �� JAR �ˤϡ��Υ��ȥ��̾�ˤ�äƽ�̾��Ƥ��ʤ��̾�դ��ȥ꤬�ޤޤ�Ƥ��ޤ� .fl - + .fl \fP .fi @@ -993,7 +993,7 @@ .nf \f3 .fl -failure 1 +failure 1 .fl \fP .fi @@ -1649,7 +1649,7 @@ .na \f4jarsigner\fP\f2 �ġ��λ��ˤĤ��Ƥϡ�\fP @ .fi -http://download.oracle.com/javase/tutorial/index.html +http://download.oracle.com/javase/tutorial/security/index.html .na \f2��Java ��塼�ȥꥢ��\fP\f4��\fP @ .fi diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/java.1 --- a/jdk/src/linux/doc/man/ja/java.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/java.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH java 1 "14 Apr 2011" +.TH java 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/javac.1 --- a/jdk/src/linux/doc/man/ja/javac.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/javac.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javac 1 "14 Apr 2011" +.TH javac 1 "07 May 2011" .LP .SH "̾��" @@ -136,10 +136,6 @@ \f3\-sourcepath\fP ��ץ��󤬻��ꤵ��Ƥ��ʤ��ϡ��ե��桼��饹�ѥ��鸡��ޤ�� .LP \f3\-processorpath\fP ��ץ��󤬻��ꤵ��Ƥ��ʤ��ϡ��ץ��å��桼��饹�ѥ��鸡��ޤ�� -.LP -�ص��塢 \f2*\fP �Υ١��̾��ޤ९�饹�ѥ��Ǥϡ��ǥ��쥯�ȥ��γ�ĥ�� \f2.jar\fP �ޤ�� \f2.JAR\fP ��Ĥ��٤ƤΥե��Υꥹ�Ȥ��ꤹ��Τ�Ʊ��Ȥߤʤ��ޤ�� -.LP -��Ȥ��С��ǥ��쥯�ȥ� \f2foo\fP �� \f2a.jar\fP �� \f2b.JAR\fP ��ޤޤ�Ƥ��硢��饹�ѥ�� \f2foo/*\fP �� \f2A.jar:b.JAR\fP ��Ÿ��ޤ��JAR �ե��ν��֤ϻ��ꤵ��ޤ��󡣤��Υꥹ�Ȥˤϡ��ե��ޤᡢ��ꤵ�줿�ǥ��쥯�ȥ��Τ��٤Ƥ� JAR �ե��뤬�ޤޤ�ޤ�� \f2*\fP ��륯�饹�ѥ��ȥ�ϡ��ߤΥǥ��쥯�ȥ��Τ��٤Ƥ� JAR �ե��Υꥹ�Ȥ�Ÿ��ޤ�� \f2CLASSPATH\fP �Ķ��ѿ��⡢��ˤ�Ʊ�ͤ�Ÿ��ޤ��\f3��:\fP ��ޥ�ɹԴĶ��ι��ˤ�äƤϡ� \f2javac \-cp "*.jar" MyClass.java\fP �ʤɤΤ褦�ˡ��磻��ɥ��ʸ��ǰϤळ�Ȥ�ɬ�פʾ��⤢��ޤ�� .TP 3 \-Djava.ext.dirs=directories ��󥹥ȡ��뷿��ĥ��ǽ�ΰ��֤򥪡��С��饤�ɤ��ޤ�� @@ -315,7 +311,7 @@ �侩��뤹�٤Ƥηٹ��ͭ��ˤ��ޤ��Υ�꡼��Ǥϡ��Ѳ�ǽ�ʤ��٤Ƥηٹ��ͭ��ˤ��뤳�Ȥ��侩��Ƥ��ޤ�� .TP 3 \-Xlint:none -Java ��ͤǤϻ��ꤵ��Ƥ��ʤ��٤Ƥηٹ��̵��ˤ��ޤ�� +��٤Ƥηٹ��̵��ˤ��ޤ�� .TP 3 \-Xlint:name �ٹ� \f2name\fP ��ͭ��ˤ��ޤ��Υ��ץ��ͭ��ˤǤ��ٹ�Υꥹ�ȤˤĤ��Ƥϡ��\-Xlint ��ץ��Ȥä�ͭ��ޤ��̵��ˤǤ��ٹ�פ򻲾Ȥ��Ƥ�� @@ -617,7 +613,7 @@ ��褹��ˤϡ��饹 \f2AnnosWithoutProcessors\fP ��ӻ��Ѥ��̾�� \f2Anno\fP �� \f2NotAnno\fP ��ѹ��ޤ�� .TP 3 rawtypes -raw ��Ф��̤��ˤĤ��Ʒٹ𤷤ޤ��äˤ��Υ��ץ��ϡ��ʤ��ѥ�᡼��줿��Ѥ��桼��Ф��Ʒٹ𤷤ޤ��ʸ�Ǥϡ� \f2rawtypes\fP �ٹ��ޤ�� +raw ��Ф��̤��ˤĤ��Ʒٹ𤷤ޤ��ʸ�Ǥϡ� \f2rawtypes\fP �ٹ��ޤ�� .nf \f3 .fl diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/javadoc.1 --- a/jdk/src/linux/doc/man/ja/javadoc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/javadoc.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javadoc 1 "14 Apr 2011" +.TH javadoc 1 "07 May 2011" .SH "̾��" javadoc \- Java API �ɥ��ȥ��ͥ졼�� .LP @@ -38,11 +38,7 @@ ��ڡ��Ƕ��ڤ�줿��Ϣ�Υѥå��̾�Ǥ��Ȥ��С� \f2java.lang\ java.lang.reflect\ java.awt �Τ褦�˻��ꤷ�ޤ�\fP��ɥ��Ȳ��ѥå��̤˻��ꤹ��ɬ�פ��ޤ��磻��ɥ��ɤϻ��ԲĤǤ��Ƶ�Ū��Τ��ˤϡ�\-subpackages ��Ѥ��ޤ��Javadoc �ġ��ϡ�\f2\-sourcepath\fP ��Ѥ��Ƥ��Υѥå��̾�򸡺��ޤ��1 �İʾ�Υѥå��Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ�� .TP 3 sourcefilenames -��ڡ��Ƕ��ڤ�줿��Ϣ�Υ��ե��̾�Ǥ�� ƥե��ϡ��ѥ��ǻϤޤ�ޤ��ꥹ�� (*) �ʤɤΥ磻��ɥ��ɤ�ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��뤬��Τϡ��ե��̾��.java�פȤ��ĥ�Ҥǽ��ꡢ��γ�ĥ�Ҥ��̾��ºݤ�ͭ��ʥ��饹̾�Ǥ��뤹�٤ƤΥե��Ǥ� ( -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625�򻲾�)��äơ��ϥ��ե��ޤ�̾�� ( \f2X\-Buffer\fP �ʤ�) �䡢��¾��̵��ʸ��ޤ�̾��դ��뤳�Ȥˤ�äơ��Υե��ɥ��Ȳ��оݤ��Ǥ��ޤ��ϡ��ƥ��ѤΥե��䡢�ƥ�ץ졼�Ȥ��줿�ե��ξ��Ǥ��ե��̾��˻��ꤷ��ѥ��ˤ�äơ�javadoc ��Υե��򸡺��꤬��ޤ�ޤ��Javadoc �ġ��ϡ��Υ��ե��̾�򸡺��Ȥ��ˤ� \f2\-sourcepath\fP ��Ѥ��ޤ��Хѥ��ϸ��ߤΥǥ��쥯�ȥ��Ȥ��뤿�ᡢ \f2Button.java\fP ��Ϥ��Ȥϡ� \f2./Button.java\fP ��Ϥ��Ȥ�Ʊ��Ǥ��ե��̾��ե�ѥ��ǻ��ꤹ��ȡ� \f2/home/src/java/awt/Graphics*.java �Τ褦�ˤʤ�ޤ�\fP�� 1 �İʾ�Υ��饹�Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ��ޤ��֥ѥå��ȥ��饹�Υɥ��Ȳ��פ��Τ褦�ˡ��ѥå��̾�ȥ��ե��̾�򺮺ߤ��뤳�Ȥ�Ǥ��ޤ�� +��ڡ��Ƕ��ڤ�줿��Ϣ�Υ��ե��̾�Ǥ�� ƥե��ϡ��ѥ��ǻϤޤ�ޤ��ꥹ�� (*) �ʤɤΥ磻��ɥ��ɤ�ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��뤬��Τϡ��ե��̾��.java�פȤ��ĥ�Ҥǽ��ꡢ��γ�ĥ�Ҥ��̾��ºݤ�ͭ��ʥ��饹̾�Ǥ��뤹�٤ƤΥե��Ǥ� (Java ��ͤ򻲾�)��äơ��ϥ��ե��ޤ�̾�� ( \f2X\-Buffer\fP �ʤ�) �䡢��¾��̵��ʸ��ޤ�̾��դ��뤳�Ȥˤ�äơ��Υե��ɥ��Ȳ��оݤ��Ǥ��ޤ��ϡ��ƥ��ѤΥե��䡢�ƥ�ץ졼�Ȥ��줿�ե��ξ��Ǥ��ե��̾��˻��ꤷ��ѥ��ˤ�äơ�javadoc ��Υե��򸡺��꤬��ޤ�ޤ��Javadoc �ġ��ϡ��Υ��ե��̾�򸡺��Ȥ��ˤ� \f2\-sourcepath\fP ��Ѥ��ޤ��Хѥ��ϸ��ߤΥǥ��쥯�ȥ��Ȥ��뤿�ᡢ \f2Button.java\fP ��Ϥ��Ȥϡ� \f2./Button.java\fP ��Ϥ��Ȥ�Ʊ��Ǥ��ե��̾��ե�ѥ��ǻ��ꤹ��ȡ� \f2/home/src/java/awt/Graphics*.java �Τ褦�ˤʤ�ޤ�\fP�� 1 �İʾ�Υ��饹�Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ��ޤ��֥ѥå��ȥ��饹�Υɥ��Ȳ��פ��Τ褦�ˡ��ѥå��̾�ȥ��ե��̾�򺮺ߤ��뤳�Ȥ�Ǥ��ޤ�� .TP 3 \-subpackages pkg1:pkg2:... ��ե��뤫��ꤵ�줿�ѥå��Ӥ��Υ��֥ѥå��˺Ƶ�Ū�˥ɥ��Ȥ��ޤ��ѥå��̾�ޤ��ϥ��ե��̾��ꤹ��ɬ�פϤ��ޤ�� @@ -62,11 +58,7 @@ .RS 3 .TP 2 o -̾��\f2.java\fP�פ��ȼºݤ�ͭ��ʥ��饹̾�ˤʤäƤ�� (ͭ��ʸ��ˤĤ��Ƥ� -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625�򻲾�) +̾��\f2.java\fP�פ��ȡ��ºݤ�ͭ��ʥ��饹̾�ˤʤäƤ�� (Java ��ͤ�ͭ��ʸ��򻲾�) .TP 2 o ��ĥ꡼�Υ롼�Ȥ��Ū�ʥǥ��쥯�ȥ�ѥ��ڤ�ʸ��ɥåȤ��Ѵ��ȡ��ºݤ�ͭ��ʥѥå��̾�ˤʤäƤ�� @@ -111,11 +103,7 @@ .LP �ºݤˤϡ�Javadoc �ġ��ϡ��᥽�å��Τ��ʤ��ʥ��֥ե��Ǥ��褦�� \f2.java\fP ��ե��Ǥ�ư��ޤ��äơ�API �κ��ˤϡ��򵭽Ҥ��߷פ��ᤤ�ʳ��ǡ��ɥ��ơ��󥳥��Ȥ򵭽Ҥ�� javadoc �ġ��¹ԤǤ��ޤ�� .LP -��ѥ��˰�¸��뤳�Ȥˤ�äơ�HTML ��Ϥϡ��ºݤμ��Τ��б��ޤ��ºݤμ��ϡ��Ū�ʥ��ɤˤǤϤʤ��ۤΥ��ɤ˰�¸��礬��ޤ��Ȥ��С�Javadoc �ġ��ϡ�.class �ե��ˤ�¸�ߤ��뤬��ɤˤ�¸�ߤ��ʤ� -.na -\f2�ǥե��ȥ��󥹥ȥ饯��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (Java ��ͤΥ�� 8.6.7) \f2��ɥ��Ȳ�\fP ��ޤ�� +��ѥ��˰�¸��뤳�Ȥˤ�äơ�HTML ��Ϥϡ��ºݤμ��Τ��б��ޤ��ºݤμ��ϡ��Ū�ʥ��ɤˤǤϤʤ��ۤΥ��ɤ˰�¸��礬��ޤ��Ȥ��С�Javadoc �ġ��ϡ�.class �ե��ˤ�¸�ߤ��뤬��ɤˤ�¸�ߤ��ʤ��ǥե��ȥ��󥹥ȥ饯�� (Java ��ͤ򻲾�) \f2��ɥ��Ȳ�\fP ��ޤ�� .LP �̾Javadoc �ġ��Ǥϡ��ե��Υ��ɤ��Դ��ޤ��ϥ��顼��ޤ�Ǥ��Ǥ�ɥ��Ȥ��Ǥ��ޤ��Τ��ᡢ�ǥХå��ȥ�֥륷�塼�ƥ��󥰤�λ��˥ɥ��Ȥ��Ǥ��ޤ��Ȥ��С�Java ��ͤˤ��ȡ��ݥ᥽�åɤ�ޤ९�饹�ϡ��켫��ݤȤ��ʤ��Фʤ�ޤ��󡣤��Υ��顼�򸡽Ф��ȡ�javac ��ѥ��ߤ��ޤ��Javadoc �ġ��Ϸٹ��Ф��˽��³�Ԥ��ޤ��Javadoc �ġ��ϥɥ��ơ��󥳥��Ȥδ��Ū�ʥ��å��Ԥ��ޤ��ɥ��ơ��󥳥��Ȥ��ܤ��å��ɬ�פ��ϡ�DocCheck �ɥå��åȤ��Ѥ��Ƥ�� .LP @@ -161,7 +149,7 @@ .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html \- �ɥ��ơ��󥳥��Ȥε��ˡ�˴ؤ�� Sun �ε�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html \- �ɥ��ơ��󥳥��Ȥε��ˡ�˴ؤ�� Sun �ε�� .TP 2 o .na @@ -179,13 +167,13 @@ .na \f2DocCheck �ɥå��å�\fP @ .fi -http://java.sun.com/javadoc/doccheck \- ��ե��Υɥ��ơ��󥳥��Ȥ��å��Ф��줿��顼��Υ�ݡ��Ȥ��ޤ��Doc Check �桼�ƥ��ƥ��ΰ��Ǥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ��ե��Υɥ��ơ��󥳥��Ȥ��å��Ф��줿��顼��Υ�ݡ��Ȥ��ޤ��Doc Check �桼�ƥ��ƥ��ΰ��Ǥ�� .TP 2 o .na \f2MIF �ɥå��å�\fP @ .fi -http://java.sun.com/javadoc/mifdoclet \- MIF��FrameMaker��PDF �ν񼰤� API �ɥ��Ȥ�ư��ޤ��MIF �� Adobe FrameMaker �θ򴹽񼰤Ǥ�� +http://java.sun.com/j2se/javadoc/mifdoclet/ \- MIF��FrameMaker��PDF �ν񼰤� API �ɥ��Ȥ�ư��ޤ��MIF �� Adobe FrameMaker �θ򴹽񼰤Ǥ�� .RE .SS �Ѹ� @@ -218,7 +206,7 @@ .na \f21.3\fP @ .fi -http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ��ѹ��Ƥ��ޤ��javadoc �ġ��¹Ԥ��Ȥ��ϡ�Javadoc �Υ֡��ȥ��饹�ѥ��ӥ��饹�ѥ��ˤ��뤹�٤Ƥλ��ȥ��饹��꡼�˥��ɤ��ɬ�פ��ޤ��ȥ��饹��Ĥ��ʤ��ϡ��֥��饹��Ĥ��ޤ��פȤ��ٹ�ɽ��ޤ��Javadoc �ġ��ϡ��饹��¸�ߤȤ��Υ��С��δ��̾��Ƚ�̤��Τ�ɬ�פʤ��٤Ƥξ��.class �ե��뤫��Ф��Ȥ��Ǥ��ޤ�� +http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ��ѹ��Ƥ��ޤ��javadoc �ġ��¹Ԥ��Ȥ��ϡ�Javadoc �Υ֡��ȥ��饹�ѥ��ӥ��饹�ѥ��ˤ��뤹�٤Ƥλ��ȥ��饹��꡼�˥��ɤ��ɬ�פ��ޤ��ȥ��饹��Ĥ��ʤ��ϡ��֥��饹��Ĥ��ޤ��פȤ��ٹ�ɽ��ޤ��Javadoc �ġ��ϡ��饹��¸�ߤȤ��Υ��С��δ��̾��Ƚ�̤��Τ�ɬ�פʤ��٤Ƥξ��.class �ե��뤫��Ф��Ȥ��Ǥ��ޤ�� .LP .TP 3 ��ȥ��饹 (external referenced classes) @@ -310,7 +298,7 @@ .na \f2package.html\fP�� @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments�򻲾Ȥ��Ƥ�� .LP \f3�ѥå��ȥե��ν��\fP \- Javadoc �ġ��ϡ��¹Ի��˥ѥå��ȥե��ưŪ�˸��Υե��򸫤Ĥ��ȼ��ν��Ԥ��ޤ�� .RS 3 @@ -350,7 +338,7 @@ .RS 3 .TP 2 o -\f2\fP �� \f2\fP ��δ֤ˤ��뤹�٤Ƥ��Ƥ��оݤȤ��ƥ��ԡ�� +\f2\fP �� \f2\fP ��δ֤ˤ��뤹�٤Ƥ��Ƥ��оݤȤ��ƥ��ԡ�� .TP 2 o ��ץ��С��٤ƽ�� @@ -408,11 +396,7 @@ .LP �ƥ��ȥե�� doc ��Ȥ��ޤޤ��硢��Τ褦�˥磻��ɥ��ɤ�ޤ��ƥ��ȥ��ե��̾��Ϥ��ƥƥ��ȥե��Υɥ��Ȥ��褦�ˡ�Javadoc �ġ��̸Ĥ˼¹ԤǤ��褦��Ǥ��ޤ��Ȥ��С� \f2com/package1/test\-files/*.java �ʤɤǤ�\fP�� .LP -\f3��ե��Υƥ�ץ졼��\fP \- �ƥ�ץ졼�ȥե��̾��ϡ�.java�פǽ��뤳�Ȥ⤢��ޤ��ƥ�ץ졼�ȥե��ϥ��ѥ��Ǥ��ޤ��󡣥��ǥ��쥯�ȥ��ݻ��ե��Υƥ�ץ졼�Ȥ��ϡ� \f2Buffer\-Template.java\fP �Τ褦�˥ϥ��ե�䤽��¾��̵�� Java ʸ��̾��˴ޤ�뤳�Ȥǡ��ƥ�ץ졼�Ȥ��ʤ��褦�ˤ��ޤ��ϡ�Javadoc �ġ��뤬��Τϡ��.java��̾�� Υ��饹̾�Ǥ��륽��ե��Ǥ��뤿��Ǥ� ( -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625��)�� +\f3��ե��Υƥ�ץ졼��\fP \- �ƥ�ץ졼�ȥե��̾��ϡ�.java�פǽ��뤳�Ȥ⤢��ޤ��ƥ�ץ졼�ȥե��ϥ��ѥ��Ǥ��ޤ��󡣥��ǥ��쥯�ȥ��ݻ��ե��Υƥ�ץ졼�Ȥ��ϡ� \f2Buffer\-Template.java\fP �Τ褦�˥ϥ��ե�䤽��¾��̵�� Java ʸ��̾��˴ޤ�뤳�Ȥǡ��ƥ�ץ졼�Ȥ��ʤ��褦�ˤ��ޤ��ϡ�Javadoc �ġ��뤬��Τϡ��.java��̾�� Υ��饹̾�Ǥ��륽��ե��Ǥ��뤿��Ǥ� (Java ��ͤΡ�Identifiers�פ˴ؤ��򻲾�)�� .SH "��ե��" .LP �ǥե��ȤǤϡ�javadoc �ġ��ϡ�HTML ��Υɥ��Ȥ��ɸ��ɥå��åȤ�Ȥ��ޤ��Υɥå��åȤϡ��ʲ��μ��Υե��ޤ��줾�� HTML �ڡ��ϡ��ġ��Υե��ޤ��javadoc ��ե��̾��ˤϡ��饹�䥤�󥿥ե��̾��ˤ��ʤ��Τȡ��Ǥʤ�� ( \f2package\-summary.html �ʤ�\fP) �� 2 ��ब��ޤ��ԤΥ��롼�פΥե��̾�ˤϡ��ԤΥ��롼�פȥե��̾��礷�ʤ��褦�ˡ��ϥ��ե󤬴ޤޤ�Ƥ��ޤ�� @@ -756,7 +740,7 @@ ��ư��ϥС�� 1.3 ��ư��Ȥ��о�Ū�Ǥ��ޤǤΥС��Ǥϡ��ޤ��ϥ��¸�ߤ��С��Ȥϰ��ڷѾ��ޤ��Ǥ�� .TP 2 o -\f3{@inheritDoc} ��ޤॳ��Ȥ��Ū�˷Ѿ��\fP \- ��饤�󥿥� \f2{@inheritDoc}\fP �򡢥᥽�åɤμ��ޤ�� \f2@return\fP�� \f2@param\fP �� \f2@throws\fP �Τ��줫�Υ��ޤ��б��Ѿ��줿��ޤ��ϥ��Ȥ��ΰ��֤˥��ԡ��ޤ�� +\f3{@inheritDoc} ��ޤॳ��Ȥ��Ū�˷Ѿ��\fP \- ��饤�󥿥� \f2{@inheritDoc}\fP �򡢥᥽�åɤμ��ޤ�� \f2@return\fP �� \f2@param\fP ��ޤ�� \f2@throws\fP �Τ��줫�Υ��ޤ��б��Ѿ��줿��ޤ��ϥ��Ȥ��ΰ��֤˥��ԡ��ޤ�� .RE .LP �ɥ��ơ��󥳥��Ȥ�ºݤ˥��ԡ��Ѥ��ˤϡ��Ѿ��᥽�åɤΥ��ե��뤬 \-sourcepath �ǻ��ꤷ��ѥ��֤��Ƥ��뤳�Ȥ�ɬ�פˤʤ�ޤ��ޥ�ɹԤǡ��饹��ѥå��Ϥ�ɬ�פϤ��ޤ��󡣤��ϡ��饹��ɥ��Ȳ��륯�饹�Ǥʤ��Фʤ�ʤ��ä� 1.3.x ��Υ�꡼��Ȱۤʤ�ޤ�� @@ -954,7 +938,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 867 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 851 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1079,7 +1063,7 @@ .na \f2@author ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author�򻲾Ȥ��Ƥ�� .LP .RS 3 .TP 3 @@ -1094,11 +1078,11 @@ .na \f2@deprecated ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated�򻲾Ȥ��Ƥ�� .RS 3 .TP 2 o -Javadoc 1.2 �ʹߤǤ� \f2{@link}\fP ��Ѥ��ޤ��ˤ�ꡢɬ�פʾ��˥��饤��ǥ�󥯤��Ǥ��ޤ��Ȥ��С� +Javadoc 1.2 �ʹߤǤ� \f2{@link}\fP ��Ѥ��ޤ��ˤ�ꡢɬ�פʾ��˥��饤��ǥ�󥯤��Ǥ��ޤ��򼨤��ޤ�� .nf \f3 .fl @@ -1292,7 +1276,7 @@ .na \f2{@link} ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}�򻲾Ȥ��Ƥ�� .LP .TP 3 {@linkplain\ package.class#member\ label} @@ -1386,7 +1370,7 @@ .na \f2@param ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param�򻲾Ȥ��Ƥ�� .LP .TP 3 @return\ description @@ -1396,7 +1380,7 @@ .na \f2@return ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return�򻲾Ȥ��Ƥ�� .LP .TP 3 @see\ reference @@ -1644,7 +1628,7 @@ .nr 40 \n(79+(0*\n(38) .nr 80 +\n(40 .nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1358 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1342 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1751,7 +1735,7 @@ .LP \f3@see �θ��\fP \- Javadoc �ġ��ϡ��ե�� (.java)��ѥå��ե�� (package.html �ޤ�� package\-info.java) �ޤ��ϳ��ץե�� (overview.html) �˴ޤޤ�� \f2@see\fP ��ޤ��Ԥ� 2 �ĤΥե��Ǥϡ��̾�� \f2@see\fP ��˻��ꤷ�ʤ��Фʤ�ޤ��󡣥��ե��Ǥϡ��̾��ޤ��ʬ��̾��Ǥ��ޤ�� .LP -Javadoc �ġ��ϡ��Ǥʤ�̾��Ҥ��줿 \f2@see\fP �� \f2.java �ե��Ǹ��Ĥ��ȡ�\fP Java ��ѥ��Ʊ��ǻ��ꤵ�줿̾��򸡺��ޤ�� Javadoc �ġ��ϡ��̾��֤Τ��ޤ��򸡽Ф��ޤ�� ϡ��ɤˤ��Υ��顼��¸�ߤ��Ƥ��ʤ��Ȥ��Ȥ��Ƥ��뤿��Ǥ��θ��ϡ�Java �� 2 �Ǥ�� 6 �ϡ�Names�פ��Ƥ��ޤ��Javadoc �ġ��ϡ��Ϣ��륯�饹�ȥѥå��ӥ��ݡ��Ȥ��줿��饹�ȥѥå��Τ��٤Ƥ��̾��򸡺��ޤ��Ū�ˤϡ��ν��Ǹ��ޤ�� +Javadoc �ġ��ϡ��Ǥʤ�̾��Ҥ��줿 \f2@see\fP �� \f2.java �ե��Ǹ��Ĥ��ȡ�\fP Java ��ѥ��Ʊ��ǻ��ꤵ�줿̾��򸡺��ޤ�� Javadoc �ġ��ϡ��̾��֤Τ��ޤ��򸡽Ф��ޤ�� ϡ��ɤˤ��Υ��顼��¸�ߤ��Ƥ��ʤ��Ȥ��Ȥ��Ƥ��뤿��Ǥ��θ��ϡ�\f2Java ��\fP��Ƥ��ޤ��Javadoc �ġ��ϡ��Ϣ��륯�饹�ȥѥå��ӥ��ݡ��Ȥ��줿��饹�ȥѥå��Τ��٤Ƥ��̾��򸡺��ޤ��Ū�ˤϡ��ν��Ǹ��ޤ�� .RS 3 .TP 3 1. @@ -1990,7 +1974,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 1434 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1418 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2131,7 +2115,7 @@ .LP \f3@see ��\fP .br -��¦�Υ��Ȥϡ� \f2@see\fP �� \f2java.applet.Applet\fP �Τ褦��̤Υѥå��Υ��饹��ˤ��ˡ�̾��ɤΤ褦��ɽ��뤫�򼨤��Ƥ��ޤ�� +��¦�Υ��Ȥϡ� \f2@see\fP �� \f2java.applet.Applet\fP �ʤɤ��̤Υѥå��Υ��饹��ˤ��ˡ�̾��ɤΤ褦��ɽ��뤫�򼨤��Ƥ��ޤ�� .nf \f3 .fl @@ -2163,7 +2147,7 @@ .na \f2@see ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see�򻲾Ȥ��Ƥ�� .RE .RE .LP @@ -2198,7 +2182,7 @@ .na \f2��ľ�󲽤� FAQ��\fP @ .fi -http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing�⻲�Ȥ��Ƥ�� FAQ �ˤϡ��\-private ��å��ꤷ�ʤ�� javadoc ��¹Ԥ��Ƥ��Τ� private �ե��ɤ� @serial ��Ĥ��ʤ��Ȥ�� javadoc �ηٹ�ɽ��פʤɤΰ��Ū�ʼ��ؤβ��ܤ��Ƥ��ޤ��ľ�󲽷��ͤ˥��饹��ޤ��ˤϡ� +http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing�⻲�Ȥ��Ƥ�� FAQ �ˤϡ��\-private ��å��ꤷ�ʤ�� javadoc ��¹Ԥ��Ƥ��Τ� private �ե��ɤ� @serial ��Ĥ��ʤ��Ȥ�� javadoc �ηٹ�ɽ��פʤɤΰ��Ū�ʼ��ؤβ��ܤ��Ƥ��ޤ��ľ�󲽷��ͤ˥��饹��ޤ��ˤϡ� .na \f2��Sun �λ��͡�\fP @ .fi @@ -2241,7 +2225,7 @@ .na \f2@throws ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception�򻲾Ȥ��Ƥ�� .LP .TP 3 {@value\ package.class#field} @@ -2293,13 +2277,13 @@ @version\ version\-text \-version ��ץ��󤬻��Ѥ��ȡ��ɥ��Ȥ� [�С��] ��Ф��ɲä��ꤵ�줿 \f2version\-text\fP ��񤭹��ߤޤ��Υ��ϡ��Υ��ɤ��ޤޤ�륽�եȥ��θ��ߤΥС��ֹ��ݻ��褦�˰տޤ��Ƥ��ޤ��Ф��@since �ϡ��Υ��ɤ�Ƴ��줿�С��ֹ��ݻ��ޤ�� \f2version\-text\fP �ˤϡ��̤��¤�Ϥ��ޤ��󡣥С��󥿥��ѤǤ��Ĵ�٤�ˤϡ��֥��ѤǤ��פ򻲾Ȥ��Ƥ�� .LP -1 �ĤΥɥ��ơ��󥳥��Ȥ�ʣ�� \f2@version\fP ��ޤ�뤳�Ȥ��Ǥ��ޤ��̣��ʤ��ϰ��ǡ�1 �Ĥ� \f2@version\fP �� 1 �ĤΥС��ֹ��ꤹ�뤳�Ȥ⡢ʣ��ΥС��ֹ��ꤹ�뤳�Ȥ�Ǥ��ޤ��Ԥξ��ϡ�Javadoc �ġ��ˤ�ä�̾��̾��δ֤˥�� (\f2,\fP) �ȶ��̾��δ֤��ޤ��Ԥξ��ϡ��ƥ��Τ��Ϥ��뤳�Ȥʤ��ɥ��Ȥˤ��Τޤޥ��ԡ��ޤ��äơ��ޤǤϤʤ��Ƹ��б��̾��ڤ�ʸ��Ȥ�ɬ�פ��Ȥ��ϡ�1 �ĤΥ��ʣ��̾��ꤷ�Ƥ�� +1 �ĤΥɥ��ơ��󥳥��Ȥ�ʣ�� \f2@version\fP ��ޤ�뤳�Ȥ��Ǥ��ޤ��̣��ʤ��ϰ��ǡ�1 �Ĥ� \f2@version\fP �� 1 �ĤΥС��ֹ��ꤹ�뤳�Ȥ⡢ʣ��ΥС��ֹ��ꤹ�뤳�Ȥ�Ǥ��ޤ��Ԥξ��ϡ�Javadoc �ġ��ˤ�ä�̾��̾��δ֤˥�� (\f2,\fP) �ȶ��ޤ��Ԥξ��ϡ��ƥ��Τ��Ϥ��뤳�Ȥʤ��ɥ��Ȥˤ��Τޤޥ��ԡ��ޤ��äơ��ޤǤϤʤ��Ƹ��б��̾��ڤ�ʸ��Ȥ�ɬ�פ��Ȥ��ϡ�1 �ĤΥ��ʣ��̾��ꤷ�Ƥ�� .LP �ܺ٤ˤĤ��Ƥϡ� .na \f2@version ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version�򻲾Ȥ��Ƥ�� .RE .SS ��ѤǤ�� @@ -2789,7 +2773,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 2009 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1993 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2982,7 +2966,7 @@ .LP .TP 3 \-classpath\ classpathlist -javadoc ��ȥ��饹 (\f2.class\fP �ե��) �θ��Ԥ��Ȥ��˻��Ѥ��ѥ��ꤷ�ޤ��ȥ��饹�Ȥϡ��ɥ��Ȳ��륯�饹�ȡ��Υ��饹��黲�Ȥ��뤹�٤ƤΥ��饹��ؤ��ޤ��\f2classpathlist\fP �ˤϡ�� (\f2:\fP) �Ƕ��ڤä�ʣ��Υѥ��ޤ�뤳�Ȥ��Ǥ��ޤ�� Javadoc �ġ��ϡ��ꤵ�줿�ѥ��ʲ��Τ��٤ƤΥ��֥ǥ��쥯�ȥ�򸡺��ޤ��classpathlist ��ꤹ��Ȥ��ϡ� +javadoc ��ȥ��饹 (\f2.class\fP �ե��) �θ��Ԥ��Ȥ��˻��Ѥ��ѥ��ꤷ�ޤ��ȥ��饹�Ȥϡ��ɥ��Ȳ��륯�饹�ȡ��Υ��饹��黲�Ȥ��뤹�٤ƤΥ��饹��ؤ��ޤ��\f2classpathlist\fP �ˤϡ�� (\f2:\fP) �Ƕ��ڤä�ʣ��Υѥ��ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��ϡ��ꤵ�줿�ѥ��ʲ��Τ��٤ƤΥ��֥ǥ��쥯�ȥ�򸡺��ޤ��classpathlist ��ꤹ��Ȥ��ϡ� .na \f2��饹�ѥ�\fP @ .fi @@ -3243,13 +3227,13 @@ .LP \f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- \f2java.lang\fP�� \f2java.io\fP ��¾�� Java �ץ�åȥե��ѥå�� ( .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api ��) �˥�󥯤��ͤ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �� \f2\-d\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� +http://download.oracle.com/javase/7/docs/api/ ��) �˥�󥯤��礬��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �� \f2\-d\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- 2 �ĤΥѥå��ꡢ��Υɥ��Ȥ� Javadoc �ġ��ʣ��¹Ԥ��줿��ΤǤ��Ȥ��ޤ��ˡ��Υɥ��Ȥ��Хѥ��ʬ�䤵��Ƥ��Ȥ��ޤ��ξ�硢�ѥå��ϡ�API �Ǥ�� \f2com.apipackage\fP �ȡ�SPI (��ӥ��ץ��Х��󥿥ե��) �Ǥ�� \f2com.spipackage\fP �Ǥ��ɥ��Ȥγ�Ǽ��ϡ� \f2docs/api/com/apipackage\fP �� \f2docs/spi/com/spipackage\fP �Ǥ��API �ѥå��Υɥ��ȤϤ��Ǥ��Ѥߤǡ� \f2docs\fP ��ȥǥ��쥯�ȥ�ˤʤäƤ��Ȳ��ꤹ��ȡ�API �ɥ��ȤؤΥ�󥯤�ޤ� SPI �ѥå��ɥ��Ȳ��ˤϡ��Υ��ޥ�ɤ�¹Ԥ��ޤ�� @@ -3294,9 +3278,9 @@ .LP ��Ȥ��С�Java SE 6 API �Υѥå��ꥹ�Ȥ� .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list �ˤ��ꡢ��Τ褦��ƤǻϤޤäƤ��ޤ�� +http://download.oracle.com/javase/7/docs/api/package\-list �ˤ��ꡢ��Τ褦��ƤǻϤޤäƤ��ޤ�� .nf \f3 .fl @@ -3355,15 +3339,15 @@ .LP 1 �� javadoc �¹Ԥ�ʣ�� \f2\-linkoffline\fP ��ץ��Ǥ��ޤ��1.2.2 ��ϡ�ʣ��Υ��ץ��ꤹ�뤳�ȤϤǤ��ޤ��Ǥ�� .LP -\f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- http://java.sun.com/javase/6/docs/api �� \f2java.lang\fP�� \f2java.io\fP ��Ӥ��¾�� Java SE �ץ�åȥե��ѥå�� \f2�˥�󥯤��Ƥ�\fP Web �˥��Ǥ��ʤ��ͤ��ޤ��֥饦�� \f2��\fP +\f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- http://download.oracle.com/javase/7/docs/api/ �� \f2java.lang\fP�� \f2java.io\fP ��Ӥ��¾�� Java SE �ץ�åȥե��ѥå�� \f2�˥�󥯤��Ƥ⡢\fPWeb �˥��Ǥ��ʤ��ͤ��ޤ��֥饦�� \f2��\fP .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list �ˤ�� package\-list �ե��򳫤��ǥ��쥯�ȥ��¸�� 2 �� \f2packagelistLoc\fP �Ǥ��Υ��륳�ԡ��ؤΥѥ��ꤷ�ޤ��Ǥϡ��ѥå��ꥹ�ȥե��ϥ��ȥǥ��쥯�ȥ� "\f2.\fP" ��¸��Ƥ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �ʤɡ��¾��ɬ�ץ��ץ��ϼ��Ƥ��ޤ�� +http://download.oracle.com/javase/7/docs/api/package\-list �ˤ�� package\-list �ե��򳫤��ǥ��쥯�ȥ��¸�� 2 �� \f2packagelistLoc\fP �Ǥ��Υ��륳�ԡ��ؤΥѥ��ꤷ�ޤ��Ǥϡ��ѥå��ꥹ�ȥե��ϥ��ȥǥ��쥯�ȥ� "\f2.\fP" ��¸��Ƥ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi .LP @@ -3694,7 +3678,7 @@ .na \f2��Comparing Annotations and Javadoc Tags��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations�򻲾Ȥ��Ƥ�� .LP \-taglet ��ץ��Ѥ��ơ��ʣ��ʥ֥��å��䥫��।��饤�󥿥�� 뤳�Ȥ��Ǥ��ޤ�� .LP @@ -3890,13 +3874,13 @@ .fl .fl - Submit a bug or feature
+ Submit a bug or feature
.fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.
.fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners. + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ�� .fl \fP .fi @@ -3945,7 +3929,7 @@ .RS 3 .TP 2 o -\f3�� 1 \- 1 �İʾ�Υѥå��ε�ư��Ƶ�Ū�˼¹�\fP \- ��Ǥ� javadoc ��Ǥ�դΥǥ��쥯�ȥ꤫��¹ԤǤ��褦�ˡ�\-sourcepath ��Ѥ��Ƶ�Ū��Τ�� \-subpackages (1.4 �ο��ץ��) ��Ѥ��ޤ��ϡ� \f2java\fP �ǥ��쥯�ȥ�Υ��֥ѥå��򤿤ɤ�ޤ��κݤˡ� \f2java.net\fP �� \f2java.lang\fP ��롼�Ȥ˻��ĥѥå��Ͻ��ޤ��ΤȤ�� \f2java.lang �Υ��֥ѥå��\fP�Ǥ�� java.lang.ref �� \f2��ޤ�\fP�� +\f3�� 1 \- 1 �İʾ�Υѥå��ε�ư��Ƶ�Ū�˼¹�\fP \- ��Ǥ� javadoc ��Ǥ�դΥǥ��쥯�ȥ꤫��¹ԤǤ��褦�ˡ�\-sourcepath ��Ѥ��Ƶ�Ū��Τ�� \-subpackages (1.4 �ο��ץ��) ��Ѥ��ޤ��ϡ� \f2java\fP �ǥ��쥯�ȥ�Υ��֥ѥå��򤿤ɤ�ޤ��κݤˡ� \f2java.net\fP �� \f2java.lang\fP ��롼�Ȥ˻��ĥѥå��ޤ��ξ�硢 \f2java.lang\fP �Υ��֥ѥå��Ǥ�� \f2java.lang.ref\fP�� .nf \f3 .fl @@ -4068,13 +4052,13 @@ .fl \-bottom ' .fl - Submit a bug or feature
+ Submit a bug or feature
.fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.
.fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners.' \\ + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ��' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl @@ -4087,7 +4071,7 @@ \fP .fi .LP -�嵭�Υ��ޥ�ɤǡ� \f2packages\fP �ϡ��оݤΥѥå��̾ ( \f2java.applet java.lang\fP �ʤ�) ��äƤ��ե��̾��Ǥ��ƥ��ץ��Ρ�ñ��ǰϤޤ줿��¦�ˤϡ��ʸ��Ǥ��ޤ��󡣤��Ȥ��С��򥳥ԡ��ڡ��Ȥ��ϡ� \f2\-bottom\fP ��ץ��󤫤��ʸ��Ƥ��ˡ��Τ��ȤΡ��פ⻲�Ȥ��Ƥ�� +��ǡ� \f2packages\fP �ϡ��оݤΥѥå��̾ ( \f2java.applet java.lang\fP �ʤ�) ��äƤ��ե��̾��Ǥ��ƥ��ץ��Ρ�ñ��ǰϤޤ줿��¦�ˤϡ��ʸ��Ǥ��ޤ��󡣤��Ȥ��С��򥳥ԡ��ڡ��Ȥ��ϡ� \f2\-bottom\fP ��ץ��󤫤��ʸ��Ƥ��ˡ��Τ��ȤΡ��פ⻲�Ȥ��Ƥ�� .SS Makefile �� .LP @@ -4139,13 +4123,13 @@ .fl BOTTOM = ' .fl - Submit a bug or feature
+ Submit a bug or feature
.fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved.
.fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners.' + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ��' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -4229,13 +4213,13 @@ .na \f2Javadoc �Υۡ��ڡ��\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/javah.1 --- a/jdk/src/linux/doc/man/ja/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "14 Apr 2011" +.TH javah 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/javap.1 --- a/jdk/src/linux/doc/man/ja/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "14 Apr 2011" +.TH javap 1 "07 May 2011" .LP .SH "̾��" @@ -33,7 +33,7 @@ .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -42,7 +42,20 @@ .SH "��" .LP .LP -\f3javap\fP ��ޥ�ɤϡ��饹�ե��ե��֥뤷�ޤ��ν��Ϥϻ��ꤹ�륪�ץ��ˤ��ۤʤ�ޤ��ץ��ꤷ�ʤ��硢\f3javap\fP �ϡ��Υѥå��Ϥ��줿��饹�� protected �� public �Υե��ɤȥ᥽�åɤ��Ϥ��ޤ��\f3javap\fP �Ϥ��ν��Ϥ�ɸ��Ϥ�ɽ��ޤ��Ȥ��С��Υ��饹��򥳥�ѥ��뤹��Ȥ��ޤ�� +\f3javap\fP ��ޥ�ɤϡ�1 �Ĥޤ��ʣ��Υ��饹�ե��ե��֥뤷�ޤ��ν��Ϥϻ��ꤹ�륪�ץ��ˤ��ۤʤ�ޤ��ץ��ꤷ�ʤ��硢\f3javap\fP �ϡ��Υѥå��Ϥ��줿��饹�� protected �� public �Υե��ɤȥ᥽�åɤ��Ϥ��ޤ��\f3javap\fP �Ϥ��ν��Ϥ�ɸ��Ϥ�ɽ��ޤ�� +.LP +.RS 3 +.TP 3 +options +��ޥ�ɹԥ��ץ�� +.TP 3 +classes +��ν��оݤȤʤ� 1 �İʾ�Υ��饹 \f2DocFooter.class\fP �ʤ�) �Υꥹ�� (��ڤ�)��饹�ѥ��Ǹ��Ĥ��륯�饹�ϡ��ե��̾ ( \f2/home/user/myproject/src/DocFooter.class\fP �ʤ�) �ޤ�� URL ( \f2file:///home/user/myproject/src/DocFooter.class\fP �ʤ�) �ǻ��Ǥ��ޤ�� +.RE + +.LP +.LP +��Ȥ��С��Υ��饹��򥳥�ѥ��뤹��Ȥ��ޤ�� .LP .nf \f3 @@ -88,24 +101,24 @@ .LP .LP -\f3javap DocFooter\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� +\f3javap DocFooter.class\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl @@ -114,114 +127,116 @@ .LP .LP -\f3javap \-c DocFooter\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� +\f3javap \-c DocFooter.class\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 + 10: aload_0 .fl - 13 invokevirtual #4 + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 + 20: aload_0 .fl - 23 invokevirtual #4 + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."":()V .fl - 9 getfield #5 + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 + 15: ldc #11 // String by .fl - 17 invokevirtual #10 + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 + 43: return .fl - 43 return +} .fl \fP .fi @@ -284,22 +299,7 @@ �᥽�åɤΥ��å�� \f2locals\fP �� \f2args\fP �ο��Ϥ��ޤ�� .TP 3 \-classpath path -\f3javap\fP ��饹��õ��˻��Ѥ��ѥ��ꤷ�ޤ��ǥե��Ȥޤ�� CLASSPATH �Ķ��ѿ��񤭤��ޤ��ǥ��쥯�ȥ�ϥ��ʬ�䤷�ޤ��äơ�\f2path\fP �ΰ��̷��ϼ��Τ褦�ˤʤ�ޤ�� -.nf -\f3 -.fl - .: -.fl -\fP -.fi -��򼨤��ޤ�� -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +\f3javap\fP ��饹��õ��˻��Ѥ��ѥ��ꤷ�ޤ��ǥե��Ȥޤ�� CLASSPATH �Ķ��ѿ��񤭤��ޤ�� .TP 3 \-bootclasspath path �֡��ȥ��ȥ�åץ��饹��ɤ��ѥ��ꤷ�ޤ��֡��ȥ��ȥ�åץ��饹�ϡ��ǥե��ȤǤ� \f2jre/lib/rt.jar\fP ��¾�Τ��Ĥ�� JAR �ե�� ˤ��롢�� Java 2 �ץ�åȥե��륯�饹�Ǥ�� @@ -309,22 +309,6 @@ .RE .LP -.SH "�Ķ��ѿ�" -.LP -.RS 3 -.TP 3 -CLASSPATH -�桼��饹�ؤΥѥ��򥷥��ƥ�˻��ꤷ�ޤ��ǥ��쥯�ȥ�ϥ��ʬ�䤷�ޤ��򼨤��ޤ�� -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE - -.LP .SH "��Ϣ��" .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/javaws.1 --- a/jdk/src/linux/doc/man/ja/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "14 Apr 2011" +.TH javaws 1 "07 May 2011" .LP .SH "̾��" @@ -81,7 +81,7 @@ \f2\-Xnosplash\fP .LP .LP -�ǽ�Υ��ץ�å��̤�ɽ��̵��ˤ��ޤ�� +��ץ�å��̤�ɽ��ޤ�� .LP .LP \f2\-open \fP @@ -99,7 +99,7 @@ \f2\-online\fP .LP .LP -��饤��⡼�ɤǼ¹Ԥ��ޤ� (�ǥե��Ȥ�ư��)�� +��饤��⡼�ɤ��Ѥ��ޤ� (�ǥե��Ȥ�ư��)�� .LP .LP \f2\-wait\fP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jconsole.1 --- a/jdk/src/linux/doc/man/ja/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "14 Apr 2011" +.TH jconsole 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jdb.1 --- a/jdk/src/linux/doc/man/ja/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "14 Apr 2011" +.TH jdb 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jhat.1 --- a/jdk/src/linux/doc/man/ja/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "14 Apr 2011" +.TH jhat 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jinfo.1 --- a/jdk/src/linux/doc/man/ja/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "14 Apr 2011" +.TH jinfo 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jmap.1 --- a/jdk/src/linux/doc/man/ja/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "14 Apr 2011" +.TH jmap 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jps.1 --- a/jdk/src/linux/doc/man/ja/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "14 Apr 2011" +.TH jps 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jrunscript.1 --- a/jdk/src/linux/doc/man/ja/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "14 Apr 2011" +.TH jrunscript 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jsadebugd.1 --- a/jdk/src/linux/doc/man/ja/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "14 Apr 2011" +.TH jsadebugd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jstack.1 --- a/jdk/src/linux/doc/man/ja/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "14 Apr 2011" +.TH jstack 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jstat.1 --- a/jdk/src/linux/doc/man/ja/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "14 Apr 2011" +.TH jstat 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jstatd.1 --- a/jdk/src/linux/doc/man/ja/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "14 Apr 2011" +.TH jstatd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/jvisualvm.1 --- a/jdk/src/linux/doc/man/ja/jvisualvm.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2008, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jvisualvm 1 "14 Apr 2011" +.TH jvisualvm 1 "07 May 2011" .LP .SH "̾��" @@ -110,7 +110,7 @@ .na \f2Java VisualVM ��ȯ�ԤΥ��\fP @ .fi -https://visualvm.dev.java.net +http://visualvm.java.net .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/keytool.1 --- a/jdk/src/linux/doc/man/ja/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998-2010 keytool tool, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "14 Apr 2011" +.TH keytool 1 "07 May 2011" .LP .SH "̾��" @@ -1087,9 +1087,9 @@ .fl keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<��ο��ѥ����>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<��ȥ��ο��ѥ����>\fP\f3 \-validity 180 .fl \fP .fi @@ -1099,10 +1099,10 @@ ��: ��Υ��ޥ�ɤ� 1 �Ԥ��Ϥ��ʤ��Фʤ�ޤ��ʣ��Ԥ��Ϥ��Ƥ��Τ��ɤߤ䤹��뤿��Ǥ�� .LP .LP -��Ǥϡ�working �ǥ��쥯�ȥ�� mykeystore �Ȥ��̾��Υ��ȥ�� (��ȥ��Ϥޤ�¸�ߤ��Ƥ��ʤ��Ȳ��ꤹ��)��ȥ��˥ѥ���� ab987c ��Ƥޤ��Υڥ��б��륨��ƥ��ƥ��Ρּ��̾�פϡ��̾Τ��Mark Jones�ס��ȿ�ñ�̤��Java�ס��ȿ��Oracle�ס�2 ʸ��ι��ֹ椬��US�פǤ��Υ��Ϥɤ�� 1024 �ӥåȤǡ��κ��ˤϥǥե��Ȥ� DSA ��르�ꥺ��Ѥ��ޤ�� +��Ǥϡ�working �ǥ��쥯�ȥ�� mykeystore �Ȥ��̾��Υ��ȥ�� (��ȥ��Ϥޤ�¸�ߤ��Ƥ��ʤ��Ȳ��ꤹ��)��ȥ��ˡ�\f2<��ȥ��ο��ѥ����>\fP �ǻ��ꤷ��ѥ���� Ƥޤ��Υڥ��б��륨��ƥ��ƥ��Ρּ��̾�פϡ��̾Τ��Mark Jones�ס��ȿ�ñ�̤��Java�ס��ȿ��Oracle�ס�2 ʸ��ι��ֹ椬��US�פǤ��Υ��Ϥɤ�� 1024 �ӥåȤǡ��κ��ˤϥǥե��Ȥ� DSA ��르�ꥺ��Ѥ��ޤ�� .LP .LP -��Υ��ޥ�ɤϡ��ȼ��̾��ޤ༫�ʽ�̾�� (�ǥե��Ȥ� SHA1withDSA ��̾��르�ꥺ��) ��ޤ��ͭ��֤� 180 ��Ǥ�� ϡ��̾��business�פ��ꤵ��륭��ȥ��ȥ��˴�Ϣ�դ��ޤ��ˤϥѥ���ɡ�kpi135�פ��Ƥ��ޤ�� +��Υ��ޥ�ɤϡ��ȼ��̾��ޤ༫�ʽ�̾�� (�ǥե��Ȥ� SHA1withDSA ��̾��르�ꥺ��) ��ޤ��ͭ��֤� 180 ��Ǥ�� ϡ��̾��business�פ��ꤵ��륭��ȥ��ȥ��˴�Ϣ�դ��ޤ��ˤϡ�\f2<��ο��ѥ����>\fP �ǻ��ꤷ��ѥ���ɤ��Ƥ��ޤ�� .LP .LP ��ץ��Υǥե��ͤ�Ȥ��ϡ��˼��ޥ�ɤ��û��뤳�Ȥ��Ǥ��ޤ��ºݤˤϡ��ץ�� 1 �Ĥ��ꤻ��˥��ޥ�ɤ�¹Ԥ��뤳�Ȥ��ǽ�Ǥ�� ǥե��ͤ��ĥ��ץ��Ǥϡ��ץ��ꤷ�ʤ��Хǥե��ͤ��Ȥ�졢ɬ�פ��ͤˤĤ��Ƥ��Ϥ��ޤ��Ȥ��С�ñ�˼��Τ褦��Ϥ��뤳�Ȥ�Ǥ��ޤ�� @@ -1120,7 +1120,7 @@ ��ξ��ϡ�mykey �Ȥ��̾�ǥ��ȥ��ȥ꤬��졢��줿��Υڥ�� 90 ��ͭ��ʾ��񤬤��Υ��ȥ�˳�Ǽ��ޤ��Υ��ȥ�ϡ��ۡ��ǥ��쥯�ȥ�� .keystore �Ȥ��̾��Υ��ȥ��֤��ޤ��Υ��ȥ��ޤ�¸�ߤ��Ƥ��ʤ��ϡ��ޤ��̾��󡢥��ȥ��Υѥ���ɡ��Υѥ���ɤˤĤ��Ƥϡ��Ϥ��ޤ�� .LP .LP -�ʲ��Ǥϡ��ץ��ꤷ�ʤ�� \f2\-genkeypair\fP ��ޥ�ɤ�¹Ԥ��ΤȤ��򼨤��ޤ��Ϥ��줿��ϡ��ǽ�˼�� \f2\-genkeypair\fP ��ޥ�ɤ��ͤ��Ϥ��ΤȤ��ޤ� (��Ȥ��С��Υѥ���ɤˤ� kpi135 �Ȼ��)�� +�ʲ��Ǥϡ��ץ��ꤷ�ʤ�� \f2\-genkeypair\fP ��ޥ�ɤ�¹Ԥ��ΤȤ��򼨤��ޤ��Ϥ��줿��ϡ��ǽ�˼�� \f2\-genkeypair\fP ��ޥ�ɤ��ͤ��Ϥ��ΤȤ��ޤ� (��Ȥ��С��̾�ˤ� cn=Mark Jones, ou=Java, o=Oracle, c=US �Ȼ��)�� .LP .SS ��ȯ�Զɤ��Ф��̾�դ��׵� @@ -1240,14 +1240,14 @@ .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<��ȥ��Υѥ����>\fP\f3 \-deststorepass \fP\f4<��åȥ��ȥ��Υѥ����>\fP\f3 .fl \fP .fi .LP .LP -�ޤ��importkeystore ��ޥ�ɤ�Ȥ��С��륽��ȥ��ñ��Υ��ȥ�򥿡��åȥ��ȥ��˥��ݡ��Ȥ��뤳�Ȥ�Ǥ��ޤ��ξ�硢�嵭��Ǽ��ץ��˲ä��ݡ��оݤȤʤ��̾��ꤹ��ɬ�פ��ޤ��srcalias ��ץ��ꤹ��ˤϡ��å��̾�⥳�ޥ�ɹԤ��Ǥ��ۤ��̩/��ݸ��ѥѥ���ɤ䥿��å��ݸ��ѥѥ���ɤ��Ǥ��ޤ��С��ץ��ץȤΤޤä��ɽ��ʤ� \f3keytool\fP ��ޥ�ɤ�ȯ�ԤǤ��ޤ��ϡ�\f3keytool\fP ��ޥ�ɤ򥹥��ץȥե��˴ޤ��ݤ��Ǥ��򼨤��ޤ�� +�ޤ��importkeystore ��ޥ�ɤ�Ȥ��С��륽��ȥ��ñ��Υ��ȥ�򥿡��åȥ��ȥ��˥��ݡ��Ȥ��뤳�Ȥ�Ǥ��ޤ��ξ�硢�嵭��Ǽ��ץ��˲ä��ݡ��оݤȤʤ��̾��ꤹ��ɬ�פ��ޤ��srcalias ��ץ��ꤹ��ˤϡ��å��̾�⥳�ޥ�ɹԤ��Ǥ��ۤ��̩/��ݸ��ѥѥ���ɤ䥿��å��ݸ��ѥѥ���ɤ��Ǥ��ޤ��ˡ�򼨤��ޥ�ɤ򼡤˼��ޤ�� .LP .nf \f3 @@ -1258,11 +1258,11 @@ .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<��ȥ��Υѥ����>\fP\f3 \-deststorepass \fP\f4<��åȥ��ȥ��Υѥ����>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<��ȥ�Υѥ����>\fP\f3 \-destkeypass \fP\f4<��åȥ��ȥ�Υѥ����>\fP\f3 .fl \-noprompt .fl @@ -1711,7 +1711,7 @@ ��: ��Ǥ��Ȥ��ƾ��򥤥�ݡ��Ȥ��ˡ��Ƥ򿵽Ť�Ĵ�٤Ƥ�� .LP .LP -�ޤ��Ƥ�ɽ�� (\-printcert ��ޥ�ɤ��Ѥ��뤫��ޤ�� \-noprompt ��ץ��ꤷ�ʤ�� \-importcert ��ޥ�ɤ��)�� ɽ��줿��Υե��󥬡��ץ��Ȥ��Ԥ��ե��󥬡��ץ��ȤȰ��פ��뤫�ɤ��ǧ��ޤ��Ȥ��С��桼��Ƥ��ơ��ξ�� /tmp/cert �Ȥ��̾��ǥե��˳�Ǽ��Ƥ��Ȥ��ޤ�� ξ��ϡ��Ǥ��Υꥹ�Ȥˤ��ξ��ɲä��ˡ� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ƥե��󥬡��ץ��Ȥ�ɽ��Ǥ��ޤ��Ȥ��С��Τ褦�ˤ��ޤ�� +�ޤ��Ƥ�ɽ�� (\-printcert ��ޥ�ɤ��Ѥ��뤫��ޤ�� \-noprompt ��ץ��ꤷ�ʤ�� \-importcert ��ޥ�ɤ��)�� ޥ�ɤ��Ѥ�� ɽ��줿��Υե��󥬡��ץ��Ȥ��Ԥ��ե��󥬡��ץ��ȤȰ��פ��뤫�ɤ��ǧ��ޤ��Ȥ��С��桼��Ƥ��ơ��ξ�� /tmp/cert �Ȥ��̾��ǥե��˳�Ǽ��Ƥ��Ȥ��ޤ�� ξ��ϡ��Ǥ��Υꥹ�Ȥˤ��ξ��ɲä��ˡ� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ƥե��󥬡��ץ��Ȥ�ɽ��Ǥ��ޤ��Ȥ��С��Τ褦�ˤ��ޤ�� .LP .nf \f3 @@ -1744,7 +1744,7 @@ ��ˡ��ʪ��Ϣ��ο�ʪ��󼨤��ե��󥬡��ץ��Ȥȡ��Υ��ޥ�ɤ�ɽ��줿�ե��󥬡��ץ��ȤȤ��Ӥ��ޤ��ե��󥬡��ץ��Ȥ��פ��С��Ǥۤ��β��Ԥ� (��Ԥʤ�) �ˤ��Τ��ؤ��Ԥ��Ƥ��ʤ��Ȥ��ǧ�Ǥ��ޤ��Ǥ��μ�ι��⤬�Ԥ��Ƥ��硢��å��Ԥ鷺�˾��򥤥�ݡ��Ȥ��ȡ��Ԥˤ�äƽ�̾��줿��٤ƤΤ�� (��Ū�տޤ��ĥ��饹�ե��ޤ�� JAR �ե��ʤ�) ��ꤹ�뤳�Ȥˤʤ�ޤ�� .LP .LP -��: ��򥤥�ݡ��Ȥ��ɬ�� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ʤ��Фʤ�ʤ��櫓�ǤϤ��ޤ��󡣥��ȥ��ο��Ǥ��Υꥹ�Ȥ˾��ɲä�� \f2\-importcert\fP ��ޥ�ɤ�¹Ԥ��ȡ��ξ��ɽ��졢��ǧ��å��ɽ��ޤ��ݡ��ϡ��λ��ߤǤ��ޤ��ǧ��å��ɽ��Τϡ�\-importcert ��ޥ�ɤ� \-noprompt ��ץ��ꤻ��˼¹Ԥ��Ǥ�� \f2\-noprompt\fP ��ץ��󤬻��ꤵ��Ƥ��硢�桼��Ȥ��äϹԤ��ޤ�� +��: ��򥤥�ݡ��Ȥ��ɬ�� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ʤ��Фʤ�ʤ��櫓�ǤϤ��ޤ��󡣥��ȥ��ο��Ǥ��Υꥹ�Ȥ˾��ɲä�� \f2\-importcert\fP ��ޥ�ɤ�¹Ԥ��ȡ��ξ��ɽ��졢��ǧ��å��ɽ��ޤ��ݡ��ϡ��λ��ߤǤ��ޤ��ǧ��å��ɽ��Τϡ�\-importcert ��ޥ�ɤ� \-noprompt ��ץ��ꤻ��˼¹Ԥ��Ǥ�� ޥ�ɤ��Ѥ�� \f2\-noprompt\fP ��ץ��󤬻��ꤵ��Ƥ��硢�桼��Ȥ��äϹԤ��ޤ�� .LP .SS �ѥ���ɤ˴ؤ��ջ�� diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/native2ascii.1 --- a/jdk/src/linux/doc/man/ja/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "14 Apr 2011" +.TH native2ascii 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/orbd.1 --- a/jdk/src/linux/doc/man/ja/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "14 Apr 2011" +.TH orbd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/pack200.1 --- a/jdk/src/linux/doc/man/ja/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "14 Apr 2011" +.TH pack200 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/policytool.1 --- a/jdk/src/linux/doc/man/ja/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "14 Apr 2011" +.TH policytool 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/rmic.1 --- a/jdk/src/linux/doc/man/ja/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "14 Apr 2011" +.TH rmic 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/rmid.1 --- a/jdk/src/linux/doc/man/ja/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "14 Apr 2011" +.TH rmid 1 "07 May 2011" .LP .SH "̾��" @@ -121,7 +121,7 @@ .LP .LP -ɬ�פ˱��ƥ��ӥ��򳫻Ϥ��褦��ꤹ��ܺ٤ˤĤ��Ƥϡ� \f2inetd\fP (Solaris) �ޤ�� \f2xinetd\fP (Linux) �Υޥ˥奢��ڡ��򻲾Ȥ��Ƥ�� +ɬ�פ˱��ƥ��ӥ��򳫻Ϥ��褦��ꤹ��ܺ٤ˤĤ��Ƥϡ� \f2inetd\fP (Solaris �ξ��)��ޤ�� \f2xinetd\fP (Linux) �Υޥ˥奢��ڡ��򻲾Ȥ��Ƥ�� .LP .SH "��ץ��" .LP @@ -239,7 +239,7 @@ .fl \fP .fi -�ǽ��Ϳ��Ƥ��륢��ϡ� \f2rmid\fP ��Ф��ѥ�̾�ˤ��Ū�˻��ꤵ�� \f2java\fP ��ޥ�ɤ� 1.7.0 �С��μ¹Ԥ��Ĥ��ޤ��ǥե��ȤǤϡ�java.home �ˤ��С�� \f2java\fP ��ޥ�� ( \f2rmid\fP ��Ѥ��Τ�Ʊ��С��) ��Ѥ��뤿�ᡢ��Υ��ޥ�ɤϡ��ݥꥷ��ե��ǻ��ꤹ��ɬ�פϤ��ޤ��2 ��ܤΥ��ϡ� \f2rmid\fP ��Ф��ơ��ǥ��쥯�ȥ� \f2/files/apps/rmidcmds\fP ��Ǥ�դΥ��ޥ�ɤμ¹Ը��¤��Ĥ��ޤ�� +�ǽ��Ϳ��Ƥ��륢��ϡ� \f2rmid\fP ��Ф��ѥ�̾�ˤ��Ū�˻��ꤵ�� \f2java\fP ��ޥ�ɤ� 1.7.0 �С��μ¹Ԥ��Ĥ��ޤ��ǥե��ȤǤϡ�java.home �ˤ��С�� \f2java\fP ��ޥ�ɤ��Ѥ��ޤ�� \f2rmid\fP ��Ѥ��Τ�Ʊ��С��) ��Ѥ��뤿�ᡢ��Υ��ޥ�ɤϡ��ݥꥷ��ե��ǻ��ꤹ��ɬ�פϤ��ޤ��2 ��ܤΥ��ϡ� \f2rmid\fP ��Ф��ơ��ǥ��쥯�ȥ� \f2/files/apps/rmidcmds\fP ��Ǥ�դΥ��ޥ�ɤμ¹Ը��¤��Ĥ��ޤ�� .LP 3 ��ܤ��Ϳ��Ƥ��륢�� \f2ExecOptionPermission\fP �ϡ� \f2rmid\fP ��Ф��ơ��ƥ��ݥꥷ��ե�� \f2/files/policies/group.policy\fP �Ȥ��Ƥ��뵯ư��롼�פγ��Ϥ��Ĥ��ޤ��Υ��ϡ��ư��롼�פ� \f2java.security.debug\fP �ץ��ѥƥ��Ѥ��뤳�Ȥ��Ĥ��Ƥ��ޤ��Ǹ�Υ��ϡ��ư��롼�פ� \f2sun.rmi\fP �Ȥ��ץ��ѥƥ��̾�γ��Ǥ�դΥץ��ѥƥ��Ѥ��뤳�Ȥ��Ĥ��Ƥ��ޤ�� .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/rmiregistry.1 --- a/jdk/src/linux/doc/man/ja/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "14 Apr 2011" +.TH rmiregistry 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/schemagen.1 --- a/jdk/src/linux/doc/man/ja/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "14 Apr 2011" +.TH schemagen 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/serialver.1 --- a/jdk/src/linux/doc/man/ja/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "14 Apr 2011" +.TH serialver 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/servertool.1 --- a/jdk/src/linux/doc/man/ja/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "14 Apr 2011" +.TH servertool 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/tnameserv.1 --- a/jdk/src/linux/doc/man/ja/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "14 Apr 2011" +.TH tnameserv 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/unpack200.1 --- a/jdk/src/linux/doc/man/ja/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "14 Apr 2011" +.TH unpack200 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/wsgen.1 --- a/jdk/src/linux/doc/man/ja/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "14 Apr 2011" +.TH wsgen 1 "07 May 2011" .SH "̾��" wsgen \- XML Web Services (JAX\-WS) 2.0 �Τ�� Java(TM) API .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/wsimport.1 --- a/jdk/src/linux/doc/man/ja/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "14 Apr 2011" +.TH wsimport 1 "07 May 2011" .SH "̾��" wsimport \- XML Web Services (JAX\-WS) 2.0 �Τ�� Java(TM) API .LP @@ -818,7 +818,7 @@ .ll \n(34u*1u/3u .if \n(.l<\n(81 .ll \n(81u .in 0 -ǧ�ھ��ޤ�ե��ꤹ�� WSDL URI �Ǥ�� URI �η��ϼ��ΤȤ��Ǥ� http://username:password@example.org/stock?wsdl +ǧ�ھ��ޤ�ե��ꤹ�� WSDL URI �Ǥ�� URI �η��ϼ��ΤȤ��Ǥ� http://\f2<�桼��̾>\fP:\f2<�ѥ����>\fP@\f2<�ۥ��̾>\fP/\f2\fP?wsdl .br .di .nr b| \n(dn @@ -1057,10 +1057,10 @@ .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -Java ��ƥ��ե��Ȥ�� \f2http://stockquote.xyz/quote?wsdl\fP �򥤥�ݡ��Ȥ��뤳�Ȥǡ��Υ��ƥ��ե��Ȥ򥳥�ѥ��뤷�ޤ�� +Java ��ƥ��ե��Ȥ�� \f2http://stockquote.example.com/quote?wsdl\fP �򥤥�ݡ��Ȥ��Ƥ�� Java ��ƥ��ե��Ȥ򥳥�ѥ��뤷�ޤ� .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/ja/xjc.1 --- a/jdk/src/linux/doc/man/ja/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/ja/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "14 Apr 2011" +.TH xjc 1 "07 May 2011" .LP .ad c diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jar.1 --- a/jdk/src/linux/doc/man/jar.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jar.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,17 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jar 1 "02 Jun 2010" +.TH jar 1 "10 May 2011" .LP .SH "Name" jar\-The Java Archive Tool .LP -\f3jar\fP combines multiple files into a single JAR archive file. +\f3jar\fP combines multiple files into a single JAR archive file. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 Create jar file @@ -53,9 +51,6 @@ where: .LP .RS 3 - -.LP -.RS 3 .TP 3 cuxtiv0Mmfe Options that control the \f2jar\fP command. @@ -80,11 +75,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the .na \f2ZLIB\fP @ @@ -93,9 +85,6 @@ .LP Typical usage to combine files into a jar file is: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -103,20 +92,16 @@ .fl \fP .fi -.RE .LP In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the .na \f2JAR file specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. .LP If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -124,7 +109,6 @@ .fl \fP .fi -.RE .LP An existing manifest file must end with a new line character.\ \f3jar\fP does not parse the last line of a manifest file if it does not end with a new line character. @@ -135,9 +119,6 @@ .LP \f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file: -.RS 3 - -.LP .nf \f3 .fl @@ -145,16 +126,12 @@ .fl \fP .fi -.RE .LP The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents. .LP To extract the files from a jar file, use \f2x\fP: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -162,15 +139,11 @@ .fl \fP .fi -.RE .LP .LP To extract individual files from a jar file, supply their filenames: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -178,7 +151,6 @@ .fl \fP .fi -.RE .LP .LP @@ -186,10 +158,7 @@ .na \f2JarIndex\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest. -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest. .LP .nf \f3 @@ -198,7 +167,6 @@ .fl \fP .fi -.RE .LP .LP @@ -210,9 +178,6 @@ .br To copy directories, first compress files in \f2dir1\fP to \f2stdout\fP, then extract from \f2stdin\fP to \f2dir2\fP (omitting the \f2\-f\fP option from both \f2jar\fP commands): .LP -.RS 3 - -.LP .nf \f3 .fl @@ -220,7 +185,6 @@ .fl \fP .fi -.RE .LP .LP @@ -228,12 +192,10 @@ .na \f2Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar. +http://download.oracle.com/javase/tutorial/deployment/jar. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 c @@ -241,9 +203,6 @@ .TP 3 u Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example: -.RS 3 - -.LP .nf \f3 .fl @@ -251,11 +210,7 @@ .fl \fP .fi -.RE would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example: -.RS 3 - -.LP .nf \f3 .fl @@ -263,7 +218,6 @@ .fl \fP .fi -.RE updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP. .TP 3 x @@ -274,9 +228,6 @@ .TP 3 i Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example: -.RS 3 - -.LP .nf \f3 .fl @@ -284,9 +235,8 @@ .fl \fP .fi -.RE .LP -would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example. +would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example. .TP 3 f Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u). @@ -301,12 +251,10 @@ Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u). .TP 3 m -Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value. -.LP +Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value. +.br +.br On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use: -.RS 3 - -.LP .nf \f3 .fl @@ -314,22 +262,18 @@ .fl \fP .fi -.RE You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the .na \f2JAR Files\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option. -.LP +http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option. .TP 3 e Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file. .br .br +.br For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -337,12 +281,7 @@ .fl \fP .fi -.RE -.LP The java runtime can directly invoke this application by running the following command: -.RS 3 - -.LP .nf \f3 .fl @@ -350,11 +289,7 @@ .fl \fP .fi -.RE If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways: -.RS 3 - -.LP .nf \f3 .fl @@ -362,11 +297,7 @@ .fl \fP .fi -.RE or -.RS 3 - -.LP .nf \f3 .fl @@ -374,18 +305,13 @@ .fl \fP .fi -.RE -\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted. -.LP +\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted. .TP 3 -\-C \ dir +\-C\ dir Temporarily changes directories (\f2cd\fP\ \f2dir\fP) during execution of the \f2jar\fP command while processing the following \f2inputfiles\fP argument. Its operation is intended to be similar to the \f2\-C\fP option of the UNIX \f2tar\fP utility. .br .br For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -393,11 +319,7 @@ .fl \fP .fi -.RE This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP. -.RS 3 - -.LP .nf \f3 .fl @@ -405,11 +327,7 @@ .fl \fP .fi -.RE If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -425,7 +343,6 @@ .fl \fP .fi -.RE .LP .TP 3 \-Joption @@ -435,8 +352,6 @@ .LP .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system. .LP An argument file can include options and filenames. The arguments within a file can be space\-separated or newline\-separated. Filenames within an argument file are relative to the current directory, not relative to the location of the argument file. Wildcards (*) that might otherwise be expanded by the operating system shell are not expanded. Use of the \f2@\fP character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. @@ -447,24 +362,17 @@ .br The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command: .LP -.RS 3 - -.LP .nf \f3 .fl % find \fP\f3.\fP \-name '*.class' \-print > classes.list .fl .fi -.RE .LP .LP You can then execute the \f2jar\fP command on \f2Classes.list\fP by passing it to \f2jar\fP using argfile syntax: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -472,13 +380,9 @@ .fl \fP .fi -.RE .LP An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example: -.RS 3 - -.LP .nf \f3 .fl @@ -486,7 +390,6 @@ .fl \fP .fi -.RE .LP .LP @@ -494,12 +397,7 @@ .LP .SH "EXAMPLES" .LP - -.LP To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date. -.RS 3 - -.LP .nf \f3 .fl @@ -535,13 +433,9 @@ .fl \fP .fi -.RE .LP If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file: -.RS 3 - -.LP .nf \f3 .fl @@ -585,13 +479,9 @@ .fl \fP .fi -.RE .LP To see the entry names in the jarfile, use the \f2t\fP option: -.RS 3 - -.LP .nf \f3 .fl @@ -619,7 +509,6 @@ .fl \fP .fi -.RE .LP .LP @@ -630,9 +519,6 @@ .br .LP -.RS 3 - -.LP If you split the inter\-dependent classes for a stock trade application into three jar files: \f2main.jar\fP, \f2buy.jar\fP, and \f2sell.jar\fP. .br @@ -660,38 +546,34 @@ .fi .LP -An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources. -.RE +An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources. .SH "SEE ALSO" .LP - .LP .na \f2The Jar Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jarGuide.html -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html +.LP .LP .na \f2The Jar File Specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html +.LP .LP .na \f2The JarIndex Spec\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index +.LP .LP .na \f2Jar Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar on the Java Software web site. -.br - +http://download.oracle.com/javase/tutorial/deployment/jar/index.html +.LP .LP -pack200(1) +pack200(1) +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jarsigner.1 --- a/jdk/src/linux/doc/man/jarsigner.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jarsigner.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jarsigner 1 "02 Jun 2010" +.TH jarsigner 1 "10 May 2011" .LP .SH "Name" jarsigner \- JAR Signing and Verification Tool .LP -.RS 3 - -.LP .LP Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -51,8 +45,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jarsigner\fP tool is used for two purposes: .LP @@ -109,9 +101,6 @@ .SS Keystore Aliases .LP -.RS 3 - -.LP .LP All keystore entities are accessed via unique \f2aliases\fP. .LP @@ -121,37 +110,29 @@ .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4\fP\f3 .fl - \-keypass dukekeypasswd MyJARFile.jar duke + \-keypass \fP\f4\fP\f3 MyJARFile.jar duke .fl \fP .fi .LP .LP -Keystores are protected with a password, so the store password (in this case "myspass") must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password (in this case "dukekeypasswd") must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password. +Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password. .LP -.RE .SS Keystore Location .LP -.RS 3 - -.LP .LP \f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory. .LP .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device. .LP -.RE .SS Keystore Implementation .LP -.RS 3 - -.LP .LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP @@ -166,13 +147,13 @@ .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP .LP Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP .LP For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu. @@ -227,41 +208,36 @@ .na \f2KeyTool and JarSigner\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details. +http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details. .LP -.RE .SS Supported Algorithms .LP -.RS 3 - .LP -.LP -By default, \f3jarsigner\fP signs a JAR file using either +By default, \f3jarsigner\fP signs a JAR file using one of the following: .LP .RS 3 .TP 2 o -DSA (Digital Signature Algorithm) with the SHA\-1 digest algorithm, or +DSA (Digital Signature Algorithm) with the SHA1 digest algorithm .TP 2 o -the RSA algorithm with the SHA\-256 digest algorithm. +RSA algorithm with the SHA256 digest algorithm. +.TP 2 +o +EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm). .RE .LP .LP -That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. +That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm. .LP .LP These default signature algorithms can be overridden using the \f2\-sigalg\fP option. .LP -.RE .SS The Signed JAR File .LP -.RS 3 - -.LP .LP When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory: .LP @@ -271,7 +247,7 @@ a signature file, with a .SF extension, and .TP 2 o -a signature block file, with a .DSA extension. +a signature block file, with a .DSA, .RSA, or .EC extension. .RE .LP @@ -281,23 +257,20 @@ .nf \f3 .fl - \-sigFile MKSIGN +\-sigFile MKSIGN .fl \fP .fi .LP .LP -the files are named "MKSIGN.SF" and "MKSIGN.DSA". +The files are named "MKSIGN.SF" and "MKSIGN.DSA". .LP .LP If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens. .LP \f3The Signature (.SF) File\fP .LP -.RS 3 - -.LP .LP A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following: .LP @@ -320,25 +293,14 @@ .LP The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification. .LP -.RE -\f3The Signature Block (.DSA) File\fP -.LP -.RS 3 - +\f3The Signature Block File\fP .LP -.LP -The .SF file is signed and the signature is placed in the .DSA file. The .DSA file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. -.LP -.RE -.RE +The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used. .SS Signature Timestamp .LP -.RS 3 - .LP -.LP -\f2jarsigner\fP tool can now generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options: +\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options: .LP .RS 3 .TP 2 @@ -359,31 +321,31 @@ .LP Each of these options is detailed in the Options section below. .LP -.RE .SS JAR File Verification .LP -.RS 3 - -.LP .LP A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps: .LP .RS 3 .TP 3 1. -Verify the signature of the .SF file itself. -.LP -That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with. +Verify the signature of the .SF file itself. +.br +.br +That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with. .TP 3 2. -Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest. -.LP -The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step. -.LP -If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File). -.LP -One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file. +Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest. +.br +.br +The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step. +.br +.br +If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File). +.br +.br +One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file. .TP 3 3. Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails. @@ -393,13 +355,9 @@ .LP If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP. .LP -.RE .SS Multiple Signatures for a JAR File .LP -.RS 3 - -.LP .LP A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in: .LP @@ -435,11 +393,8 @@ .LP Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP. .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The various \f3jarsigner\fP options are listed and described below. Note: .LP @@ -462,12 +417,15 @@ .RS 3 .TP 3 \-keystore url -Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property. -.LP -A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default). -.LP -A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore. -.LP +Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property. +.br +.br +A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default). +.br +.br +A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore. +.br +.br Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is, .nf \f3 @@ -494,79 +452,93 @@ \f2\-storetype PKCS11\fP .RE For example, this command lists the contents of the configured PKCS#11 token: -.RS 3 - -.LP .nf \f3 .fl jarsigner \-keystore NONE \-storetype PKCS11 \-list .fl - -.fl \fP .fi -.RE .TP 3 \-storetype storetype -Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP. -.LP -The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified. +Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP. +.br +.br +The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified. .TP 3 -\-storepass password -Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password. -.LP -Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. +\-storepass[:env | :file] argument +Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password. +.br +.br +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. .TP 3 -\-keypass password -Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it. -.LP -Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. Also, when typing in a password at the password prompt, the password is echoed (displayed exactly as typed), so be careful not to type it in front of anyone. +\-keypass[:env | :file] argument +Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it. +.br +.br +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. .TP 3 \-sigfile file -Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file. -.LP -The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names. -.LP -If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. +Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file. +.br +.br +The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names. +.br +.br +If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. .TP 3 \-sigalg algorithm -.RS 3 - -.LP -Specifies the name of the signature algorithm to use to sign the JAR file. -.LP +Specifies the name of the signature algorithm to use to sign the JAR file. +.br +.br See .na \f2Appendix A\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA or SHA256withRSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. -.LP -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. .TP 3 \-digestalg algorithm -.RS 3 -Specifies the name of the message digest algorithm to use when digesting the entries of a jar file. -.LP +Specifies the name of the message digest algorithm to use when digesting the entries of a jar file. +.br +.br See .na \f2Appendix A\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA\-256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. -.LP -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. .TP 3 \-signedjar file -Specifies the name to be used for the signed JAR file. -.LP -If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file. +Specifies the name to be used for the signed JAR file. +.br +.br +If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file. .TP 3 \-verify -If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)" -.LP -It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both. -.LP -For further information on verification, see JAR File Verification. +If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)" +.br +.br +It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both. +.br +.br +For further information on verification, see JAR File Verification. .TP 3 \-certs If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes @@ -578,7 +550,6 @@ o if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer .RE -.LP The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed: .RS 3 .TP 2 @@ -596,26 +567,25 @@ In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP .TP 3 \-sectionsonly -If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File . -.LP -By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file. -.LP -For further information, see JAR File Verification. -.LP -\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP +If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File . +.br +.br +By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file. +.br +.br +For further information, see JAR File Verification. +.br +.br +\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP .TP 3 \-protected Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. -.RE -.RS 3 .TP 3 -\-provider provider\-class\-name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP. -.LP +\-providerClass provider\-class\-name +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP. +.br +.br Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file. -.RS 3 - -.LP .nf \f3 .fl @@ -629,19 +599,16 @@ .fl \fP .fi -.RE .TP 3 \-providerName providerName -If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider. -.LP +If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider. +.br +.br For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the .na \f2configuration attributes table\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: .nf \f3 .fl @@ -653,58 +620,59 @@ .fl \fP .fi -.RE .TP 3 \-Jjavaoption -Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. -.LP +Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .TP 3 \-tsa url -If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore. -.LP +If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore. +.br +.br To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in .na \f2RFC 3161\fP @ .fi -http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file. -.LP +http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file. .TP 3 \-tsacert alias -If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA. -.LP -The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP. -.LP +If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA. +.br +.br +The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP. .TP 3 \-altsigner class -Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism. -.LP -For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP -.LP +Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism. +.br +.br +For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP .TP 3 \-altsignerpath classpathlist -Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below. -.LP -An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path. -.LP +Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below. +.br +.br +An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path. +.br +.br Example of specifying the path to a jar file that contains the class file: -.RS 3 - -.LP -.LP -\f2\-altsignerpath /home/user/lib/authsigner.jar\fP -.LP -.RE -.LP -Note that the JAR file name is included. -.LP +.nf +\f3 +.fl +\-altsignerpath /home/user/lib/authsigner.jar +.fl +\fP +.fi +Note that the JAR file name is included. +.br +.br Example of specifying the path to the jar file that contains the class file: -.RS 3 -.LP -\f2\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP -.LP -.RE -.LP -Note that the JAR file name is omitted. +.nf +\f3 +.fl +\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/ +.fl +\fP +.fi +Note that the JAR file name is omitted. .TP 3 \-strict During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details. @@ -712,25 +680,22 @@ \-verbose:sub\-options For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information. .RE -.SH "EXAMPLES" + .LP - +.SH "EXAMPLES" .LP .SS Signing a JAR File .LP -.RS 3 - .LP -.LP -Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. Suppose the keystore password is "myspass" and the password for \f2jane\fP's private key is "j638klm". You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar": +Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar": .LP .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4\fP\f3 .fl - \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane + \-keypass \fP\f4\fP\f3 \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -747,7 +712,7 @@ .fl jarsigner \-keystore /working/mystore .fl - \-signedjar sbundle.jar bundle.jar jane + \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -759,7 +724,7 @@ .nf \f3 .fl - jarsigner \-signedjar sbundle.jar bundle.jar jane + jarsigner \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -771,26 +736,22 @@ .nf \f3 .fl - jarsigner bundle.jar jane + jarsigner bundle.jar jane .fl \fP .fi -.RE .LP .SS Verifying a Signed JAR File .LP -.RS 3 - -.LP .LP To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following: .LP .nf \f3 .fl - jarsigner \-verify sbundle.jar + jarsigner \-verify sbundle.jar .fl \fP .fi @@ -851,7 +812,7 @@ Verification with Certificate Information .LP .LP -If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (iff it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example, +If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example, .LP .nf \f3 @@ -961,11 +922,8 @@ .LP Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias. .LP -.RE .SH "WARNINGS" .LP - -.LP During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows: .nf \f3 @@ -980,25 +938,25 @@ .fl This jar contains entries whose signer certificate has expired. .fl - + .fl notYetValidCert 4 .fl This jar contains entries whose signer certificate is not yet valid. .fl - + .fl chainNotValidated 4 .fl This jar contains entries whose certificate chain cannot be correctly validated. .fl - + .fl badKeyUsage 8 .fl This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing. .fl - + .fl badExtendedKeyUsage 8 .fl @@ -1006,33 +964,33 @@ .fl doesn't allow code signing. .fl - + .fl badNetscapeCertType 8 .fl - This jar contains entries whose signer certificate's NetscapeCertType extension + This jar contains entries whose signer certificate's NetscapeCertType extension .fl doesn't allow code signing. .fl - + .fl hasUnsignedEntry 16 .fl This jar contains unsigned entries which have not been integrity\-checked. .fl - + .fl notSignedByAlias 32 .fl This jar contains signed entries which are not signed by the specified alias(es) .fl - + .fl aliasNotInStore 32 .fl This jar contains signed entries that are not signed by alias in this keystore .fl - + .fl \fP .fi @@ -1042,24 +1000,20 @@ When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned. .LP .LP -\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the exit code +\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned: .LP .nf \f3 .fl -failure 1 +failure 1 .fl \fP .fi .LP -will be returned. .SS Compatibility with JDK 1.1 .LP -.RS 3 - -.LP .LP The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them. .LP @@ -1083,7 +1037,6 @@ The following table explains how JAR files that were signed in JDK 1.1.x are treated in the Java 2 platform. .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -1390,7 +1343,7 @@ .nr 44 \n(83+(3*\n(38) .nr 84 +\n(44 .nr TW \n(84 -.if t .if \n(TW>\n(.li .tm Table at line 1128 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1566,7 +1519,6 @@ .rm g+ .rm h+ .rm i+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-42 .LP @@ -1591,8 +1543,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o @@ -1606,13 +1556,12 @@ .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool +http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool .RE .LP -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/java.1 --- a/jdk/src/linux/doc/man/java.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/java.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH java 1 "02 Jun 2010" +.TH java 1 "10 May 2011" .LP .SH "Name" @@ -38,9 +38,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -56,11 +53,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method. .LP @@ -70,7 +64,7 @@ .nf \f3 .fl - public static void main(String args[]) +public static void main(String args[]) .fl \fP .fi @@ -87,76 +81,79 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases. .LP .SH "Standard Options" .LP - -.LP .RS 3 .TP 3 \-client -.LP -Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM. -.LP +Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM. +.br +.br +For default VM selection, see +.na +\f2Server\-Class Machine Detection\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html +.TP 3 +\-server +Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit. +.br +.br For default VM selection, see .na \f2Server\-Class Machine Detection\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html -.TP 3 -\-server -.LP -Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit. -.LP -For default VM selection, see -.na -\f2Server\-Class Machine Detection\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html +http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html .TP 3 \-agentlib:libname[=options] -Load native agent library \f2libname\fP, e.g. -.LP -\-agentlib:hprof -.LP -\-agentlib:jdwp=help -.LP -\-agentlib:hprof=help -.LP +Load native agent library \f2libname\fP, e.g. +.br +.br +\-agentlib:hprof +.br +.br +\-agentlib:jdwp=help +.br +.br +\-agentlib:hprof=help +.br +.br For more information, see .na \f2JVMTI Agent Command Line Options\fP @ .fi -http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting. +http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. .TP 3 \-agentpath:pathname[=options] Load a native agent library by full pathname. For more information, see .na \f2JVMTI Agent Command Line Options\fP @ .fi -http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting. +http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. .TP 3 \-classpath classpath .TP 3 \-cp classpath -Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable. -.LP +Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable. +.br +.br If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP). -.LP +.br +.br As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. -.LP +.br +.br For more information on class paths, see .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath. +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. .TP 3 \-Dproperty=value Set a system property value. @@ -164,19 +161,23 @@ \-d32 .TP 3 \-d64 -Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported. -.LP -Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release. -.LP -If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. +Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported. +.br +.br +Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release. +.br +.br +If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. .TP 3 \-enableassertions[:"..." | : ] .TP 3 \-ea[:"..." | : ] -Enable assertions. Assertions are disabled by default. -.LP -With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class. -.LP +Enable assertions. Assertions are disabled by default. +.br +.br +With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class. +.br +.br If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: .nf \f3 @@ -185,26 +186,26 @@ .fl \fP .fi -.LP -The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. +The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. .TP 3 \-disableassertions[:"..." | : ] .TP 3 \-da[:"..." | : ] -Disable assertions. This is the default. -.LP -With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class. -.LP +Disable assertions. This is the default. +.br +.br +With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class. +.br +.br To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used: .nf \f3 .fl -java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat

+java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4

\fP\f3 .fl \fP .fi -.LP -The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. +The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. .TP 3 \-enablesystemassertions .TP 3 @@ -215,29 +216,36 @@ .TP 3 \-dsa Disables asserts in all system classes. -.LP .TP 3 \-jar Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the .na \f2Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar for information about working with Jar files and Jar\-file manifests. -.LP -When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored. -.LP +http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests. +.br +.br +When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored. +.br +.br Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to .na \f2Java Archive (JAR) Files\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/index.html. +http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html. .TP 3 \-javaagent:jarpath[=options] Load a Java programming language agent, see .na \f2java.lang.instrument\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/lang/instrument/package\-summary.html. +http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. +.TP 3 +\-jre\-restrict\-search +Include user\-private JREs in the version search. +.TP 3 +\-no\-jre\-restrict\-search +Exclude user\-private JREs in the version search. .TP 3 \-verbose .TP 3 @@ -254,8 +262,9 @@ Display version information and exit. .TP 3 \-version:release -Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used. -.LP +Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used. +.br +.br \f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example: .nf \f3 @@ -264,11 +273,13 @@ .fl \fP .fi -The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56). -.LP -For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line. -.LP -See the following NOTES section for important policy information on the use of this option. +The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56). +.br +.br +For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line. +.br +.br +See the following NOTES section for important policy information on the use of this option. .TP 3 \-showversion Display version information and continue. @@ -278,6 +289,9 @@ \-help Display usage information and exit. .TP 3 +\-splash:imagepath +Show splash screen with image specified by \f2imagepath\fP. +.TP 3 \-X Display information about non\-standard options and exit. .RE @@ -287,9 +301,6 @@ Non\-Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Xint Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. @@ -319,18 +330,20 @@ Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. .TP 3 \-Xloggc:file -Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event. -.LP -Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. -.LP +Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event. +.br +.br +Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. .TP 3 \-Xmsn -Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics +Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see +.na +\f2HotSpot Ergonomics\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html +.br .br Examples: -.RS 3 - -.LP .nf \f3 .fl @@ -340,19 +353,20 @@ .fl \-Xms6m .fl - + .fl \fP .fi -.RE .TP 3 \-Xmxn -Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics +Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see +.na +\f2HotSpot Ergonomics\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html +.br .br Examples: -.RS 3 - -.LP .nf \f3 .fl @@ -362,28 +376,31 @@ .fl \-Xmx80m .fl - + .fl \fP .fi -.RE On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts. .TP 3 \-Xprof Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems. -.LP .TP 3 \-Xrs -Reduces use of operating\-system signals by the Java virtual machine (JVM). -.LP -In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly. -.LP -Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks. -.LP -The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps. -.LP -Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed. -.LP +Reduces use of operating\-system signals by the Java virtual machine (JVM). +.br +.br +In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly. +.br +.br +Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks. +.br +.br +The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps. +.br +.br +Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed. +.br +.br There are two consequences of specifying \f3\-Xrs\fP: .RS 3 .TP 2 @@ -402,12 +419,11 @@ .RE .LP -.RE .SH "NOTES" .LP - .LP -The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: +The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: +.LP .RS 3 .TP 3 1. @@ -422,8 +438,7 @@ .fl \fP .fi -.LP -Would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. +This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. .TP 3 3. A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example: @@ -448,10 +463,23 @@ .RE .LP -.SH "SEE ALSO" +.SH "EXIT STATUS" +.LP +.LP +The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. .LP +.RS 3 +.TP 2 +o +\f20\fP: Successful completion +.TP 2 +o +\f2>0\fP: An error occurred +.RE .LP +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -470,13 +498,13 @@ .na \f2The Java Extensions Framework\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html .TP 2 o .na \f2Security Features\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/index.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html. .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javac.1 --- a/jdk/src/linux/doc/man/javac.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javac.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javac 1 "02 Jun 2010" +.TH javac 1 "10 May 2011" .LP .SH "Name" @@ -27,14 +27,12 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl \fP\f3javac\fP [ options ] [ sourcefiles ] [ classes ] [ @argfiles ] .fl - + .fl .fi @@ -43,9 +41,6 @@ Arguments may be in any order. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -61,11 +56,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f3javac\fP tool reads class and interface definitions, written in the Java programming language, and compiles them into bytecode class files. It can also process annotations in Java source files and classes. .LP @@ -96,8 +88,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The compiler has a set of standard options that are supported on the current development environment and will be supported in future releases. An additional set of non\-standard options are specific to the current virtual machine and compiler implementations and are subject to change in the future. Non\-standard options begin with \f3\-X\fP. .LP @@ -105,28 +95,18 @@ Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Akey[=value] Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".". .TP 3 \-cp path or \-classpath path -Specify where to find user class files, and (optionally) annotation processors and source files. This classpath overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See -.na -\f2Setting the Class Path\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath for more details. -.LP -If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files. -.LP -If the \f3\-processorpath\fP option is not specified, the classpath is also searched for annotation processors. -.LP -As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP. +Specify where to find user class files, and (optionally) annotation processors and source files. This class path overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See Setting the Class Path for more details. .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. \f3Note:\fP \ Depending of the configuration of your command line environment, you may have to quote the wild card character, for example, \f2javac \-cp "*.jar" MyClass.java\fP. +>If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files. +.br +.br +If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors. .TP 3 \-Djava.ext.dirs=directories Override the location of installed extensions. @@ -135,17 +115,28 @@ Override the location of endorsed standards path. .TP 3 \-d directory -Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP. -.LP -If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated. -.LP -\f3Note:\fP \ The directory specified by \f3\-d\fP is not automatically added to your user class path. +Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP. +.br +.br +If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated. +.br +.br +\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path. .TP 3 \-deprecation Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP. .TP 3 \-encoding encoding -Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used. +Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used. +.TP 3 +\-endorseddirs directories +Override the location of endorsed standards path. +.TP 3 +\-extdirs directories +Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path. +.br +.br +If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information. .TP 3 \-g Generate all debugging information, including local variables. By default, only line number and source file information is generated. @@ -171,7 +162,13 @@ Print a synopsis of standard options. .TP 3 \-implicit:{class,none} -Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types. +Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types. +.TP 3 +\-Joption +Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. +.br +.br +\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. .TP 3 \-nowarn Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP. @@ -183,7 +180,7 @@ Names of the annotation processors to run. This bypasses the default discovery process. .TP 3 \-processorpath path -Specify where to find annotation processors; if this option is not used, the classpath will be searched for processors. +Specify where to find annotation processors; if this option is not used, the class path will be searched for processors. .TP 3 \-s dir Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP. @@ -218,41 +215,42 @@ .RE .TP 3 \-sourcepath sourcepath -Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name. -.LP -\f3Note:\fP \ Classes found through the classpath may be subject to automatic recompilation if their sources are also found. See Searching For Types. +Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name. +.br +.br +\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types. .TP 3 \-verbose Verbose output. This includes information about each class loaded and each source file compiled. .TP 3 \-version -Print version information. +Print version information. +.TP 3 +\-Werror +Terminate compilation if warnings occur. .TP 3 \-X Display information about non\-standard options and exit. .RE .LP -.RE .SS Cross\-Compilation Options .LP -.RS 3 - -.LP .LP By default, classes are compiled against the bootstrap and extension classes of the platform that \f3javac\fP shipped with. But \f3javac\fP also supports \f2cross\-compiling\fP, where classes are compiled against a bootstrap and extension classes of a different Java platform implementation. It is important to use \f3\-bootclasspath\fP and \f3\-extdirs\fP when cross\-compiling; see Cross\-Compilation Example below. .LP .RS 3 .TP 3 \-target version -Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP). -.LP +Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP). +.br +.br The default for \f3\-target\fP depends on the value of \f3\-source\fP: .RS 3 .TP 2 o -If \-source is \f3not specified\fP, the value of \-target is \f31.6\fP +If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP .TP 2 o If \-source is \f31.2\fP, the value of \-target is \f31.4\fP @@ -261,25 +259,18 @@ If \-source is \f31.3\fP, the value of \-target is \f31.4\fP .TP 2 o -For \f3all other values\fP of \-source, the value of \-target is the value of \f3\-source\fP. +For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP. .RE .TP 3 \-bootclasspath bootclasspath Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. -.TP 3 -\-extdirs directories -Cross\-compile against the specified extension directories. \f2Directories\fP is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. .RE .LP -.RE .SS Non\-Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Xbootclasspath/p:path Prepend to the bootstrap class path. @@ -291,54 +282,19 @@ Override location of bootstrap class files. .TP 3 \-Xlint -Enable all recommended warnings. In this release, all available warnings are recommended. +Enable all recommended warnings. In this release, enabling all available warnings is recommended. +.TP 3 +\-Xlint:all +Enable all recommended warnings. In this release, enabling all available warnings is recommended. .TP 3 \-Xlint:none -Disable all warnings not mandated by the Java Language Specification. +Disable all warnings. +.TP 3 +\-Xlint:name +Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option. .TP 3 \-Xlint:\-name -Disable warning \f2name\fP, where \f2name\fP is one of the warning names supported for \f3\-Xlint:\fP\f2name\fP, below. -.TP 3 -\-Xlint:unchecked -Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. -.TP 3 -\-Xlint:path -Warn about nonexistent path (classpath, sourcepath, etc) directories. -.TP 3 -\-Xlint:serial -Warn about missing \f2serialVersionUID\fP definitions on serializable classes. -.TP 3 -\-Xlint:finally -Warn about \f2finally\fP clauses that cannot complete normally. -.TP 3 -\-Xlint:fallthrough -Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement: -.RS 3 - -.LP -.nf -\f3 -.fl -switch (x) { -.fl -case 1: -.fl - System.out.println("1"); -.fl - // No break; statement here. -.fl -case 2: -.fl - System.out.println("2"); -.fl -} -.fl - -.fl -\fP -.fi -.RE -If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question. +Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option. .TP 3 \-Xmaxerrs number Set the maximum number of errors to print. @@ -350,7 +306,10 @@ Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP. .TP 3 \-Xprefer:{newer,source} -Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP. +Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP. +.TP 3 +\-Xpkginfo:{always,legacy,nonempty} +Specify handling of package\-info files .TP 3 \-Xprint Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change. @@ -363,27 +322,420 @@ .RE .LP -.RE .SS -The \-J Option +Warnings That Can Be Enabled or Disabled with \-Xlint Option .LP -.RS 3 - +.LP +Enable warning \f2name\fP with the option \f3\-Xlint:\fP\f2name\fP, where \f2name\fP is one of the following warning names. Similarly, you can disable warning \f2name\fP with the option \f3\-Xlint:\-\fP\f2name\fP: .LP .RS 3 .TP 3 -\-Joption -Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f3\-X\fP, it is not a `standard option' of \f3javac\fP. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. -.LP -\f3Note:\fP \ \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. +cast +Warn about unnecessary and redundant casts. For example: +.nf +\f3 +.fl +String s = (String)"Hello!" +.fl +\fP +.fi +.TP 3 +classfile +Warn about issues related to classfile contents. +.TP 3 +deprecation +Warn about use of deprecated items. For example: +.nf +\f3 +.fl + java.util.Date myDate = new java.util.Date(); +.fl + int currentDay = myDate.getDay(); +.fl +\fP +.fi +The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1. +.TP 3 +dep\-ann +Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example: +.nf +\f3 +.fl + /** +.fl + * @deprecated As of Java SE 7, replaced by {@link #newMethod()} +.fl + */ +.fl + +.fl + public static void deprecatedMethood() { } +.fl + +.fl + public static void newMethod() { } +.fl +\fP +.fi +.TP 3 +divzero +Warn about division by constant integer 0. For example: +.nf +\f3 +.fl + int divideByZero = 42 / 0; +.fl +\fP +.fi +.TP 3 +empty +Warn about empty statements after \f2if\fP statements. For example: +.nf +\f3 +.fl +class E { +.fl + void m() { +.fl + if (true) ; +.fl + } +.fl +} +.fl +\fP +.fi +.TP 3 +fallthrough +Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement: +.nf +\f3 +.fl +switch (x) { +.fl +case 1: +.fl + System.out.println("1"); +.fl + // No break statement here. +.fl +case 2: +.fl + System.out.println("2"); +.fl +} +.fl +\fP +.fi +If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question. +.TP 3 +finally +Warn about \f2finally\fP clauses that cannot complete normally. For example: +.nf +\f3 +.fl + public static int m() { +.fl + try { +.fl + throw new NullPointerException(); +.fl + } catch (NullPointerException e) { +.fl + System.err.println("Caught NullPointerException."); +.fl + return 1; +.fl + } finally { +.fl + return 0; +.fl + } +.fl + } +.fl +\fP +.fi +The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method. +.TP 3 +options +Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning. +.TP 3 +overrides +Warn about issues regarding method overrides. For example, consider the following two classes: +.nf +\f3 +.fl +public class ClassWithVarargsMethod { +.fl + void varargsMethod(String... s) { } +.fl +} +.fl +\fP +.fi +.nf +\f3 +.fl +public class ClassWithOverridingMethod extends ClassWithVarargsMethod { +.fl + @Override +.fl + void varargsMethod(String[] s) { } +.fl +} +.fl +\fP +.fi +The compiler generates a warning similar to the following: +.br +.br +\f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP +.br +.br +When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles. +.TP 3 +path +Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example: +.nf +\f3 +.fl +javac \-Xlint:path \-classpath /nonexistentpath Example.java +.fl +\fP +.fi +.TP 3 +processing +Warn about issues regarding annotation processing. The compiler generates this warning if you have a class that has an annotation, and you use an annotation processor that cannot handle that type of exception. For example, the following is a simple annotation processor: +.br +.br +\f3Source file \fP\f4AnnoProc.java\fP: +.nf +\f3 +.fl +import java.util.*; +.fl +import javax.annotation.processing.*; +.fl +import javax.lang.model.*; +.fl +import javax.lang.model.element.*; +.fl + +.fl +@SupportedAnnotationTypes("NotAnno") +.fl +public class AnnoProc extends AbstractProcessor { +.fl + public boolean process(Set elems, RoundEnvironment renv) { +.fl + return true; +.fl + } +.fl + +.fl + public SourceVersion getSupportedSourceVersion() { +.fl + return SourceVersion.latest(); +.fl + } +.fl +} +.fl +\fP +.fi +\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP +.nf +\f3 +.fl +@interface Anno { } +.fl + +.fl +@Anno +.fl +class AnnosWithoutProcessors { } +.fl +\fP +.fi +The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP: +.nf +\f3 +.fl +% javac AnnoProc.java +.fl +% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java +.fl +\fP +.fi +When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning: +.br +.br +\f2warning: [processing] No processor claimed any of these annotations: Anno\fP +.br +.br +To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP. +.TP 3 +rawtypes +Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning: +.nf +\f3 +.fl +void countElements(List l) { ... } +.fl +\fP +.fi +The following does not generate a \f2rawtypes\fP warning: +.nf +\f3 +.fl +void countElements(List l) { ... } +.fl +\fP +.fi +\f2List\fP is a raw type. However, \f2List\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface. +.TP 3 +serial +Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example: +.nf +\f3 +.fl +public class PersistentTime implements Serializable +.fl +{ +.fl + private Date time; +.fl + +.fl + public PersistentTime() { +.fl + time = Calendar.getInstance().getTime(); +.fl + } +.fl + +.fl + public Date getTime() { +.fl + return time; +.fl + } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning: +.br +.br +\f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP +.br +.br +If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value. +.TP 3 +static +Warn about issues relating to use of statics. For example: +.nf +\f3 +.fl +class XLintStatic { +.fl + static void m1() { } +.fl + void m2() { this.m1(); } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning: +.nf +\f3 +.fl +warning: [static] static method should be qualified by type name, XLintStatic, instead of by an expression +.fl +\fP +.fi +To resolve this issue, you can call the static method \f2m1\fP as follows: +.nf +\f3 +.fl +XLintStatic.m1(); +.fl +\fP +.fi +Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP. +.TP 3 +try +Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used: +.nf +\f3 +.fl +try ( AutoCloseable ac = getResource() ) { +.fl + // do nothing +.fl +} +.fl +\fP +.fi +.TP 3 +unchecked +Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example: +.nf +\f3 +.fl + List l = new ArrayList(); +.fl + List ls = l; // unchecked warning +.fl +\fP +.fi +During type erasure, the types \f2ArrayList\fP and \f2List\fP become \f2ArrayList\fP and \f2List\fP, respectively. +.br +.br +The variable \f2ls\fP has the parameterized type \f2List\fP. When the \f2List\fP referenced by \f2l\fP is assigned to \f2ls\fP, the compiler generates an unchecked warning; the compiler is unable to determine at compile time, and moreover knows that the JVM will not be able to determine at runtime, if \f2l\fP refers to a \f2List\fP type; it does not. Consequently, heap pollution occurs. +.br +.br +In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List\fP and \f2List\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP. +.TP 3 +varargs +Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example: +.nf +\f3 +.fl +public class ArrayBuilder { +.fl + public static void addToList (List listArg, T... elements) { +.fl + for (T x : elements) { +.fl + listArg.add(x); +.fl + } +.fl + } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP: +.nf +\f3 +.fl +warning: [varargs] Possible heap pollution from parameterized vararg type T +.fl +\fP +.fi +When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution. .RE .LP -.RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP .LP To shorten or simplify the javac command line, you can specify one or more files that themselves contain arguments to the \f2javac\fP command (except \f2\-J\fP options). This enables you to create javac commands of any length on any operating system. .LP @@ -405,9 +757,7 @@ .nf \f3 .fl - % \fP\f3javac @argfile\fP -.fl - +% \fP\f3javac @argfile\fP .fl .fi @@ -433,7 +783,7 @@ .fl \-sourcepath /java/pubs/ws/1.3/src/share/classes .fl - + .fl \fP .fi @@ -451,7 +801,7 @@ .fl MyClass3.java .fl - + .fl \fP .fi @@ -465,7 +815,7 @@ .fl % \fP\f3javac @options @classes\fP .fl - + .fl .fi @@ -479,17 +829,13 @@ .nf \f3 .fl - % \fP\f3javac @path1/options @path2/classes\fP -.fl - +% \fP\f3javac @path1/options @path2/classes\fP .fl .fi .LP .SH "ANNOTATION PROCESSING" .LP - -.LP .LP \f3javac\fP provides direct support for annotation processing, superseding the need for the separate annotation processing tool, \f3apt\fP. .LP @@ -500,11 +846,7 @@ Overview of annotation processing .LP .LP -Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named -.br -\f2\ META\-INF/services/javax.annotation.processing.Processor\fP -.br -on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option. +Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named \f2META\-INF/services/javax.annotation.processing.Processor\fP on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option. .LP .LP After scanning the source files and classes on the command line to determine what annotations are present, the compiler queries the processors to determine what annotations they process. When a match is found, the processor will be invoked. A processor may "claim" the annotations it processes, in which case no further attempt is made to find any processors for those annotations. Once all annotations have been claimed, the compiler does not look for additional processors. @@ -523,8 +865,6 @@ .LP .SH "SEARCHING FOR TYPES" .LP - -.LP .LP When compiling a source file, the compiler often needs information about a type whose definition did not appear in the source files given on the command line. The compiler needs type information for every class or interface used, extended, or implemented in the source file. This includes classes and interfaces not explicitly mentioned in the source file but which provide information through inheritance. .LP @@ -532,11 +872,7 @@ For example, when you subclass \f3java.applet.Applet\fP, you are also using \f3Applet's\fP ancestor classes: \f3java.awt.Panel\fP, \f3java.awt.Container\fP, \f3java.awt.Component\fP, and \f3java.lang.Object\fP. .LP .LP -When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see -.na -\f2Setting the Class Path\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath). +When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see Setting the Class Path). .LP .LP If you set the \-sourcepath option, the compiler searches the indicated path for source files; otherwise the compiler searches the user class path for both class files and source files. @@ -555,8 +891,6 @@ .LP .SH "PROGRAMMATIC INTERFACE" .LP - -.LP .LP \f3javac\fP supports the new Java Compiler API defined by the classes and interfaces in the \f2javax.tools\fP package. .LP @@ -573,8 +907,6 @@ .fl int rc = javac.run(null, null, null, args); .fl - -.fl \fP .fi @@ -588,11 +920,8 @@ .SS Old Interface .LP -.RS 3 - .LP -.LP -\f3Note:\fP \ This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above. +\f3Note:\fP This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above. .LP .LP The \f2com.sun.tools.javac.Main\fP class provides two static methods to invoke the compiler from a program: @@ -604,8 +933,6 @@ .fl public static int compile(String[] args, PrintWriter out); .fl - -.fl \fP .fi @@ -622,21 +949,14 @@ .LP Note that all \f3other\fP classes and methods found in a package whose name starts with \f2com.sun.tools.javac\fP (informally known as sub\-packages of \f2com.sun.tools.javac\fP) are strictly internal and subject to change at any time. .LP -.RE .SH "EXAMPLES" .LP .SS Compiling a Simple Program .LP -.RS 3 - -.LP .LP One source file, \f2Hello.java\fP, defines a class called \f3greetings.Hello\fP. The \f2greetings\fP directory is the package directory both for the source file and the class file and is off the current directory. This allows us to use the default user class path. It also makes it unnecessary to specify a separate destination directory with \f3\-d\fP. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -682,25 +1002,15 @@ .fl Hello Everyone .fl - -.fl .fi -.RE .LP -.RE .SS Compiling Multiple Source Files .LP -.RS 3 - -.LP .LP This example compiles all the source files in the package \f2greetings\fP. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -720,27 +1030,15 @@ .fl Aloha.java GutenTag.java Hello.java Hi.java .fl - -.fl - -.fl .fi -.RE .LP -.RE .SS Specifying a User Class Path .LP -.RS 3 - -.LP .LP Having changed one of the source files in the previous example, we recompile it: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -750,35 +1048,23 @@ .fl % \f3javac greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP Since \f2greetings.Hi\fP refers to other classes in the \f2greetings\fP package, the compiler needs to find these other classes. The example above works, because our default user class path happens to be the directory containing the package directory. But suppose we want to recompile this file and not worry about which directory we're in? Then we need to add \f2/examples\fP to the user class path. We can do this by setting \f3CLASSPATH\fP, but here we'll use the \f3\-classpath\fP option. .LP -.RS 3 - -.LP .nf \f3 .fl % \fP\f3javac \-classpath /examples /examples/greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP If we change \f2greetings.Hi\fP again, to use a banner utility, that utility also needs to be accessible through the user class path. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -786,42 +1072,26 @@ .fl /examples/greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP To execute a class in \f2greetings\fP, we need access both to \f2greetings\fP and to the classes it uses. .LP -.RS 3 - -.LP .nf \f3 .fl % \fP\f3java \-classpath /examples:/lib/Banners.jar greetings.Hi\fP .fl - -.fl .fi -.RE .LP -.RE .SS Separating Source Files and Class Files .LP -.RS 3 - -.LP .LP It often makes sense to keep source files and class files in separate directories, especially on large projects. We use \f3\-d\fP to indicate the separate class file destination. Since the source files are not in the user class path, we use \f3\-sourcepath\fP to help the compiler find them. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -855,61 +1125,56 @@ .fl Base.class GoodBye.class .fl - -.fl - -.fl .fi -.RE .LP .LP -\f3Note:\fP \ The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option. +\f3Note:\fP The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option. .LP -.RE .SS Cross\-Compilation Example .LP -.RS 3 - .LP -.LP -Here we use \f3javac\fP to compile code that will run on a 1.7 VM. -.LP -.RS 3 - +Here we use \f3javac\fP to compile code that will run on a 1.6 VM. .LP .nf \f3 .fl -% \fP\f3javac \-target 1.7 \-bootclasspath jdk1.7.0/lib/rt.jar \\ +% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\ .fl \-extdirs "" OldCode.java\fP .fl - -.fl .fi -.RE .LP .LP -The \f3\-target 1.7\fP option ensures that the generated class files will be compatible with 1.7 VMs. By default, \f3javac\fP compiles for JDK 6. +The \f2\-source 1.6\fP option specifies that version 1.6 (or 6) of the Java programming language be used to compile \f2OldCode.java\fP. The option \f3\-target 1.6\fP option ensures that the generated class files will be compatible with 1.6 VMs. Note that in most cases, the value of the \f3\-target\fP option is the value of the \f3\-source\fP option; in this example, you can omit the \f3\-target\fP option. .LP .LP -The Java Platform JDK's \f3javac\fP would also by default compile against its own bootstrap classes, so we need to tell \f3javac\fP to compile against JDK 1.7 bootstrap classes instead. We do this with \f3\-bootclasspath\fP and \f3\-extdirs\fP. Failing to do this might allow compilation against a Java Platform API that would not be present on a 1.7 VM and would fail at runtime. +You must specify the \f3\-bootclasspath\fP option to specify the correct version of the bootstrap classes (the \f2rt.jar\fP library). If not, the compiler generates a warning: .LP -.RE +.nf +\f3 +.fl +% \fP\f3javac \-source 1.6 OldCode.java\fP +.fl +warning: [options] bootstrap class path not set in conjunction with \-source 1.6 +.fl +.fi + +.LP +.LP +If you do not specify the correct version of bootstrap classes, the compiler will use the old language rules (in this example, it will use version 1.6 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to non\-existent methods can get included. +.LP .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o .na \f2The javac Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javac/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html .TP 2 o java(1) \- the Java Application Launcher @@ -933,7 +1198,7 @@ .na \f2The Java Extensions Framework\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javadoc.1 --- a/jdk/src/linux/doc/man/javadoc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javadoc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,16 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javadoc 1 "02 Jun 2010" +.TH javadoc 1 "10 May 2011" .SH "Name" javadoc \- The Java API Documentation Generator -.RS 3 - .LP -.LP -Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Sun Solaris. -.LP -.RE +Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Solaris. .SH "SYNOPSIS" .LP -.LP \f4javadoc\fP\f2\ [\ \fP\f2options\fP\f2\ ]\ [\ packagenames\ ]\ [\ sourcefilenames\ ]\ [\ \-subpackages\fP\ \f2pkg1:pkg2:...\fP\f2\ ]\ [\ \fP\f2@argfiles\fP\f2\ ]\fP .LP -.LP Arguments can be in any order. See processing of Source Files for details on how the Javadoc tool determines which "\f2.java\fP" files to process. -.LP -.RS 3 - -.LP .RS 3 .TP 3 options @@ -49,11 +38,7 @@ A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages .TP 3 sourcefilenames -A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes +A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes .TP 3 \-subpackages pkg1:pkg2:... Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames. @@ -61,31 +46,19 @@ @argfiles One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files. .RE - -.LP -.RE .SH "DESCRIPTION" .LP -.LP The \f3Javadoc\fP tool parses the declarations and documentation comments in a set of Java source files and produces a corresponding set of HTML pages describing (by default) the public and protected classes, nested classes (but not anonymous inner classes), interfaces, constructors, methods, and fields. You can use it to generate the API (Application Programming Interface) documentation or the implementation documentation for a set of source files. .LP -.LP You can run the Javadoc tool on entire packages, individual source files, or both. When documenting entire packages, you can either use \f2\-subpackages\fP for traversing recursively down from a top\-level directory, or pass in an explicit list of package names. When documenting individual source files, you pass in a list of source (\f2.java\fP) filenames. Examples are given at the end of this document. How Javadoc processes source files is covered next. -.LP .SS Processing of source files .LP -.LP The Javadoc tool processes files that end in "\f2.java\fP" plus other files described under Source Files. If you run the Javadoc tool by explicitly passing in individual source filenames, you can determine exactly which "\f2.java\fP" files are processed. However, that is not how most developers want to work, as it is simpler to pass in package names. The Javadoc tool can be run three ways without explicitly specifying the source filenames. You can (1) pass in package names, (2) use \f2\-subpackages\fP, and (3) use wildcards with source filenames (\f2*.java\fP). In these cases, the Javadoc tool processes a "\f2.java\fP" file only if it fulfills all of the following requirements: -.LP .RS 3 .TP 2 o -Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625 for legal characters) +Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters) .TP 2 o Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots) @@ -93,11 +66,8 @@ o Its package statement contains the legal package name (specified in the previous bullet) .RE - -.LP .LP \f3Processing of links\fP \- During a run, the Javadoc tool automatically adds cross\-reference links to package, class and member names that are being documented as part of that run. Links appear in several places: -.LP .RS 3 .TP 2 o @@ -124,69 +94,50 @@ o The index .RE - -.LP .LP You can add hyperlinks to existing text for classes not included on the command line (but generated separately) by way of the \f2\-link\fP and \f2\-linkoffline\fP options. .LP -.LP \f3Other processing details\fP \- The Javadoc tool produces one complete document each time it is run; it cannot do incremental builds \-\- that is, it cannot modify or \f2directly\fP incorporate results from previous runs of the Javadoc tool. However, it can link to results from other runs, as just mentioned. .LP -.LP As implemented, the Javadoc tool requires and relies on the java compiler to do its job. The Javadoc tool calls part of \f2javac\fP to compile the declarations, ignoring the member implementation. It builds a rich internal representation of the classes, including the class hierarchy, and "use" relationships, then generates the HTML from that. The Javadoc tool also picks up user\-supplied documentation from documentation comments in the source code. .LP -.LP In fact, the Javadoc tool will run on \f2.java\fP source files that are pure stub files with no method bodies. This means you can write documentation comments and run the Javadoc tool in the earliest stages of design while creating the API, before writing the implementation. .LP -.LP -Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents -.na -\f2default constructors\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (section 8.6.7 of \f2Java Language Specification\fP) that are present in the \f2.class\fP files but not in the source code. -.LP +Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents default constructors (see Java Language Specification) that are present in the \f2.class\fP files but not in the source code. .LP In many cases, the Javadoc tool allows you to generate documentation for source files whose code is incomplete or erroneous. This is a benefit that enables you to generate documentation before all debugging and troubleshooting is done. For example, according to the \f2Java Language Specification\fP, a class that contains an abstract method should itself be declared abstract. The Javadoc tool does not check for this, and would proceed without a warning, whereas the javac compiler stops on this error. The Javadoc tool does do some primitive checking of doc comments. Use the DocCheck doclet to check the doc comments more thoroughly. .LP -.LP When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path. .SS Javadoc Doclets .LP -.LP You can customize the content and format of the Javadoc tool's output by using doclets. The Javadoc tool has a default "built\-in" doclet, called the standard doclet, that generates HTML\-formatted API documentation. You can modify or subclass the standard doclet, or write your own doclet to generate HTML, XML, MIF, RTF or whatever output format you'd like. Information about doclets and their use is at the following locations: -.LP .RS 3 .TP 2 o .na \f2Javadoc Doclets\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html .TP 2 o The \f2\-doclet\fP command\-line option .RE - -.LP .LP When a custom doclet is not specified with the \f2\-doclet\fP command line option, the Javadoc tool will use the default standard doclet. The javadoc tool has several command line options that are available regardless of which doclet is being used. The standard doclet adds a supplementary set of command line options. Both sets of options are described below in the options section. -.LP .SS Related Documentation and Doclets -.LP .RS 3 .TP 2 o .na \f2Javadoc Enhancements\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. .TP 2 o .na @@ -198,7 +149,7 @@ .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html for more information about Sun conventions for writing documentation comments. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments. .TP 2 o .na @@ -216,22 +167,18 @@ .na \f2DocCheck Doclet\fP @ .fi -http://java.sun.com/javadoc/doccheck \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Sun Doc Check Utilities. +http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities. .TP 2 o .na \f2MIF Doclet\fP @ .fi -http://java.sun.com/javadoc/mifdoclet \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format. +http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format. .RE - -.LP .SS Terminology .LP -.LP The terms \f2documentation comment\fP, \f2doc comment\fP, \f2main description\fP, \f2tag\fP, \f2block tag\fP, and \f2in\-line tag\fP are described at Documentation Comments. These other terms have specific meanings within the context of the Javadoc tool: -.LP .RS 3 .TP 3 generated document @@ -259,34 +206,25 @@ .na \f21.3\fP @ .fi -http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. +http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. .LP .TP 3 external referenced classes The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited. .RE - -.LP .SH "SOURCE FILES" .LP -.LP The Javadoc tool will generate output originating from four different types of "source" files: Java language source files for classes (\f2.java\fP), package comment files, overview comment files, and miscellaneous unprocessed files. This section also covers test files and template files that can also be in the source tree, but which you want to be sure not to document. -.LP .SS Class Source Code Files .LP -.LP Each class or interface and its members can have their own documentation comments, contained in a \f2.java\fP file. For more details about these doc comments, see Documentation Comments. -.LP .SS Package Comment Files .LP -.LP Each package can have its own documentation comment, contained in its own "source" file, that the Javadoc tool will merge into the package summary page that it generates. You typically include in this comment any documentation that applies to the entire package. .LP -.LP To create a package comment file, you have a choice of two files to place your comments: -.LP .RS 3 .TP 2 o @@ -295,52 +233,18 @@ o \f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations. .RE - -.LP .LP A package may have a single \f2package.html\fP file or a single \f2package\-info.java\fP file but not both. Place either file in the package directory in the source tree along with your \f2.java\fP files. .LP -.LP \f4package\-info.java\fP \- This file can contain a package comment of the following structure \-\- the comment is placed before the package declaration: .LP -.LP File: \f2java/applet/package\-info.java\fP -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 .nf \f3 .fl /** .fl - * Provides the classes necessary to create an + * Provides the classes necessary to create an .fl * applet and the classes an applet uses .fl @@ -372,105 +276,12 @@ .fl \fP .fi -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 352 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-42 - -.LP .LP Note that while the comment separators \f2/**\fP and \f2/*\fP must be present, the leading asterisks on the intermediate lines can be omitted. .LP -.LP \f4package.html\fP \- This file can contain a package comment of the following structure \-\- the comment is placed in the \f2\fP element: .LP -.LP File: \f2java/applet/package.html\fP -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 .nf \f3 .fl @@ -478,7 +289,7 @@ .fl .fl -Provides the classes necessary to create an applet and the +Provides the classes necessary to create an applet and the .fl classes an applet uses to communicate with its applet context. .fl @@ -506,77 +317,14 @@ .fl \fP .fi -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 405 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-40 - -.LP .LP Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the .na \f2example of \fP\f2package.html\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments. .LP \f3Processing of package comment file\fP \- When the Javadoc tool runs, it will automatically look for the package comment file; if found, the Javadoc tool does the following: -.LP .RS 3 .TP 2 o @@ -590,35 +338,27 @@ .na \f2Package Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/applet/package\-summary.html. +http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. .TP 2 o Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in .na \f2Overview Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. +http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. .RE - -.LP .SS Overview Comment File .LP -.LP Each application or set of packages that you are documenting can have its own overview documentation comment, kept in its own "source" file, that the Javadoc tool will merge into the overview page that it generates. You typically include in this comment any documentation that applies to the entire application or set of packages. .LP -.LP To create an overview comment file, you can name the file anything you want, typically \f4overview.html\fP and place it anywhere, typically at the top level of the source tree. For example, if the source files for the \f2java.applet\fP package are contained in \f2/home/user/src/java/applet\fP directory, you could create an overview comment file at \f2/home/user/src/overview.html\fP. .LP -.LP Notice you can have multiple overview comment files for the same set of source files, in case you want to run javadoc multiple times on different sets of packages. For example, you could run javadoc once with \-private for internal documentation and again without that option for public documentation. In this case, you could describe the documentation as public or internal in the first sentence of each overview comment file. .LP -.LP The content of the overview comment file is one big documentation comment, written in HTML, like the package comment file described previously. See that description for details. To re\-iterate, when writing the comment, you should make the first sentence a summary about the application or set of packages, and not put a title or any other text between \f2\fP and the first sentence. You can include overview tags; as with any documentation comment, all tags except in\-line tags, such as \f2{@link}\fP, must appear after the main description. If you add a \f2@see\fP tag, it must have a fully\-qualified name. .LP -.LP When you run the Javadoc tool, you specify the overview comment file name with the \-overview option. The file is then processed similar to that of a package comment file. -.LP .RS 3 .TP 2 o @@ -632,25 +372,19 @@ .na \f2Overview Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/overview\-summary.html. +http://download.oracle.com/javase/7/docs/api/overview\-summary.html. .TP 2 o Copies the first sentence of the overview comment to the top of the overview summary page. .RE - -.LP .SS Miscellaneous Unprocessed Files .LP -.LP You can also include in your source any miscellaneous files that you want the Javadoc tool to copy to the destination directory. These typically includes graphic files, example Java source (.java) and class (.class) files, and self\-standing HTML files whose content would overwhelm the documentation comment of a normal Java source file. .LP -.LP To include unprocessed files, put them in a directory called \f4doc\-files\fP which can be a subdirectory of any package directory that contains source files. You can have one such subdirectory for each package. You might include images, example code, source files, .class files, applets and HTML files. For example, if you want to include the image of a button \f2button.gif\fP in the \f2java.awt.Button\fP class documentation, you place that file in the \f2/home/user/src/java/awt/doc\-files/\fP directory. Notice the \f2doc\-files\fP directory should not be located at \f2/home/user/src/java/doc\-files\fP because \f2java\fP is not a package \-\- that is, it does not directly contain any source files. .LP -.LP All links to these unprocessed files must be hard\-coded, because the Javadoc tool does not look at the files \-\- it simply copies the directory and all its contents to the destination. For example, the link in the \f2Button.java\fP doc comment might look like: -.LP .nf \f3 .fl @@ -664,23 +398,16 @@ .fl \fP .fi - -.LP .SS Test Files and Template Files .LP -.LP Some developers have indicated they want to store test files and templates files in the source tree near their corresponding source files. That is, they would like to put them in the same directory, or a subdirectory, of those source files. .LP -.LP If you run the Javadoc tool by explicitly passing in individual source filenames, you can deliberately omit test and templates files and prevent them from being processed. However, if you are passing in package names or wildcards, you need to follow certain rules to ensure these test files and templates files are not processed. .LP -.LP Test files differ from template files in that the former are legal, compilable source files, while the latter are not, but may end with ".java". .LP -.LP \f3Test files\fP \- Often developers want to put compilable, runnable test files for a given package in the \f2same\fP directory as the source files for that package. But they want the test files to belong to a package other than the source file package, such as the unnamed package (so the test files have no package statement or a different package statement from the source). In this scenario, when the source is being documented by specifying its package name specified on the command line, the test files will cause warnings or errors. You need to put such test files in a subdirectory. For example, if you want to add test files for source files in \f2com.package1\fP, put them in a subdirectory that would be an invalid package name (because it contains a hyphen): -.LP .nf \f3 .fl @@ -688,29 +415,17 @@ .fl \fP .fi - -.LP .LP The test directory will be skipped by the Javadoc tool with no warnings. .LP -.LP If your test files contain doc comments, you can set up a separate run of the Javadoc tool to produce documentation of the test files by passing in their test source filenames with wildcards, such as \f2com/package1/test\-files/*.java\fP. .LP -.LP -\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). -.LP +\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see information about Identifiers in the Java Language Specification). .SH "GENERATED FILES" .LP -.LP By default, javadoc uses a standard doclet that generates HTML\-formatted documentation. This doclet generates the following kinds of files (where each HTML "page" corresponds to a separate file). Note that javadoc generates files with two types of names: those named after classes/interfaces, and those that are not (such as \f2package\-summary.html\fP). Files in the latter group contain hyphens to prevent filename conflicts with those in the former group. .LP -.LP \f3Basic Content Pages\fP -.LP .RS 3 .TP 2 o @@ -722,11 +437,8 @@ o One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) .RE - -.LP .LP \f3Cross\-Reference Pages\fP -.LP .RS 3 .TP 2 o @@ -750,15 +462,12 @@ o An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English). .RE - -.LP .LP \f3Support Files\fP -.LP .RS 3 .TP 2 o -A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. +A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. .TP 2 o One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content. @@ -775,45 +484,14 @@ o A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree. .RE - -.LP .LP \f3HTML Frames\fP .LP -.LP The Javadoc tool will generate either two or three HTML frames, as shown in the figure below. It creates the minimum necessary number of frames by omitting the list of packages if there is only one package (or no packages). That is, when you pass a single package name or source files (*.java) belonging to a single package as arguments into the javadoc command, it will create only one frame (C) in the left\-hand column \-\- the list of classes. When you pass into javadoc two or more package names, it creates a third frame (P) listing all packages, as well as an overview page (Detail). This overview page has the filename \f2overview\-summary.html\fP. Thus, this file is created only if you pass in two or more package names. You can bypass frames by clicking on the "No Frames" link or entering at overview\-summary.html. .LP -.LP If you are unfamiliar with HTML frames, you should be aware that frames can have \f2focus\fP for printing and scrolling. To give a frame focus, click on it. Then on many browsers the arrow keys and page keys will scroll that frame, and the print menu command will print it. .LP -.nf -\f3 -.fl - \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\- -.fl - |C| Detail | |P| Detail | -.fl - | | | | | | -.fl - | | | |\-| | -.fl - | | | |C| | -.fl - | | | | | | -.fl - | | | | | | -.fl - \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\- -.fl - javadoc *.java javadoc java.lang java.awt -.fl -\fP -.fi - -.LP -.LP Load one of the following two files as the starting page depending on whether you want HTML frames or not: -.LP .RS 3 .TP 2 o @@ -822,24 +500,14 @@ o \f2overview\-summary.html\fP (for no frames) .RE - -.LP .LP \f3Generated File Structure\fP .LP -.LP The generated class and interface files are organized in the same directory hierarchy that Java source files and class files are organized. This structure is one directory per subpackage. .LP -.LP For example, the document generated for the class \f2java.applet.Applet\fP class would be located at \f2java/applet/Applet.html\fP. The file structure for the java.applet package follows, given that the destination directory is named \f2apidocs\fP. All files that contain the word "frame" appear in the upper\-left or lower\-left frames, as noted. All other HTML files appear in the right\-hand frame. .LP -.RS 3 - -.LP -.LP NOTE \- Directories are shown in \f3bold\fP. The asterisks (\f2*\fP) indicate the files and directories that are \f2omitted\fP when the arguments to javadoc are source filenames (*.java) rather than package names. Also when arguments are source filenames, \f2package\-list\fP is created but is empty. The doc\-files directory will not be created in the destination unless it exists in the source tree. -.LP -.RE .nf \f3 .fl @@ -922,44 +590,31 @@ AudioClip.html Page for AudioClip source code .fl .fi - -.LP .SS Generated API Declarations .LP -.LP The Javadoc tool generates a declaration at the start of each class, interface, field, constructor, and method description for that API item. For example, the declaration for the \f2Boolean\fP class is: .LP -.LP \f2public final class Boolean\fP .br \f2extends Object\fP .br \f2implements Serializable\fP .LP -.LP and the declaration for the \f2Boolean.valueOf\fPmethod is: .LP -.LP \f2public static Boolean valueOf(String s)\fP .LP -.LP The Javadoc tool can include the modifiers \f2public\fP, \f2protected\fP, \f2private\fP, \f2abstract\fP, \f2final\fP, \f2static\fP, \f2transient\fP, and \f2volatile\fP, but not \f2synchronized\fP or \f2native\fP. These last two modifiers are considered implementation detail and not part of the API specification. .LP -.LP Rather than relying on the keyword \f2synchronized\fP, APIs should document their concurrency semantics in the comment's main description, as in "a single \f2Enumeration\fP cannot be used by multiple threads concurrently". The document should not describe how to achieve these semantics. As another example, while \f2Hashtable\fP should be thread\-safe, there's no reason to specify that we achieve this by synchronizing all of its exported methods. We should reserve the right to synchronize internally at the bucket level, thus offering higher concurrency. -.LP .SH "DOCUMENTATION COMMENTS" .LP -.LP The original "Documentation Comment Specification" can be found under related documentation. -.LP .SS Commenting the Source Code .LP -.LP You can include \f2documentation comments\fP ("doc comments") in the source code, ahead of declarations for any class, interface, method, constructor, or field. You can also create doc comments for each package and another one for the overview, though their syntax is slightly different. Doc comments are also known informally as "Javadoc comments" (but this term violates its trademark usage). A doc comment consists of the characters between the characters \f2/**\fP that begin the comment and the characters \f2*/\fP that end it. Leading asterisks are allowed on each line and are described further below. The text in a comment can continue onto multiple lines. -.LP .nf \f3 .fl @@ -973,11 +628,8 @@ .fl \fP .fi - -.LP .LP To save space you can put a comment on one line: -.LP .nf \f3 .fl @@ -985,14 +637,10 @@ .fl \fP .fi - -.LP .LP \f3Placement of comments\fP \- Documentation comments are recognized only when placed immediately before class, interface, constructor, method, or field declarations \-\- see the class example, method example, and field example. Documentation comments placed in the body of a method are ignored. Only one documentation comment per declaration statement is recognized by the Javadoc tool. .LP -.LP A common mistake is to put an \f2import\fP statement between the class comment and the class declaration. Avoid this, as the Javadoc tool will ignore the class comment. -.LP .nf \f3 .fl @@ -1014,11 +662,8 @@ .fl \fP .fi - -.LP .LP \f3A doc comment is composed of a \fP\f4main description\fP\f3 followed by a \fP\f4tag section\fP \- The \f2main description\fP begins after the starting delimiter \f2/**\fP and continues until the tag section. The \f2tag section\fP starts with the first block tag, which is defined by the first \f2@\fP character that begins a line (ignoring leading asterisks, white space, and leading separator \f2/**\fP). It is possible to have a comment with only a tag section and no main description. The main description cannot continue after the tag section begins. The argument to a tag can span multiple lines. There can be any number of tags \-\- some types of tags can be repeated while others cannot. For example, this \f2@see\fP starts the tag section: -.LP .nf \f3 .fl @@ -1032,11 +677,8 @@ .fl \fP .fi - -.LP .LP \f3Block tags and in\-line tags\fP \- A \f2tag\fP is a special keyword within a doc comment that the Javadoc tool can process. There are two kinds of tags: block tags, which appear as \f2@tag\fP (also known as "standalone tags"), and in\-line tags, which appear within curly braces, as \f2{@tag}\fP. To be interpreted, a block tag must appear at the beginning of a line, ignoring leading asterisks, white space, and separator (\f2/**\fP). This means you can use the \f2@\fP character elsewhere in the text and it will not be interpreted as the start of a tag. If you want to start a line with the \f2@\fP character and not have it be interpreted, use the HTML entity \f2@\fP. Each block tag has associated text, which includes any text following the tag up to, but not including, either the next tag, or the end of the doc comment. This associated text can span multiple lines. An in\-line tag is allowed and interpreted anywhere that text is allowed. The following example contains the block tag \f2@deprecated\fP and in\-line tag \f2{@link}\fP. -.LP .nf \f3 .fl @@ -1048,17 +690,12 @@ .fl \fP .fi - -.LP .LP \f3Comments are written in HTML\fP \- The text must be written in HTML, in that they should use HTML entities and can use HTML tags. You can use whichever version of HTML your browser supports; we have written the standard doclet to generate HTML 3.2\-compliant code elsewhere (outside of the documentation comments) with the inclusion of cascading style sheets and frames. (We preface each generated file with "HTML 4.0" because of the frame sets.) .LP -.LP For example, entities for the less\-than (\f2<\fP) and greater\-than (\f2>\fP) symbols should be written \f2<\fP and \f2>\fP. Likewise, the ampersand (\f2&\fP) should be written \f2&\fP. The bold HTML tag \f2\fP is shown in the following example. .LP -.LP Here is a doc comment: -.LP .nf \f3 .fl @@ -1072,20 +709,12 @@ .fl \fP .fi - -.LP .LP \f3Leading asterisks\fP \- When javadoc parses a doc comment, leading asterisk (\f2*\fP) characters on each line are discarded; blanks and tabs preceding the initial asterisk (\f2*\fP) characters are also discarded. Starting with 1.4, if you omit the leading asterisk on a line, the leading white space is no longer removed. This enables you to paste code examples directly into a doc comment inside a \f2
\fP tag, and its indentation will be honored. Spaces are generally interpreted by browsers more uniformly than tabs. Indentation is relative to the left margin (rather than the separator \f2/**\fP or \f2
\fP tag). .LP -.LP \f3First sentence\fP \- The first sentence of each doc comment should be a summary sentence, containing a concise but complete description of the declared entity. This sentence ends at the first period that is followed by a blank, tab, or line terminator, or at the first block tag. The Javadoc tool copies this first sentence to the member summary at the top of the HTML page. .LP -.LP \f3Declaration with multiple fields\fP \- Java allows declaring multiple fields in a single statement, but this statement can have only one documentation comment, which is copied for all fields. Therefore if you want individual documentation comments for each field, you must declare each field in a separate statement. For example, the following documentation comment doesn't make sense written as a single declaration and would be better handled as two declarations: -.LP -.RS 3 - -.LP .nf \f3 .fl @@ -1099,51 +728,32 @@ .fl \fP .fi -.RE - -.LP .LP The Javadoc tool generates the following documentation from the above code: -.LP -.RS 3 - -.LP .nf \f3 .fl public int \fP\f3x\fP .fl .fi - -.LP .RS 3 The horizontal and vertical distances of point (x,y) .RE - -.LP .nf \f3 .fl public int \fP\f3y\fP .fl .fi - -.LP .RS 3 The horizontal and vertical distances of point (x,y) .RE - -.LP -.RE .LP \f3Use header tags carefully\fP \- When writing documentation comments for members, it's best not to use HTML heading tags such as
and
, because the Javadoc tool creates an entire structured document and these structural tags might interfere with the formatting of the generated document. However, it is fine to use these headings in class and package comments to provide your own structure. -.LP .SS Automatic Copying of Method Comments .LP -.LP The Javadoc tool has the ability to copy or "inherit" method comments in classes and interfaces under the following two circumstances. Constructors, fields and nested classes do not inherit doc comments. -.LP .RS 3 .TP 2 o @@ -1156,14 +766,10 @@ o \f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot. .RE - -.LP .LP The source file for the inherited method need only be on the path specified by \-sourcepath for the doc comment to actually be available to copy. Neither the class nor its package needs to be passed in on the command line. This contrasts with 1.3.x and earlier releases, where the class had to be a documented class .LP -.LP \f3Inherit from classes and interfaces\fP \- Inheriting of comments occurs in all three possible cases of inheritance from classes and interfaces: -.LP .RS 3 .TP 2 o @@ -1175,17 +781,12 @@ o When a method in a class implements a method in an interface .RE - -.LP .LP In the first two cases, for method overrides, the Javadoc tool generates a subheading "Overrides" in the documentation for the overriding method, with a link to the method it is overriding, whether or not the comment is inherited. .LP -.LP In the third case, when a method in a given class implements a method in an interface, the Javadoc tool generates a subheading "Specified by" in the documentation for the overriding method, with a link to the method it is implementing. This happens whether or not the comment is inherited. .LP -.LP \f3Algorithm for Inheriting Method Comments\fP \- If a method does not have a doc comment, or has an {@inheritDoc} tag, the Javadoc tool searches for an applicable comment using the following algorithm, which is designed to find the most specific applicable doc comment, giving preference to interfaces over superclasses: -.LP .RS 3 .TP 3 1. @@ -1205,16 +806,11 @@ If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass. .RE .RE - -.LP .SH "JAVADOC TAGS" .LP -.LP The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together. .LP -.LP Tags come in two types: -.LP .RS 3 .TP 2 o @@ -1223,8 +819,6 @@ o \f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP. .RE - -.LP .LP For information about tags we might introduce in future releases, see .na @@ -1232,14 +826,8 @@ .fi http://java.sun.com/j2se/javadoc/proposed\-tags.html. .LP -.LP The current tags are: .LP -.RS 3 - -.LP -.LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -1350,7 +938,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 1122 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 873 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1448,55 +1036,35 @@ .nr T. 1 .T# 1 .35 -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-42 - -.LP .LP For custom tags, see the \-tag option. -.LP -.RE .RS 3 .TP 3 @author\ name\-text Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma. +.RE .LP For more details, see Where Tags Can Be Used and .na \f2writing @author tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author. -.LP -.TP 3 -@deprecated\ deprecated\-text -.RS 3 - -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author. .LP -Note: You can deprecate a program element using the -.na -\f2@Deprecated annotation\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/deprecation.html. -.LP +.RS 3 +.TP 3 +@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation. .RE -.RE -.RS 3 - -.LP .LP Adds a comment indicating that this API should no longer be used (even though it may continue to work). The Javadoc tool moves the \f2deprecated\-text\fP ahead of the main description, placing it in italics and preceding it with a bold warning: "Deprecated". This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field. .LP -.LP The first sentence of \f2deprecated\-text\fP should at least tell the user when the API was deprecated and what to use as a replacement. The Javadoc tool copies just the first sentence to the summary section and index. Subsequent sentences can also explain why it has been deprecated. You should include a \f2{@link}\fP tag (for Javadoc 1.2 or later) that points to the replacement API: .LP -.LP For more details, see .na \f2writing @deprecated tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated. .RS 3 .TP 2 o @@ -1518,19 +1086,13 @@ o For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag. .RE - -.LP .LP For more about deprecation, see .na \f2The @deprecated tag\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/index.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html. .LP - -.LP -.RE .RS 3 .TP 3 {@code\ text} @@ -1700,7 +1262,7 @@ .na \f2writing {@link} tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}. .LP .TP 3 {@linkplain\ package.class#member\ label} @@ -1716,13 +1278,8 @@ .fi .LP This would display as: -.RS 3 - .LP -.LP -Refer to the overridden method. -.LP -.RE +Refer to the overridden method. .LP .TP 3 {@literal\ text} @@ -1799,7 +1356,7 @@ .na \f2writing @param tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param. .LP .TP 3 @return\ description @@ -1809,7 +1366,7 @@ .na \f2writing @return tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return. .LP .TP 3 @see\ reference @@ -1834,18 +1391,12 @@ .RS 3 .RS 3 .RS 3 - -.LP -.RS 3 .RS 3 .TP 3 See Also: "The Java Programming Language" .RE .RE - -.LP -.RE .TP 3 @see label Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example: @@ -1858,14 +1409,10 @@ .fi This generates a link such as: .RS 3 -.RS 3 .TP 3 See Also: Java Spec .RE - -.LP -.RE .TP 3 @see\ package.class#member\ label Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text. @@ -1885,7 +1432,6 @@ .RE .LP \f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP". -.RS 3 .nf \f3 .fl @@ -1897,11 +1443,7 @@ .fl \fP .fi -.RE The standard doclet produces HTML something like this: -.RS 3 - -.LP .nf \f3 .fl @@ -1915,26 +1457,18 @@ .fl \fP .fi -.RE Which looks something like this in a browser, where the label is the visible link text: .RS 3 - -.LP -.RS 3 .TP 3 See Also: equals .RE - -.LP -.RE .LP \f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments. .LP Of course the advantage of providing shorter, "partially\-qualified" names is that they are shorter to type and there is less clutter in the source code. The following table shows the different forms of the name, where \f2Class\fP can be a class or interface, \f2Type\fP can be a class, interface, array, or primitive, and \f2method\fP can be a method or constructor. .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2079,7 +1613,7 @@ .nr 40 \n(79+(0*\n(38) .nr 80 +\n(40 .nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1665 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1364 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2165,7 +1699,6 @@ .rm b+ .rm c+ .rm d+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-58 .LP The following notes apply to the above table: @@ -2186,7 +1719,7 @@ .LP \f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified. .LP -When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in Chapter 6, "Names" of the \f2Java Language Specification\fP, Second Edition. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order: +When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order: .RS 3 .TP 3 1. @@ -2214,7 +1747,6 @@ Use \-noqualifier to globally remove the package names. .br .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2425,7 +1957,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 1741 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1440 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2561,7 +2093,6 @@ .rm g+ .rm h+ .rm i+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-28 .LP \f3Examples of @see\fP @@ -2598,14 +2129,9 @@ .na \f2writing @see tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see. .RE .RE -.RS 3 - -.LP -.LP - .LP .RS 3 .TP 3 @@ -2634,11 +2160,11 @@ .na \f2Documenting Serializable Fields and Data for a Class\fP @ .fi -http://java.sun.com/javase/6/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the +http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the .na \f2Serialization FAQ\fP @ .fi -http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see +http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see .na \f2Sun's criteria\fP @ .fi @@ -2681,7 +2207,7 @@ .na \f2writing @throws tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception. .LP .TP 3 {@value\ package.class#field} @@ -2727,7 +2253,7 @@ .na \f2Constant Field Values\fP @ .fi -http://java.sun.com/javase/6/docs/api/constant\-values.html page. +http://download.oracle.com/javase/7/docs/api/constant\-values.html page. .LP .TP 3 @version\ version\-text @@ -2739,376 +2265,111 @@ .na \f2writing @version tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version. -.RE - -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version. .RE .SS Where Tags Can Be Used .LP -.LP The following sections describe where the tags can be used. Note that these tags can be used in all doc comments: \f2@see\fP, \f2@since\fP, \f2@deprecated\fP, \f2{@link}\fP, \f2{@linkplain}\fP, and \f2{@docroot}\fP. -.LP -.RS 3 - -.LP .SS Overview Documentation Tags .LP -.LP Overview tags are tags that can appear in the documentation comment for the overview page (which resides in the source file typically named \f2overview.html\fP). Like in any other documentation comments, these tags must appear after the main description. .LP -.LP \f3NOTE\fP \- The \f2{@link}\fP tag has a bug in overview documents in version 1.2 \-\- the text appears properly but has no link. The \f2{@docRoot}\fP tag does not currently work in overview documents. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Overview Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1962 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Overview Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-20 - -.LP +\f3Overview Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE .SS Package Documentation Tags .LP -.LP Package tags are tags that can appear in the documentation comment for a package (which resides in the source file named \f2package.html\fP or \f2package\-info.java\fP). The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@serial\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Package Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1994 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Package Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-22 - -.LP +\f3Package Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE .SS Class and Interface Documentation Tags .LP -.LP The following are tags that can appear in the documentation comment for a class or interface. The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@serial\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Class/Interface Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2028 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Class/Interface Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-24 - -.LP +\f3Class/Interface Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE \f3An example of a class comment:\fP -.LP .nf \f3 .fl @@ -3146,129 +2407,42 @@ .fl \fP .fi - -.LP .SS Field Documentation Tags .LP -.LP -The following are the tags that can appear in the documentation comment for a field. -.LP +The following are the tags that can appear in .LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@serial\fP -.br -\f2@serialField\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -\f2{@value}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Field Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2103 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Field Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-24 - -.LP +\f3Field Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@serialField\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.TP 2 +o +\f2{@value}\fP +.RE \f3An example of a field comment:\fP -.LP .nf \f3 .fl @@ -3286,133 +2460,48 @@ .fl \fP .fi - -.LP .SS Constructor and Method Documentation Tags .LP -.LP The following are the tags that can appear in the documentation comment for a constructor or method, except for \f2@return\fP, which cannot appear in a constructor, and \f2{@inheritDoc}\fP, which has certain restrictions. The \f2@serialData\fP tag can only be used in the doc comment for certain serialization methods. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@param\fP -.br -\f2@return\fP -.br -\f2@throws\fP and \f2@exception\fP -.br -\f2@serialData\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@inheritDoc}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Method/Constructor Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2162 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Method/Constructor Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-28 - -.LP +\f3Method/Constructor Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@param\fP +.TP 2 +o +\f2@return\fP +.TP 2 +o +\f2@throws\fP and \f2@exception\fP +.TP 2 +o +\f2@serialData\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@inheritDoc}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE \f3An example of a method doc comment:\fP -.LP .nf \f3 .fl @@ -3446,24 +2535,12 @@ .fl \fP .fi -.RE - -.LP .SH "OPTIONS" .LP - -.LP -.LP The javadoc tool uses doclets to determine its output. The Javadoc tool uses the default standard doclet unless a custom doclet is specified with the \-doclet option. The Javadoc tool provides a set of command\-line options that can be used with any doclet \-\- these options are described below under the sub\-heading Javadoc Options. The standard doclet provides an additional set of command\-line options that are described below under the sub\-heading Options Provided by the Standard Doclet. All option names are case\-insensitive, though their arguments can be case\-sensitive. .LP -.LP The options are: .LP -.RS 3 - -.LP -.LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -3615,6 +2692,8 @@ .br \-\f2sourcepath\fP .br +\-sourcetab +.br \-splitindex .br \-stylesheetfile @@ -3627,6 +2706,8 @@ .br \-tagletpath .br +\-top +.br \-title .br \-use @@ -3673,7 +2754,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 2340 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 2015 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3728,54 +2809,47 @@ .rm a+ .rm b+ .rm c+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-123 - -.LP -.RE +.if \n-(b.=0 .nr c. \n(.c-\n(d.-127 .LP Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options. -.LP .SS Javadoc Options -.LP .RS 3 .TP 3 \-overview \ path/filename -Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the \f2\-sourcepath\fP. -.LP -While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example. -.LP -For information about the file specified by \f2path/filename\fP, see overview comment file. -.LP -Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) -.LP -The title on the overview page is set by \f2\-doctitle\fP. -.LP +Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the current directory. +.br +.br +While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example. +.br +.br +For information about the file specified by \f2path/filename\fP, see overview comment file. +.br +.br +Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) +.br +.br +The title on the overview page is set by \f2\-doctitle\fP. .TP 3 \-public -Shows only public classes and members. -.LP +Shows only public classes and members. .TP 3 \-protected -Shows only protected and public classes and members. This is the default. -.LP +Shows only protected and public classes and members. This is the default. .TP 3 \-package -Shows only package, protected, and public classes and members. -.LP +Shows only package, protected, and public classes and members. .TP 3 \-private -Shows all classes and members. -.LP +Shows all classes and members. .TP 3 \-help -Displays the online help, which lists these javadoc and doclet command line options. -.LP +Displays the online help, which lists these javadoc and doclet command line options. .TP 3 \-doclet\ class -Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option. -.LP +Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option. +.br +.br For example, to call the MIF doclet, use: .nf \f3 @@ -3784,17 +2858,16 @@ .fl \fP .fi -.LP For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi -http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP +http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. .TP 3 \-docletpath\ classpathlist -Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path. -.LP +Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path. +.br +.br Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included. .nf \f3 @@ -3815,207 +2888,33 @@ .na \f2MIF Doclet documentation\fP @ .fi -http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP +http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. .TP 3 \-1.1 -\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP -.LP +\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP .TP 3 \-source release Specifies the version of source code accepted. The following values for \f2release\fP are allowed: -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 81 -.nr 34 \n(.lu -.eo -.am 81 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used. -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.eo -.am 81 -.br -.di b+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc accepts code containing assertions, which were introduced in JDK 1.4. -.br -.di -.nr b| \n(dn -.nr b- \n(dl -.. -.ec \ -.eo -.am 81 -.br -.di c+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. -.br -.di -.nr c| \n(dn -.nr c- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 31 0 -.nr 32 0 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.5\fP -.if \n(32<\n(38 .nr 32 \n(38 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.4\fP -.if \n(32<\n(38 .nr 32 \n(38 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.3\fP -.if \n(32<\n(38 .nr 32 \n(38 -.80 -.rm 80 -.nr 60 \n(31 -.nr 38 \n(60+\n(32 -.if \n(38>\n(80 .nr 80 \n(38 -.if \n(38<\n(80 .nr 60 +(\n(80-\n(38)/2 -.nr 81 0 -.81 -.rm 81 -.nr 38 \n(a- -.if \n(81<\n(38 .nr 81 \n(38 -.nr 38 \n(b- -.if \n(81<\n(38 .nr 81 \n(38 -.nr 38 \n(c- -.if \n(81<\n(38 .nr 81 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr 60 +\n(40 -.nr 41 \n(80+(3*\n(38) -.nr 81 +\n(41 -.nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 2450 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.5\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.ne \n(b|u+\n(.Vu -.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.4\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.b+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.ne \n(c|u+\n(.Vu -.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.3\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.c+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.rm b+ -.rm c+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-14 -.LP -Use the value of \f2release\fP corresponding to that used when compiling the code with javac. -.LP +.RS 3 +.TP 2 +o +\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used. +.TP 2 +o +\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4. +.TP 2 +o +\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. +.RE +Use the value of \f2release\fP corresponding to that used when compiling the code with javac. .TP 3 \-sourcepath\ sourcepathlist -Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented. -.LP -Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files. -.LP +Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented. +.br +.br +Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files. +.br +.br Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at: .nf \f3 @@ -4031,8 +2930,9 @@ % \fP\f3javadoc \-sourcepath /home/user/src/ com.mypackage\fP .fl .fi -This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP. -.LP +This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP. +.br +.br To point to two source paths: .nf \f3 @@ -4040,17 +2940,18 @@ % \fP\f3javadoc \-sourcepath /home/user1/src:/home/user2/src com.mypackage\fP .fl .fi -.LP .TP 3 \-classpath\ classpathlist Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in .na \f2class path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP. -.LP -If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP. +.br +.br +If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP. +.br +.br For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify: .nf \f3 @@ -4058,23 +2959,25 @@ % \fP\f3javadoc \-classpath /home/user/lib \-sourcepath /home/user/src com.mypackage\fP .fl .fi -As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory. -.LP +As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory. +.br +.br For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. -.LP -As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). -.br -.br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. +.br +.br +As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations). +.br +.br +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-subpackages\ \ package1:package2:... -Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files. -.LP +Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files. +.br +.br For example: .nf \f3 @@ -4082,10 +2985,10 @@ % \fP\f3javadoc \-d docs \-sourcepath /home/user/src \-subpackages java:javax.swing\fP .fl .fi -This command generates documentation for packages named "java" and "javax.swing" and all their subpackages. -.LP -You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages. -.LP +This command generates documentation for packages named "java" and "javax.swing" and all their subpackages. +.br +.br +You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages. .TP 3 \-exclude\ \ packagename1:packagename2:... Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example: @@ -4095,36 +2998,32 @@ % \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP .fl .fi -would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP). -.LP +would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP). .TP 3 \-bootclasspath\ classpathlist Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:). -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:). .TP 3 \-extdirs\ dirlist -Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:). -.LP +Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:). .TP 3 \-verbose -Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file. -.LP +Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file. .TP 3 \-quiet -Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string. -.LP +Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string. .TP 3 \-breakiterator\ Uses the internationalized sentence boundary of .na \f2java.text.BreakIterator\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index. -.LP +http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index. +.br +.br From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm: .RS 3 .TP 2 @@ -4134,31 +3033,22 @@ o Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag. .RE -.RS 3 - -.LP -.LP -NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused. -.LP -.RE +NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused. .TP 3 \-locale\ language_country_variant -.RS 3 -.LP \f3Important\fP \- The \f2\-locale\fP option must be placed \f2ahead\fP (to the left) of any options provided by the standard doclet or any other doclet. Otherwise, the navigation bars will appear in English. This is the only command\-line option that is order\-dependent. -.LP -.RE -.LP -Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant). -.LP -Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes. -.LP +.br +.br +Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant). +.br +.br +Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes. .TP 3 \-encoding\ name -Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used. -.LP -Also see \-docencoding and \-charset. -.LP +Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used. +.br +.br +Also see \-docencoding and \-charset. .TP 3 \-Jflag Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required): @@ -4183,12 +3073,12 @@ .RE .SS Options Provided by the Standard Doclet -.LP .RS 3 .TP 3 \-d\ directory -Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run. -.LP +Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run. +.br +.br For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory: .nf \f3 @@ -4196,28 +3086,27 @@ % \fP\f3javadoc \-d /home/user/doc com.mypackage\fP .fl .fi -.LP .TP 3 \-use -Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C. -.LP -For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP. -.LP -Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP. -.LP -You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar. +Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C. +.br +.br +For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP. +.br +.br +Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP. +.br +.br +You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar. .TP 3 \-version -Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option. -.LP +Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option. .TP 3 \-author -Includes the @author text in the generated docs. -.LP +Includes the @author text in the generated docs. .TP 3 \-splitindex -Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters. -.LP +Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters. .TP 3 \-windowtitle\ title Specifies the title to be placed in the HTML tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option. @@ -4238,8 +3127,7 @@ .fi .TP 3 \-title\ title -\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. -.LP +\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. .TP 3 \-header\ header Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped. @@ -4249,28 +3137,30 @@ % \fP\f3javadoc \-header "Java 2 Platform v1.4" com.mypackage\fP .fl .fi -.LP .TP 3 \-footer\ footer Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped. -.LP +.TP 3 +\-top +Specifies the text to be placed at the top of each output file. .TP 3 \-bottom\ text -Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. -.LP +Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. .TP 3 \-link\ extdocURL -Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: -.LP +Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: .RS 3 .TP 2 o -\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. -.LP -You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. -.LP -When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. -.LP +\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. +.br +.br +You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. +.br +.br +When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. +.br +.br In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the .na \f2URL Memo\fP @ @@ -4288,8 +3178,11 @@ \f2\-link <directory>/<directory>/.../<name>\fP .RE .RE -.LP -You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. \f3Choosing between \-linkoffline and \-link\fP: +You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. +.br +.br +\f3Choosing between \-linkoffline and \-link\fP: +.br .br Use \f2\-link\fP: .RS 3 @@ -4306,16 +3199,17 @@ o when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side. .RE -.LP +.br +.br \f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running: @@ -4325,17 +3219,21 @@ % \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP .fl .fi -.LP -Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). -.LP -\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. -.LP -Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) -.LP -This option can create links in several places in the generated documentation. -.LP -Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. -.LP +Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). +.br +.br +\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. +.br +.br +Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) +.br +.br +This option can create links in several places in the generated documentation. +.br +.br +Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. +.br +.br \f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced: .RS 3 .TP 2 @@ -4353,16 +3251,17 @@ .br The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement. .RE -.LP -An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. -.LP -\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. -.LP +An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. +.br +.br +\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. +.br +.br For example, the package list for the Java SE 6 API is located at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list. and starts as follows: +http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows: .nf \f3 .fl @@ -4384,31 +3283,39 @@ .fl \fP .fi -.LP -When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. -.LP -In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. -.LP -\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. -.LP -Specify a different link option for each external document to link to: -.LP -\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP -.LP -where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. -.LP -\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. -.LP -In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. -.LP +When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. +.br +.br +In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. +.br +.br +\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. +.br +.br +Specify a different link option for each external document to link to: +.br +.br +\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP +.br +.br +where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. +.br +.br +\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. +.br +.br +In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. .TP 3 \-linkoffline\ extdocURL\ packagelistLoc -This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. -.LP -More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. -.LP -Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. -.LP +This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. +.br +.br +More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. +.br +.br +Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. +.br +.br The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP: .RS 3 .TP 2 @@ -4418,35 +3325,39 @@ o \f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename. .RE -.LP -You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) -.LP -\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://java.sun.com/javase/6/docs/api\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at +You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) +.br +.br +\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi -.LP -\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. -.LP -\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. -.LP -\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): -.LP +\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. +.br +.br +\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. +.br +.br +\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): +.br +.br \f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP .br \f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP .br -\f2\ \ \ \ \ \ \ \ \ \ ...\fP -.LP -\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. -.LP +\f2\ \ \ \ \ \ \ \ \ \ ...\fP +.br +.br +\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. +.br +.br First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update: .nf \f3 @@ -4454,14 +3365,15 @@ % \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP .fl .fi -When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. -.LP +When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. .TP 3 \-linksource\ -Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. -.LP -\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. -.LP +Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. +.br +.br +\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. +.br +.br Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button": .nf \f3 @@ -4482,7 +3394,6 @@ .fl \fP .fi -.LP .TP 3 \-group\ groupheading\ packagepattern:packagepattern:... Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP. @@ -4494,16 +3405,12 @@ o \f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP). .RE -.RS 3 - -.LP -.LP \f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP -.LP -.RE -.LP -If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". -.LP +.br +.br +If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". +.br +.br For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package. .nf \f3 @@ -4517,7 +3424,6 @@ .fi This results in the groupings: .RS 3 -.RS 3 .TP 3 Core Packages \f2java.lang\fP @@ -4530,38 +3436,27 @@ Other Packages \f2java.new\fP .RE - -.LP -.RE -.LP .TP 3 \-nodeprecated -Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. -.LP +Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. .TP 3 \-nodeprecatedlist -Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. -.LP +Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. .TP 3 \-nosince -Omits from the generated docs the "Since" sections associated with the @since tags. -.LP +Omits from the generated docs the "Since" sections associated with the @since tags. .TP 3 \-notree -Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. -.LP +Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. .TP 3 \-noindex -Omits the index from the generated docs. The index is produced by default. -.LP +Omits the index from the generated docs. The index is produced by default. .TP 3 \-nohelp -Omits the HELP link in the navigation bars at the top and bottom of each page of output. -.LP +Omits the HELP link in the navigation bars at the top and bottom of each page of output. .TP 3 \-nonavbar -Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. -.LP +Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. .TP 3 \-helpfile\ path/filename Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example: @@ -4582,8 +3477,7 @@ .fi .TP 3 \-serialwarn -Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. -.LP +Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. .TP 3 \-charset\ name Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the @@ -4609,10 +3503,10 @@ .na \f2HTML standard\fP @ .fi -http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) -.LP +http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) +.br +.br Also see \-encoding and \-docencoding. -.LP .TP 3 \-docencoding\ name Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the @@ -4626,12 +3520,12 @@ % \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP .fl .fi -Also see \-encoding and \-charset. -.LP +Also see \-encoding and \-charset. .TP 3 \-keywords -Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) -.LP +Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) +.br +.br The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords: .nf \f3 @@ -4646,16 +3540,21 @@ .fl \fP .fi -.LP .TP 3 \-tag\ \ tagname:Xaoptcmf:"taghead" -Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. -.LP -The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. -.LP -The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. -.LP -\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: \f4X\fP (disable tag) +Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. +.br +.br +The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. +.br +.br +The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. +.br +.br +\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: +.br +.br +\f4X\fP (disable tag) .br \f4a\fP (all) .br @@ -4670,7 +3569,8 @@ \f4m\fP (methods) .br \f4f\fP (fields) -.LP +.br +.br \f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is: .nf \f3 @@ -4715,8 +3615,9 @@ .fl \fP .fi -\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. -.LP +\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. +.br +.br You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use: .nf \f3 @@ -4733,13 +3634,15 @@ .fl \fP .fi -.LP -The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. -.LP -\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. -.LP -If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. -.LP +The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. +.br +.br +\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. +.br +.br +If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. +.br +.br \f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed): .nf \f3 @@ -4758,21 +3661,23 @@ .fl \fP .fi -.LP -When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. -.LP -The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. -.LP -\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Sun will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Sun. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Sun later creates a standard tag of the same name. -.LP +When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. +.br +.br +The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. +.br +.br +\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name. +.br +.br \f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See .na \f2Comparing Annotations and Javadoc Tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations -.LP -You can also create more complex block tags, or custom inline tags with the \-taglet option. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations< +.br +.br +You can also create more complex block tags, or custom inline tags with the \-taglet option. .TP 3 \-taglet\ \ class Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see: @@ -4782,13 +3687,14 @@ .na \f2Taglet Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/taglet/overview.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html .RE -.LP -Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. -.LP -Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. -.LP +Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. +.br +.br +Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. +.br +.br Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages: .nf \f3 @@ -4809,25 +3715,21 @@ .fl \fP .fi -.LP -Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. -.LP +Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. .TP 3 \-tagletpath\ \ tagletpathlist -Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. -.LP +Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. .TP 3 \-docfilessubdirs\ -Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. -.LP +Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. .TP 3 \-excludedocfilessubdir\ \ name1:name2... -Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. -.LP +Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. .TP 3 \-noqualifier\ \ all\ | \ packagename1:packagename2:... -Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. -.LP +Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. +.br +.br The following example omits all package qualifiers: .nf \f3 @@ -4852,8 +3754,7 @@ .fl \fP .fi -Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. -.LP +Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. .TP 3 \-notimestamp\ Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this: @@ -4864,53 +3765,40 @@ .fl \fP .fi -.LP .TP 3 \-nocomment\ Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project. +.TP 3 +\-sourcetab tabLength +Specify the number of spaces each tab takes up in the source. .RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP -.LP To shorten or simplify the javadoc command line, you can specify one or more files that themselves contain arguments to the \f2javadoc\fP command (except \f2\-J\fP options). This enables you to create javadoc commands of any length on any operating system. .LP -.LP An argument file can include javac options and source filenames in any combination. The arguments within a file can be space\-separated or newline\-separated. If a filename contains embedded spaces, put the whole filename in double quotes. .LP -.LP Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. .LP -.LP When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list. -.LP .SS Example \- Single Arg File .LP -.LP You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments: -.LP .nf \f3 .fl % \fP\f3javadoc @argfile\fP .fl .fi - -.LP .LP This argument file could contain the contents of both files shown in the next example. -.LP .SS Example \- Two Arg Files .LP -.LP You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.) .LP -.LP Create a file named "\f2options\fP" containing: -.LP .nf \f3 .fl @@ -4920,13 +3808,13 @@ .fl \-splitindex .fl - \-windowtitle 'Java(TM) SE 7 API Specification' -.fl - \-doctitle 'Java(TM) SE 7 API Specification' -.fl - \-header 'Java(TM); SE 7' -.fl - \-bottom 'Copyright 1993\-2009 Sun Microsystems, Inc. All Rights Reserved.' + \-windowtitle 'Java SE 7 API Specification' +.fl + \-doctitle 'Java SE 7 API Specification' +.fl + \-header 'Java(TM) SE 7' +.fl + \-bottom 'Copyright © 1993\-2011 Oracle and/or its affiliates. All rights reserved.' .fl \-group "Core Packages" "java.*" .fl @@ -4936,11 +3824,8 @@ .fl \fP .fi - -.LP .LP Create a file named "\f2packages\fP" containing: -.LP .nf \f3 .fl @@ -4952,120 +3837,85 @@ .fl \fP .fi - -.LP .LP You would then run javadoc with: -.LP .nf \f3 .fl % \fP\f3javadoc @options @packages\fP .fl .fi - -.LP .SS Example \- Arg Files with Paths .LP -.LP The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP): -.LP .nf \f3 .fl % \fP\f3javadoc @path1/options @path2/packages\fP .fl .fi - -.LP .SS Example \- Option Arguments .LP -.LP Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument: -.LP .nf \f3 .fl -'<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a -.fl -bug or feature</a> Java is a trademark or registered trademark of -.fl -Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-2000 Sun -.fl -Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl -All Rights Reserved.' + +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners. .fl \fP .fi - -.LP .LP Then run the Javadoc tool with: -.LP .nf \f3 .fl % \fP\f3javadoc \-bottom @bottom @packages\fP .fl .fi - -.LP .LP Or you could include the \f2\-bottom\fP option at the start of the argument file, and then just run it as: -.LP .nf \f3 .fl % \fP\f3javadoc @bottom @packages\fP .fl .fi - -.LP - -.LP .SH "Name" Running -.LP .SH "RUNNING JAVADOC" .LP - -.LP -.LP \f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP. .LP -.LP \f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see .na \f2Standard Doclet\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. .LP \f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP .SH "SIMPLE EXAMPLES" .LP - -.LP -.LP You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP. -.LP .SS Documenting One or More Packages .LP -.LP To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP. .LP -.LP You can run javadoc either by changing directories (with \f2cd\fP) or by using \f2\-sourcepath\fP option. The examples below illustrate both alternatives. -.LP .RS 3 .TP 2 o @@ -5108,17 +3958,12 @@ .fl .fi .RE - -.LP .LP Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages. -.LP .SS Documenting One or More Classes .LP -.LP The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes. -.LP .RS 3 .TP 2 o @@ -5155,93 +4000,76 @@ .fi This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP. .RE - -.LP .SS Documenting Both Packages and Classes .LP -.LP You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes. -.LP .nf \f3 .fl % \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP .fl .fi - -.LP .LP This example generates HTML\-formatted documentation for the package \f2java.awt\fP and class \f2Applet\fP. (The Javadoc tool determines the package name for \f2Applet\fP from the package declaration, if any, in the \f2Applet.java\fP source file.) -.LP .SH "REAL WORLD EXAMPLE" .LP - -.LP -.LP The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2. .LP -.LP The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory. -.LP .SS Command Line Example .LP -.LP -This command line example is over 900 characters, which is too long for some shells, such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. -.LP +The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. .nf \f3 .fl -% javadoc \-sourcepath /java/jdk/src/share/classes \\ -.fl - \-overview /java/jdk/src/share/classes/overview.html \\ -.fl - \-d /java/jdk/build/api \\ -.fl - \-use \\ -.fl - \-splitIndex \\ -.fl - \-windowtitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-doctitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-header 'Java(TM) SE 7' \\ -.fl - \-bottom '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl -a bug or feature</a> Java is a trademark or registered trademark of Sun Microsystems, -.fl -Inc. in the US and other countries. Copyright 1993\-1999 Sun Microsystems, Inc. -.fl -901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All Rights Reserved.' \\ +% javadoc \-sourcepath /java/jdk/src/share/classes \\ +.fl + \-overview /java/jdk/src/share/classes/overview.html \\ +.fl + \-d /java/jdk/build/api \\ +.fl + \-use \\ +.fl + \-splitIndex \\ +.fl + \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-header 'Java(TM) SE 7' \\ +.fl + \-bottom ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl - \-group "Extension Packages" "javax.*" \\ -.fl - \-J\-Xmx180m \\ + \-group "Extension Packages" "javax.*" \\ +.fl + \-J\-Xmx180m \\ .fl @packages .fl \fP .fi - -.LP .LP where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below. -.LP .SS Makefile Example .LP -.LP This is an example of a GNU makefile. For an example of a Windows makefile, see .na \f2creating a makefile for Windows\fP @ .fi http://java.sun.com/j2se/javadoc/faq/index.html#makefiles. -.LP .nf \f3 .fl @@ -5283,15 +4111,15 @@ .fl HEADER = 'Java(TM) SE 7' .fl -BOTTOM = '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl - a bug or feature</a> Java is a trademark or registered trademark -.fl - of Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-1999 -.fl - Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl - All Rights Reserved.' +BOTTOM = ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -5301,14 +4129,10 @@ .fl \fP .fi - -.LP .LP Single quotes are used to surround makefile arguments. .LP -.LP \f3NOTES\fP -.LP .RS 3 .TP 2 o @@ -5320,15 +4144,9 @@ o Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP. .RE - -.LP .SH "TROUBLESHOOTING" -.LP - -.LP .SS General Troubleshooting -.LP .RS 3 .TP 2 o @@ -5347,37 +4165,23 @@ o \f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename. .RE - -.LP .SS Errors and Warnings .LP -.LP Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment. -.LP .RS 3 .TP 2 o \f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP. .RE - -.LP .SH "ENVIRONMENT" -.LP - -.LP .RS 3 .TP 3 CLASSPATH Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example: .:/home/classes:/usr/local/java/classes .RE - -.LP .SH "SEE ALSO" -.LP - -.LP .RS 3 .TP 2 o @@ -5399,75 +4203,24 @@ .na \f2Javadoc Home Page\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general .TP 2 o .na \f2How Javac and Javadoc Find Classes\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) .RE - -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 80 0 -.80 -.rm 80 -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 3869 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.fc -.nr T. 1 -.T# 1 -.35 -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-3 - -.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javah.1 --- a/jdk/src/linux/doc/man/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,38 +19,28 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "02 Jun 2010" +.TH javah 1 "10 May 2011" .LP .SH "Name" javah \- C Header and Stub File Generator .LP -.RS 3 - -.LP .LP \f3javah\fP produces C header files and C source files from a Java class. These files provide the connective glue that allow your Java and C code to interact. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . .fl -javah_g [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . -.fl \fP .fi .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3javah\fP generates C header and source files that are needed to implement native methods. The generated header and source files are used by C programs to reference an object's instance variables from native source code. The .h file contains a struct definition whose layout parallels the layout of the corresponding class. The fields in the struct correspond to instance variables in the class. .LP @@ -63,13 +53,8 @@ .LP The new native method interface, Java Native Interface (JNI), does not require header information or stub files. \f3javah\fP can still be used to generate native method function proptotypes needed for JNI\-style native methods. \f3javah\fP produces JNI\-style output by default, and places the result in the .h file. .LP -.LP -\f3javah_g\fP is a non\-optimized version of \f3javah\fP suitable for use with debuggers like jdb(1). -.LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-o outputfile @@ -110,11 +95,10 @@ .fl \fP .fi -.LP As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -132,8 +116,6 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH @@ -150,8 +132,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javap(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javap.1 --- a/jdk/src/linux/doc/man/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,21 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "02 Jun 2010" +.TH javap 1 "10 May 2011" .LP .SH "Name" javap \- The Java Class File Disassembler .LP -.RS 3 - -.LP .LP Disassembles class files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -47,13 +41,21 @@ .LP .SH "DESCRIPTION" .LP +.LP +The \f3javap\fP command disassembles one or more class files. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. +.LP +.RS 3 +.TP 3 +options +Command\-line options. +.TP 3 +classes +List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP). +.RE .LP .LP -The \f3javap\fP command disassembles a class file. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. For example, compile the following class declaration: -.LP -.RS 3 - +For example, compile the following class declaration: .LP .nf \f3 @@ -96,166 +98,160 @@ .fl \fP .fi -.RE .LP .LP -The output from \f3javap DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl \fP .fi -.RE .LP .LP -The output from \f3javap \-c DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap \-c DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 <Method java.applet.Applet()> + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."<init>":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 <Method void resize(int, int)> + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 <String "LAST_UPDATED"> + 10: aload_0 .fl - 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 <Field java.lang.String date> + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 <String "EMAIL"> + 20: aload_0 .fl - 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 <Field java.lang.String email> + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 <Class java.lang.StringBuffer> + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 <Method java.lang.StringBuffer()> + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V .fl - 9 getfield #5 <Field java.lang.String date> + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 <String " by "> + 15: ldc #11 // String by .fl - 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 <Method java.lang.String toString()> + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 <Field java.lang.String email> + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 43: return .fl - 43 return +} .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 -\-help +\-help \-\-help \-? Prints out help message for \f3javap\fP. .TP 3 +\-version +Prints out version information. +.TP 3 \-l Prints out line and local variable tables. .TP 3 @@ -268,14 +264,11 @@ \-package Shows only package, protected, and public classes and members. This is the default. .TP 3 -\-private +\-private \-p Shows all classes and members. .TP 3 \-Jflag Pass \f2flag\fP directly to the runtime system. Some examples: -.RS 3 - -.LP .nf \f3 .fl @@ -285,11 +278,16 @@ .fl \fP .fi -.RE .TP 3 \-s Prints internal type signatures. .TP 3 +\-sysinfo +Shows system information (path, size, date, MD5 hash) of the class being processed. +.TP 3 +\-constants +Shows static final constants. +.TP 3 \-c Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the .na @@ -301,22 +299,7 @@ Prints stack size, number of \f2locals\fP and \f2args\fP for methods. .TP 3 \-classpath path -Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.nf -\f3 -.fl - .:<your_path> -.fl -\fP -.fi -For example: -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -326,32 +309,8 @@ .RE .LP -.SH "ENVIRONMENT VARIABLES" -.LP - -.LP -.RS 3 -.TP 3 -CLASSPATH -Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example, For example: -.RS 3 - -.LP -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE -.RE - -.LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javah(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/javaws.1 --- a/jdk/src/linux/doc/man/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,30 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "02 Jun 2010" +.TH javaws 1 "10 May 2011" .LP .SH "Name" \f2javaws\fP Command Line .LP -.LP -\ -.LP -.SS -NAME -.LP -.RS 3 - +.SH "NAME" .LP .LP \f2javaws\fP \- Java Web Start launcher command .LP -.RE -.SS -SYNOPSIS -.LP -.RS 3 - +.SH "SYNOPSIS" .LP .LP \f2javaws [run\-options] <jnlp>\fP @@ -50,49 +38,27 @@ .LP \f2javaws [control\-options]\fP .LP -.RE -.SS -PARAMETERS -.LP -.RS 3 - +.SH "PARAMETERS" .LP .LP \f2[run\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below. .LP -.RE .LP \f2<jnlp>\fP .LP -.RS 3 - -.LP .LP This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file. .LP -.RE .LP \f2[control\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below. .LP -.RE -.RE -.SS -DESCRIPTION -.LP -.RS 3 - +.SH "DESCRIPTION" .LP .LP The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network. @@ -103,256 +69,154 @@ .LP The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release. .LP -.RE -.SS -RUN\-OPTIONS -.LP -.RS 3 - +.SH "RUN\-OPTIONS" .LP .LP \f2\-offline\fP .LP -.RS 3 - -.LP .LP -run Java Web Start in offline mode. +Run Java Web Start in offline mode. .LP -.RE .LP \f2\-Xnosplash\fP .LP -.RS 3 - +.LP +Do not display the initial splash screen. .LP .LP -disable the display of the initial splash screen. -.LP -.RE -.LP \f2\-open <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP. .LP -.RE .LP \f2\-print <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP. .LP -.RE .LP \f2\-online\fP .LP -.RS 3 - -.LP .LP -run in online mode (default behavior). +Use online mode (default behavior). .LP -.RE .LP \f2\-wait\fP .LP -.RS 3 - -.LP .LP -If specified, the \f2javaws\fP process will not exit until the application exits. +If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms. .LP -.RE .LP \f2\-verbose\fP .LP -.RS 3 - -.LP .LP -display additional output. +Display additional output. .LP -.RE .LP \f2\-J<option>\fP .LP -.RS 3 - -.LP .LP -supply options to the vm. +Supply options to the VM. .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP -.LP -run the application from the system cache only. .LP -.RE -.RE -.SS -CONTROL\-OPTIONS +Run the application from the system cache only. .LP -.RS 3 - +.SH "CONTROL\-OPTIONS" .LP .LP \f2\-viewer\fP .LP -.RS 3 - +.LP +Show the Cache Viewer in the Java Control Panel. .LP .LP -show the Cache Viewer in the java control panel +\f2\-clearcache\fP +.LP .LP -.RE +Remove all non\-installed applications from the cache. +.LP .LP \f2\-userConfig <property name>\fP .LP -.RS 3 - -.LP .LP -clear the specified deployment property. +Clear the specified deployment property. .LP -.RE .LP \f2\-userConfig <property name> <property value>\fP .LP -.RS 3 - -.LP .LP -set the specified deployment property to the specified value. +Set the specified deployment property to the specified value. .LP -.RE .LP \f2\-uninstall\fP .LP -.RS 3 - -.LP .LP -remove all applications from the cache. +Remove all applications from the cache. .LP -.RE .LP \f2\-uninstall <jnlp>\fP .LP -.RS 3 - -.LP .LP -remove the application from the cache. +Remove the application from the cache. .LP -.RE .LP \f2\-import [import\-options] <jnlp>\fP .LP -.RS 3 - -.LP .LP -import the application to the cache. +Import the application to the cache. .LP -.RE -\f3IMPORT\-OPTIONS\fP +.SH "IMPORT\-OPTIONS" .LP .LP \f2\-silent\fP .LP -.RS 3 - -.LP .LP -import silently (with no user interface). +Import silently (with no user interface). .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP .LP -import application to the system cache. +Import application to the system cache. .LP -.RE .LP \f2\-codebase <url>\fP .LP -.RS 3 - -.LP .LP -retrieve resources from the given codebase. +Retrieve resources from the given codebase. .LP -.RE .LP \f2\-shortcut\fP .LP -.RS 3 - -.LP .LP -install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. +Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE .LP \f2\-association\fP .LP -.RS 3 - -.LP -.LP -install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE -.RE -.SS -FILES +Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RS 3 - +.SH "FILES" .LP .LP For information about the user and system cache and deployment.properties files, see .na \f2System\- and User\-Level Properties\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html. +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html. .LP -.RE -.SS -MORE INFORMATION -.LP -.RS 3 - +.SH "MORE INFORMATION" .LP .LP For more information about Java Web Start, see .na \f2Java Web Start\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html. -.LP -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html. .LP -\ -.LP -.RE -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jconsole.1 --- a/jdk/src/linux/doc/man/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "02 Jun 2010" +.TH jconsole 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,41 +39,40 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 connection = pid | host:port | jmxUrl .RS 3 -\f2pid\fP\ \ \ Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See +.TP 2 +o +\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2host\fP:\f2port\fP\ \ Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2jmxUrl\fP\ \ Address of the JMX agent to be connected to as described in +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2jmxUrl\fP Address of the JMX agent to be connected to as described in .na \f2JMXServiceURL\fP @ .fi -http://java.sun.com/javase/6/docs/api/javax/management/remote/JMXServiceURL.html. +http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. .RE .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jconsole\fP command launches a graphical console tool that enables you to monitor and manage Java applications and virtual machines on a local or remote machine. .LP @@ -84,17 +81,15 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-interval=n Set the update interval to \f2n\fP seconds (default is 4 seconds). .TP 3 -\-notile\ +\-notile Do not tile windows initially (for two or more connections). .TP 3 -\-pluginpath\ plugins +\-pluginpath plugins Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named: .br .nf @@ -104,20 +99,19 @@ .fl \fP .fi -.LP containing one line for each plugin specifying the fully qualified class name of the class implementing the .na \f2com.sun.tools.jconsole.JConsolePlugin\fP @ .fi -http://java.sun.com/javase/6/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. +http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. .TP 3 -\-version\ +\-version Output version information and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jconsole is run. .RE @@ -130,13 +124,13 @@ .na \f2Using JConsole\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html .TP 2 o .na \f2Monitoring and Management for Java Platform\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jdb.1 --- a/jdk/src/linux/doc/man/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "02 Jun 2010" +.TH jdb 1 "10 May 2011" .LP .SH "Name" jdb \- The Java Debugger .LP -.RS 3 - -.LP .LP \f3jdb\fP helps you find and fix bugs in Java language programs. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified below. @@ -60,24 +51,18 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the .na \f2Java Platform Debugger Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. .LP .SS Starting a jdb Session .LP -.RS 3 - -.LP .LP There are many ways to start a jdb session. The most frequently used way is to have \f3jdb\fP launch a new Java Virtual Machine (VM) with the main class of the application to be debugged. This is done by substituting the command \f3jdb\fP for \f3java\fP in the command line. For example, if your application's main class is MyClass, you use the following command to debug it under JDB: .LP @@ -137,7 +122,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the .na \f21.4.2 documentation\fP @ .fi @@ -150,9 +135,6 @@ The following is a list of the basic \f3jdb\fP commands. The Java debugger supports other commands which you can list using \f3jdb\fP's \f2help\fP command. .LP .RS 3 - -.LP -.RS 3 .TP 3 help, or ? The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description. @@ -164,10 +146,12 @@ Continues execution of the debugged application after a breakpoint, exception, or step. .TP 3 print -Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. -.LP -\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. -.LP +Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. +.br +.br +\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. +.br +.br \f2print\fP supports many simple Java expressions including those with method invocations, for example: .RS 3 .TP 2 @@ -188,15 +172,13 @@ .RE .TP 3 dump -For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. -.LP -The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. +For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. +.br +.br +The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. .TP 3 threads List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example: -.RS 3 - -.LP .nf \f3 .fl @@ -204,26 +186,22 @@ .fl \fP .fi -.RE In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running, .TP 3 thread Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above. .TP 3 where -\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. -.LP -If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. +\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. +.br +.br +If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. .RE .LP -.RE .SS Breakpoints .LP -.RS 3 - -.LP .LP Breakpoints can be set in \f3jdb\fP at line numbers or at the first instruction of a method, for example: .LP @@ -249,23 +227,15 @@ .LP The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution. .LP -.RE .SS Stepping .LP -.RS 3 - -.LP .LP The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame. .LP -.RE .SS Exceptions .LP -.RS 3 - -.LP .LP When an exception occurs for which there isn't a catch statement anywhere in the throwing thread's call stack, the VM normally prints an exception trace and exits. When running under \f3jdb\fP, however, control returns to \f3jdb\fP at the offending throw. You can then use \f3jdb\fP to diagnose the cause of the exception. .LP @@ -278,12 +248,8 @@ .LP \f2NOTE: The \fP\f2ignore\fP command does not cause the debugged VM to ignore specific exceptions, only the debugger. .LP -.RE -.RE .SH "Command Line Options" .LP - -.LP .LP When you use \f3jdb\fP in place of the Java application launcher on the command line, \f3jdb\fP accepts many of the same options as the java command, including \f2\-D\fP, \f2\-classpath\fP, and \f2\-X<option>\fP. .LP @@ -335,7 +301,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection alternatives. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives. .LP .SS Options Forwarded to Debuggee Process @@ -358,8 +324,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), javah(1), javap(1), javadoc(1). .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jhat.1 --- a/jdk/src/linux/doc/man/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "02 Jun 2010" +.TH jhat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,17 +39,17 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 heap\-dump\-file Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3". -.SH "DESCRIPTION" +.RE + +.LP +.SH "DESCRIPTION" .LP .LP The \f3jhat\fP command parses a java heap dump file and launches a webserver. jhat enables you to browse heap dumps using your favorite webbrowser. jhat supports pre\-designed queries (such as 'show all instances of a known class "Foo"') as well as \f3OQL\fP (\f3O\fPbject \f3Q\fPuery \f3L\fPanguage) \- a SQL\-like query language to query heap dumps. Help on OQL is available from the OQL help page shown by jhat. With the default port, OQL help is available at http://localhost:7000/oqlhelp/ @@ -69,7 +67,7 @@ .na \f2HotSpotDiagnosticMXBean\fP @ .fi -http://java.sun.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; +http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; .TP 2 o Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option; @@ -86,7 +84,8 @@ .LP \f3NOTE:\fP This tool is \f3experimental\fP and may \f3not\fP be available in future versions of the JDK. .LP -.SH "OPTIONS" +.SH "OPTIONS" +.LP .RS 3 .TP 3 \-stack false/true @@ -107,21 +106,22 @@ \-debug int Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes. .TP 3 -\-version\ +\-version Report version number and exit. .TP 3 -\-h\ +\-h Output help message and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB. .RE .LP -.SH "SEE ALSO" +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -136,5 +136,6 @@ .fi http://java.sun.com/developer/technicalArticles/Programming/HPROF.html .RE -.RE + +.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jinfo.1 --- a/jdk/src/linux/doc/man/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "02 Jun 2010" +.TH jinfo 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,54 +41,55 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option Options are mutually exclusive. Option, if used, should follow immediately after the command name. +.RE + +.LP .RS 3 .TP 3 pid process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. .RE + +.LP .RS 3 .TP 3 executable Java executable from which the core dump was produced. .RE + +.LP .RS 3 .TP 3 core core file for which the configuration info is to be printed. .RE + +.LP .RS 3 .TP 3 remote\-hostname\-or\-IP remote debug server's (see jsadebugd(1)) hostname or IP address. .RE + +.LP .RS 3 .TP 3 server\-id optional unique id, if multiple debug servers are running on the same remote host. .RE -.RE .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jinfo\fP prints Java configuration information for a given Java process or core file or a remote debug server. Configuration information includes Java System properties and Java virtual machine command line flags. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br - +jinfo \-J\-d64 \-sysprops pid .LP -.RS 3 - -.LP -jinfo \-J\-d64 \-sysprops pid -.RE .LP \f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' need to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP .LP @@ -99,8 +98,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jmap.1 --- a/jdk/src/linux/doc/man/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "02 Jun 2010" +.TH jmap 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,8 +41,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option @@ -74,14 +70,9 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jmap\fP prints shared object memory maps or heap memory details of a given process or core file or a remote debug server. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -89,10 +80,11 @@ .fl \fP .fi -.RE .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP +\f3NOTE: This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP .LP \f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP @@ -101,12 +93,10 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> -When no option is used \f3jmap\fP prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. +When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. .br .TP 3 \-dump:[live,]format=b,file=<filename> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jps.1 --- a/jdk/src/linux/doc/man/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "02 Jun 2010" +.TH jps 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,8 +39,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -55,8 +51,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jps\fP tool lists the instrumented HotSpot Java Virtual Machines (JVMs) on the target system. The tool is limited to reporting information on JVMs for which it has the access permissions. .LP @@ -77,8 +71,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jps\fP command supports a number of options that modify the output of the command. These options are subject to change or removal in the future. .LP @@ -107,9 +99,6 @@ .SS HOST IDENTIFIER .LP -.RS 3 - -.LP .LP The host identifier, or \f2hostid\fP is a string that indicates the target system. The syntax of the \f2hostid\fP string largely corresponds to the syntax of a URI: .LP @@ -140,11 +129,8 @@ .RE .LP -.RE .SH "OUTPUT FORMAT" .LP - -.LP .LP The output of the \f3jps\fP command follows the following pattern: .LP @@ -169,8 +155,6 @@ .LP .SH "EXAMPLES" .LP - -.LP .LP This section provides examples of the \f3jps\fP command. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jrunscript.1 --- a/jdk/src/linux/doc/man/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "02 Jun 2010" +.TH jrunscript 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jrunscript\fP is a command line script shell. jrunscript supports both an interactive (read\-eval\-print) mode and a batch (\-f option) mode of script execution. This is a scripting language independent shell. By default, JavaScript is the language used, but the \-l option can be used to specify a different language. Through Java to scripting language communication, jrunscript supports "exploratory programming" style. .LP @@ -63,8 +57,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath path @@ -112,10 +104,8 @@ .LP .SH "EXAMPLES" .LP -\f3Executing inline scripts\fP -.LP -.RS 3 - +.SS +Executing inline scripts .LP .nf \f3 @@ -126,13 +116,10 @@ .fl \fP .fi -.RE .LP -\f3Use specified language and evaluate given script file\fP -.LP -.RS 3 - +.SS +Use specified language and evaluate given script file .LP .nf \f3 @@ -141,42 +128,42 @@ .fl \fP .fi -.RE .LP -\f3Interactive mode\fP -.LP -.RS 3 - +.SS +Interactive mode .LP .nf \f3 .fl jrunscript .fl -js>print('hello world'); +js> print('Hello World\\n'); +.fl +Hello World .fl -hello world +js> 34 + 55 .fl -js>34 + 55 +89.0 .fl -89 +js> t = new java.lang.Thread(function() { print('Hello World\\n'); }) +.fl +Thread[Thread\-0,5,main] .fl -js> thread(function() { print('hello world'); } +js> t.start() .fl -hello world +js> Hello World +.fl + .fl js> .fl \fP .fi -.RE .LP -\f3Run script file with script arguments\fP -.LP -.RS 3 - +.SS +Run script file with script arguments .LP .nf \f3 @@ -185,13 +172,16 @@ .fl \fP .fi -.RE .LP test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array. .SH "SEE ALSO" .LP .LP -If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in jsdocs. +If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in +.na +\f2jsdocs\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jsadebugd.1 --- a/jdk/src/linux/doc/man/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "02 Jun 2010" +.TH jsadebugd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,35 +39,16 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 pid process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process. -.RE - -.LP -.RS 3 .TP 3 executable -.RE - -.LP -.RS 3 -.TP 3 Java executable from which the core dump was produced -.RE - -.LP -.RS 3 .TP 3 core Core file to which the debug server should attach. -.RE - -.LP -.RS 3 .TP 3 server\-id Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique. @@ -78,17 +57,12 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP, .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi must be started with: -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with: .LP .nf \f3 @@ -97,17 +71,16 @@ .fl \fP .fi -.RE .LP .LP where \f2$JAVA_HOME\fP is the JDK installation directory. If rmiregistry was not started, jsadebugd will start an rmiregistry in a standard (1099) port internally. Debug server may be stopped by sending SIGINT (pressing Ctrl\-C) to it. .LP .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +\f3NOTE\fP \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \f2PATH\fP environment variable should contain the location of \f2jvm.dll\fP used by the target process or the location from which the Crash Dump file was produced. .LP .LP -\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP +For example, \f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP .SH "SEE ALSO" .LP @@ -129,7 +102,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jstack.1 --- a/jdk/src/linux/doc/man/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "02 Jun 2010" +.TH jstack 1 "10 May 2011" .LP .SH "Name" @@ -29,8 +29,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,8 +43,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .LP Options are mutually exclusive. Option, if used, should follow immediately after the command name. See OPTIONS. .LP @@ -78,16 +74,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jstack\fP prints Java stack traces of Java threads for a given Java process or core file or a remote debug server. For each Java frame, the full class name, method name, 'bci' (byte code index) and line number, if available, are printed. With the \-m option, jstack prints both Java and native frames of all threads along with the 'pc' (program counter). For each native frame, the closest native symbol to 'pc', if available, is printed. C++ mangled names are not demangled. To demangle C++ names, the output of this command may be piped to \f3c++filt\fP. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br .LP -.RS 3 - -.LP .nf \f3 .fl @@ -95,7 +86,6 @@ .fl \fP .fi -.RE .LP .LP @@ -106,8 +96,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-F @@ -118,7 +106,7 @@ .na \f2ownable synchronizers\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. +http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. .TP 3 \-m prints mixed mode (both Java and native C/C++ frames) stack trace. @@ -154,8 +142,6 @@ .LP .SH "KNOWN BUGS" .LP - -.LP .LP Mixed mode stack trace, the \-m option, does not work with the remote debug server. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jstat.1 --- a/jdk/src/linux/doc/man/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "02 Jun 2010" +.TH jstat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 generalOption @@ -60,17 +56,15 @@ The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details. .TP 3 interval[s|ms] -Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds.\ Must be a positive integer.\ If specified, \f3jstat\fP will produce its output at each interval. +Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval. .TP 3 count -Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated.\ Must be a positive integer. +Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer. .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstat\fP tool displays performance statistics for an instrumented HotSpot Java virtual machine (JVM). The target JVM is identified by its virtual machine identifier, or \f2vmid\fP option described below. .LP @@ -82,9 +76,6 @@ .SS VIRTUAL MACHINE IDENTIFIER .LP -.RS 3 - -.LP .LP The syntax of the \f2vmid\fP string largely corresponds to the syntax of a URI: .LP @@ -115,11 +106,8 @@ .RE .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The \f3jstat\fP command supports two types of options, general options and output options. General options cause \f3jstat\fP to display simple usage and version information. Output options determine the content and format of the statistical output. .br @@ -150,14 +138,11 @@ .SS OUTPUT OPTIONS .LP -.RS 3 - +.LP +If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J). The \f2statOption\fP must come first. .LP .LP -If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J).\ The \f2statOption\fP must come first. -.LP -.LP -Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns.\ Use the \f3\-h\fP option to set the frequency at which the header is displayed.\ Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. +Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns. Use the \f3\-h\fP option to set the frequency at which the header is displayed. Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. .LP .LP Use the \f3\-t\fP option to display a time stamp column, labeled \f2Timestamp\fP as the first column of output. The \f2Timestamp\fP column contains the elapsed time, in seconds, since startup of the target JVM. The resolution of the time stamp is dependent on various factors and is subject to variation due to delayed thread scheduling on heavily loaded systems. @@ -171,11 +156,10 @@ .RS 3 .TP 3 \-statOption -Determines the statistics information that \f3jstat\fP displays. The following table lists the available options.\ Use the \f3\-options\fP general option to display the list of options for a particular platform installation. +Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation. .br .br .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -457,7 +441,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 230 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 215 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -683,7 +667,6 @@ .rm j+ .rm k+ .rm l+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-52 .TP 3 \-h n @@ -697,13 +680,9 @@ .RE .LP -.RE .SS STATOPTIONS AND OUTPUT .LP -.RS 3 - -.LP .LP The following tables summarize the columns that \f3jstat\fP outputs for each \f2statOption\fP. .br @@ -713,7 +692,6 @@ \-class Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -825,7 +803,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 280 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 261 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -910,7 +888,6 @@ .rm a+ .rm b+ .rm c+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-21 .LP @@ -918,7 +895,6 @@ \-compiler Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -1082,7 +1058,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 316 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 297 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1210,7 +1186,6 @@ .rm d+ .rm e+ .rm f+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-29 .LP @@ -1218,7 +1193,6 @@ \-gc Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -1546,7 +1520,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 386 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 367 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1814,7 +1788,6 @@ .rm l+ .rm m+ .rm n+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-63 .LP @@ -1822,7 +1795,6 @@ \-gccapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2170,7 +2142,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 460 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 441 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2455,7 +2427,6 @@ .rm m+ .rm n+ .rm o+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-67 .LP @@ -2466,7 +2437,6 @@ This option displays the same summary of garbage collection statistics as the \f3\-gcutil\fP option, but includes the causes of the last garbage collection event and (if applicable) the current garbage collection event. In addition to the columns listed for \f3\-gcutil\fP, this option adds the following columns: .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2550,7 +2520,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 483 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 464 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2610,7 +2580,6 @@ .35 .rm a+ .rm b+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-13 .LP @@ -2618,7 +2587,6 @@ \-gcnew Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -2866,7 +2834,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 537 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 518 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3066,7 +3034,6 @@ .rm h+ .rm i+ .rm j+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-47 .LP @@ -3074,7 +3041,6 @@ \-gcnewcapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -3094,15 +3060,14 @@ .rm 80 81 .nr 34 \n(.lu .eo -.am 80 +.am 81 .br .di a+ .35 .ft \n(.f .ll \n(34u*1u/3u -.if \n(.l<\n(80 .ll \n(80u +.if \n(.l<\n(81 .ll \n(81u .in 0 -NGCMN\ \ \ \ \ \ \ \ \ T}~T{ Minimum new generation capacity (KB). .br .di @@ -3262,9 +3227,11 @@ .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \w\f3Column\fP .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGCMX \ \ \ +.nr 38 \wNGCMN .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGC \ \ \ +.nr 38 \wNGCMX +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \wNGC .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \wS0CMX .if \n(80<\n(38 .nr 80 \n(38 @@ -3284,8 +3251,6 @@ .if \n(80<\n(38 .nr 80 \n(38 .80 .rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 .nr 81 0 .nr 38 \w\f3Description\fP .if \n(81<\n(38 .nr 81 \n(38 @@ -3293,6 +3258,8 @@ .if \n(81<\n(38 .nr 81 \n(38 .81 .rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(b- .if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(c- @@ -3321,7 +3288,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 593 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 572 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3348,11 +3315,11 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'\h'|\n(41u' +\&\h'|\n(40u'NGCMN\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v -.nr 37 \n(40u +.nr 37 \n(41u .in +\n(37u .a+ .in -\n(37u @@ -3364,7 +3331,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGCMX \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGCMX\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3380,7 +3347,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGC \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGC\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3521,15 +3488,13 @@ .rm h+ .rm i+ .rm j+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-49 +.if \n-(b.=0 .nr c. \n(.c-\n(d.-47 .LP .SS \-gcold Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -3717,7 +3682,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 635 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 614 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3866,7 +3831,6 @@ .rm e+ .rm f+ .rm g+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-35 .LP @@ -3874,7 +3838,6 @@ \-gcoldcapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -4062,7 +4025,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 677 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 656 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4211,7 +4174,6 @@ .rm e+ .rm f+ .rm g+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-35 .LP @@ -4219,7 +4181,6 @@ \-gcpermcapacity Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -4407,7 +4368,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 719 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 698 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4556,7 +4517,6 @@ .rm e+ .rm f+ .rm g+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-35 .LP @@ -4564,7 +4524,6 @@ \-gcutil Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -4792,7 +4751,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 769 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 748 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4975,7 +4934,6 @@ .rm g+ .rm h+ .rm i+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-43 .LP @@ -4983,7 +4941,6 @@ \-printcompilation Option .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -5091,7 +5048,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 795 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 774 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -5172,14 +5129,10 @@ .rm a+ .rm b+ .rm c+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-19 .LP -.SS - -.LP -.SH "" +.SH "EXAMPLES" .LP .LP This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891. @@ -5355,7 +5308,6 @@ .LP The \f2lvmid\fP is combined with the name of the remote host to construct a \f2vmid\fP of \f240496@remote.domain\fP. This \f2vmid\fP results in the use of the \f3rmi\fP protocol to communicate to the default \f3jstatd\fP server on the remote host. The \f3jstatd\fP server is located using the \f3rmiregistry\fP on \f2remote.domain\fP that is bound to the default \f3rmiregistry\fP port (port 1099). .LP -.RE .SH "SEE ALSO" .LP .RS 3 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jstatd.1 --- a/jdk/src/linux/doc/man/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "02 Jun 2010" +.TH jstatd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -42,8 +40,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstatd\fP tool is an RMI server application that monitors for the creation and termination of instrumented HotSpot Java virtual machines (JVMs) and provides a interface to allow remote monitoring tools to attach to JVMs running on the local host. .LP @@ -66,8 +60,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jstatd\fP command supports the following options: .LP @@ -89,8 +81,6 @@ .LP .SH "SECURITY" .LP - -.LP .LP The \f3jstatd\fP server can only monitor JVMs for which it has the appropriate native access permissions. Therefor the \f3jstatd\fP process must be running with the same user credentials as the target JVMs. Some user credentials, such as the \f2root\fP user in UNIX(TM) based systems, have permission to access the instrumentation exported by any JVM on the system. A \f3jstatd\fP process running with such credentials can monitor any JVM on the system, but introduces additional security concerns. .LP @@ -102,7 +92,7 @@ .na \f2Policy File Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html. .LP .LP The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server. @@ -145,15 +135,11 @@ .LP .SH "REMOTE INTERFACE" .LP - -.LP .LP The interface exported by the \f3jstatd\fP process is proprietary and is guaranteed to change. Users and developers are discouraged from writing to this interface. .LP .SH "EXAMPLES" .LP - -.LP .LP Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background. .LP @@ -264,7 +250,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/jvisualvm.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/linux/doc/man/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,104 @@ +." Copyright (c) 2008, 2011, 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. +." +.TH jvisualvm 1 "10 May 2011" + +.LP +.SH "Name" +\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool +.LP +.SH "SYNOPSIS" +.LP +.nf +\f3 +.fl + \fP\f3jvisualvm\fP [ \f2options\fP ] +.fl +.fi + +.LP +.SH "PARAMETERS" +.LP +.LP +Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below. +.LP +.SH "DESCRIPTION" +.LP +.LP +Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP. +.LP +.LP +Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins. +.LP +.SH "OPTIONS" +.LP +.LP +The following option is possible when you launch Java VisualVM. +.LP +.RS 3 +.TP 3 +\-J<jvm_option>\ +Pass this \f2<jvm_option>\fP to the JVM software. +.RE + +.LP +.SH "USAGE" +.LP +.LP +Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus. +.LP +.LP +Start Java VisualVM with the following command: +.LP +.nf +\f3 +.fl +% jvisualvm \fP\f4<options>\fP\f3 +.fl +\fP +.fi + +.LP +.SH "SEE ALSO" +.LP +.LP +For more details about Java VisualVM see the following pages. +.LP +.RS 3 +.TP 2 +o +.na +\f2Java VisualVM developers' site\fP @ +.fi +http://visualvm.java.net +.TP 2 +o +.na +\f2Java VisualVM in Java SE platform documentation\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html +.RE + +.LP +.LP +\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/keytool.1 --- a/jdk/src/linux/doc/man/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,21 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "02 Jun 2010" +.TH keytool 1 "10 May 2011" .LP .SH "Name" keytool \- Key and Certificate Management Tool .LP -.RS 3 - .LP Manages a keystore (database) of cryptographic keys, X.509 certificate chains, and trusted certificates. -.RE +.LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP \f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers. .LP A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it. @@ -57,14 +51,12 @@ \f3keytool\fP also enables users to administer secret keys used in symmetric encryption/decryption (e.g. DES). .LP .LP -\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. +\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. .LP .SH "COMMAND AND OPTION NOTES" .LP - .LP -.LP -The various commands and their options are listed and described below . Note: +The various commands and their options are listed and described below. Note: .LP .RS 3 .TP 2 @@ -114,6 +106,7 @@ .fl \fP .fi +.LP is equivalent to .nf \f3 @@ -128,10 +121,9 @@ .SS Option Defaults .LP -.RS 3 - .LP -Below are the defaults for various option values. +Below are the defaults for various option values. +.LP .nf \f3 .fl @@ -153,12 +145,16 @@ .fl 1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA") .fl + 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC") +.fl 56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES") .fl 168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede") .fl .fl + +.fl \-validity 90 .fl @@ -169,7 +165,7 @@ .fl \-storetype the value of the "keystore.type" property in the security properties file, .fl - which is returned by the static \fP\f4getDefaultType\fP\f3 method in + which is returned by the static \fP\f4getDefaultType\fP\f3 method in .fl \fP\f4java.security.KeyStore\fP\f3 .fl @@ -181,25 +177,39 @@ .fl \-protected false .fl - -.fl \fP .fi .LP -In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA", and if the underlying private key is of type "RSA", \f2\-sigalg\fP defaults to "SHA256withRSA". Please consult the +.LP +In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: +.LP +.RS 3 +.TP 2 +o +If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA" +.TP 2 +o +If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA". +.TP 2 +o +If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA". +.RE + +.LP +.LP +Please consult the .na \f2Java Cryptography Architecture API Specification & Reference\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. +.LP .SS Common Options .LP -.RS 3 - .LP -The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +.LP .LP There is also a \f2\-J\fP\f2javaoption\fP option that may appear for any command. If it appears, the specified \f2javaoption\fP string is passed through directly to the Java interpreter. This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .LP @@ -209,46 +219,65 @@ .RS 3 .TP 3 \-storetype storetype -This qualifier specifies the type of keystore to be instantiated. +.LP +This qualifier specifies the type of keystore to be instantiated. .TP 3 \-keystore keystore +.LP The keystore location. .LP If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device). .TP 3 -\-storepass storepass +\-storepass[:env|:file] argument +.LP The password which is used to protect the integrity of the keystore. .LP -\f2storepass\fP must be at least 6 characters long. It must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +.LP +\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).) +.LP +The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. .LP When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed. .TP 3 \-providerName provider_name -Used to identify a cryptographic service provider's name when listed in the security properties file. +.LP +Used to identify a cryptographic service provider's name when listed in the security properties file. .TP 3 \-providerClass provider_class_name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. +.LP +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. .TP 3 \-providerArg provider_arg -Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. +.LP +Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. .TP 3 \-protected +.LP Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. .LP Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively. .TP 3 \-ext {name{:critical}{=value}} -Denotes an X.509 certificate extension. The option can be used in \f2\-genkeypair\fP and \f2\-gencert\fP to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2":critical"\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. -.RS 3 +.LP +Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP. +.RE .LP .LP Currently keytool supports these named extensions (case\-insensitive): .LP .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -478,7 +507,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 289 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 319 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -649,7 +678,6 @@ .rm h+ .rm i+ .rm j+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-38 .LP @@ -657,7 +685,7 @@ For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then. .LP .LP -A special name \f2"honored"\fP, used in \-gencert only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma\-seperated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. +A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. .LP .LP If, besides the \-ext honored option, another named or OID \-ext option is provided, this extension will be added to those already honored. However, if this name (or OID) also appears in the honored value, its value and criticality overrides the one in the request. @@ -668,32 +696,61 @@ .LP \f3Note:\fP Users should be aware that some combinations of extensions (and other certificate fields) may not conform to the Internet standard. See Warning Regarding Certificate Conformance for details. .LP -.RE -.RE -.RE .SH "COMMANDS" .LP - -.LP .SS Creating or Adding Data to the Keystore .LP .RS 3 - +.TP 3 +\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP -.RS 3 -.TP 3 -\-gencert {\-infile infile} {\-outfile outfile} {\-dname dname} {\-ext ext}* {\-rfc} {\-alias alias} {\-sigalg sigalg} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] [\-keypass keypass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. .LP -Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from infile (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into outfile (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. -.LP -\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. valDays tells the number of days for which the certificate should be considered valid. +\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid. .LP If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used. .LP -\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +.LP +The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain. +.LP +The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP: +.nf +\f3 +.fl +keytool \-alias ca \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca1 \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca2 \-dname CN=CA \-genkeypair +.fl +keytool \-alias e1 \-dname CN=E1 \-genkeypair +.fl +\fP +.fi +.LP +The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued: +.nf +\f3 +.fl +keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert +.fl +keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert +.fl +\fP +.fi +.LP +The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain: +.nf +\f3 +.fl +keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert +.fl +\fP +.fi .TP 3 -\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP. .LP @@ -704,30 +761,18 @@ \f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long. .LP \f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field. -.RS 3 - .LP -.LP -The option value can be set in one of these two forms: -.LP +The option value can be set in one of these two forms: .RS 3 .TP 3 1. -.LP -([+\-]\f2nnn\fP[ymdHMS])+ +([+\-]\f2nnn\fP[ymdHMS])+ .TP 3 2. -.LP -[yyyy/mm/dd] [HH:MM:SS] +[yyyy/mm/dd] [HH:MM:SS] .RE - -.LP .LP -With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: -.LP -.RS 3 - -.LP +With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: .nf \f3 .fl @@ -743,16 +788,10 @@ .fl \fP .fi -.RE - -.LP .LP -With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local timezone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. -.LP +With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. .LP -When the option is not provided, the start date is the current time. The option can be provided at most once. -.LP -.RE +When the option is not provided, the start date is the current time. The option can be provided at most once. .LP \f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid. .LP @@ -790,25 +829,17 @@ \f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply. .RE \f3Importing a New Trusted Certificate\fP -.RS 3 -.LP -Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. -.LP .LP -If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". +Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. .LP -.LP -If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. +If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". .LP -.RE +If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. \f3Importing a Certificate Reply\fP -.RS 3 .LP -When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). -.LP +When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). .LP -The methods of determining whether the certificate reply is trusted are described in the following: -.LP +The methods of determining whether the certificate reply is trusted are described in the following: .RS 3 .TP 2 o @@ -817,12 +848,8 @@ o \f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it. .RE - .LP -.LP -If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. -.LP -.RE +If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. .LP This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward. .TP 3 @@ -842,14 +869,12 @@ .LP Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input. .RE -.RE + +.LP .SS Exporting Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP @@ -879,14 +904,10 @@ .RE .LP -.RE .SS Displaying Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption} .LP @@ -896,27 +917,36 @@ .LP You cannot specify both \f2\-v\fP and \f2\-rfc\fP. .TP 3 -\-printcert {\-file cert_file | \-sslserver host[:port]} {\-rfc} {\-v} {\-Jjavaoption} +\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption} .LP +Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin. .LP If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard. .LP If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard .LP -If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the JSSE Reference Guide for more information. +If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the +.na +\f2JSSE Reference Guide\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information. +.LP +\f3Note\fP: This option can be used independently of a keystore. +.TP 3 +\-printcrl \-file crl_ {\-v} +.LP +Reads the certificate revocation list (CRL) from the file \f2crl_file\fP. +.LP +A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP. .LP \f3Note\fP: This option can be used independently of a keystore. .RE .LP -.RE .SS Managing the Keystore .LP .RS 3 - -.LP -.RS 3 .TP 3 \-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} .LP @@ -940,46 +970,45 @@ .RE .LP -.RE .SS Getting Help .LP .RS 3 - -.LP -.RS 3 .TP 3 \-help .LP -Lists the basic commands and their options. +Lists the basic commands and their options. +.LP +For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command: +.nf +\f3 +.fl + keytool \-\fP\f4command_name\fP\f3 \-help +.fl +\fP +.fi .RE .LP -.RE .SH "EXAMPLES" .LP - -.LP .LP Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust. .LP .SS Generating Your Key Pair .LP -.RS 3 - -.LP .LP The first thing you need to do is create a keystore and generate the key pair. You could use a command such as the following: .LP .nf \f3 .fl - keytool \-genkeypair \-dname "cn=Mark Jones, ou=JavaSoft, o=Sun, c=US" + keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180 .fl \fP .fi @@ -989,10 +1018,10 @@ (Please note: This must be typed as a single line. Multiple lines are used in the examples just for legibility purposes.) .LP .LP -This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password "ab987c". It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "JavaSoft", organization of "Sun" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. +This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password specified by \f2<new password for keystore>\fP. It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "Java", organization of "Oracle" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. .LP .LP -It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password "kpi135". +It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password specified by \f2<new password for private key>\fP. .LP .LP The command could be significantly shorter if option defaults were accepted. As a matter of fact, no options are required; defaults are used for unspecified options that have default values, and you are prompted for any required values. Thus, you could simply have the following: @@ -1006,17 +1035,15 @@ .fi .LP -In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. +.LP +In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. .LP -The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (a private key password of "kpi135", etc.) .LP -.RE +The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US"). +.LP .SS Requesting a Signed Certificate from a Certification Authority .LP -.RS 3 - -.LP .LP So far all we've got is a self\-signed certificate. A certificate is more likely to be trusted by others if it is signed by a Certification Authority (CA). To get such a signature, you first generate a Certificate Signing Request (CSR), via the following: .LP @@ -1029,14 +1056,12 @@ .fi .LP +.LP This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.) -.RE +.LP .SS Importing a Certificate for the CA .LP -.RS 3 - -.LP .LP You need to replace your self\-signed certificate with a certificate chain, where each certificate in the chain authenticates the public key of the signer of the previous certificate in the chain, up to a "root" CA. .LP @@ -1054,7 +1079,7 @@ .LP .LP -The "cacerts" keystore file ships with five VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". +The "cacerts" keystore file ships with several VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". .LP .LP A certificate from a CA is usually either self\-signed, or signed by another CA (in which case you also need a certificate authenticating that CA's public key). Suppose company ABC, Inc., is a CA, and you obtain a file named "ABCCA.cer" that is purportedly a self\-signed certificate from ABC, authenticating that CA's public key. @@ -1074,14 +1099,12 @@ .fi .LP +.LP This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry. -.RE +.LP .SS Importing the Certificate Reply from the CA .LP -.RS 3 - -.LP .LP Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file. .LP @@ -1095,16 +1118,14 @@ .fl \fP .fi -.RE .LP .SS Exporting a Certificate Authenticating Your Public Key .LP -.RS 3 - .LP -Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +.LP .LP One way they can do this is by first importing your public key certificate into their keystore as a "trusted" entry. You can export the certificate and supply it to your clients. As an example, you can copy your certificate to a file named \f2MJ.cer\fP via the following, assuming the entry is aliased by "mykey": .LP @@ -1117,14 +1138,12 @@ .fi .LP +.LP Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature. -.RE +.LP .SS Importing Keystore .LP -.RS 3 - -.LP .LP The command "importkeystore" is used to import an entire keystore into another keystore, which means all entries from the source keystore, including keys and certificates, are all imported to the destination keystore within a single command. You can use this command to import entries from a different type of keystore. During the import, all new entries in the destination keystore will have the same alias names and protection passwords (for secret keys and private keys). If \f3keytool\fP has difficulties recover the private keys or secret keys from the source keystore, it will prompt you for a password. If it detects alias duplication, it will ask you for a new one, you can specify a new alias or simply allow \f3keytool\fP to overwrite the existing one. .LP @@ -1134,128 +1153,108 @@ .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \fP .fi .LP .LP -The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the desination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. In this way, you can issue a \f3keytool\fP command that will never ask you a question. This makes it very convenient to include a \f3keytool\fP command into a script file, like this: +The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the destination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. The following command demonstrates this: .LP .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3 .fl \-noprompt .fl \fP .fi -.RE .LP .SS -Generating Certificates for a typical SSL Server -.LP -.RS 3 - +Generating Certificates for a Typical SSL Server .LP .LP -Keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermadiate CA (ca), and SSL server (server) are as follows: +The following are keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermediate CA (ca), and SSL server (server). Ensure that you store all the certificates in the same keystore. In these examples, it is recommended that you specify RSA as the key algorithm. .LP .nf \f3 .fl -keytool \-keystore root.jks \-genkeypair \-alias root \-ext bc:c +keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c .fl -keytool \-keystore ca.jks \-alias ca +keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c .fl -keytool \-keystore server.jks \-alias server +keytool \-genkeypair \-keystore server.jks \-alias server .fl - + .fl -keytool \-keystore root.jks \-alias root \-exportcert > root.pem +keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem .fl - + .fl -keytool \-keystore ca.jks \-certreq \-alias ca | keytool \-keystore root.jks \-gencert \-alias root \-ext BC=0 > ca.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem .fl keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem .fl - + .fl -keytool \-keystore server.jks \-certreq \-alias server | keytool \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE >server.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem .fl cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server .fl \fP .fi -.RE .LP .SH "TERMINOLOGY and WARNINGS" .LP - -.LP .SS KeyStore .LP -.RS 3 - .LP A keystore is a storage facility for cryptographic keys and certificates. -.RE +.LP .RS 3 .TP 2 o -.TP 2 -o \f3KeyStore Entries\fP -.RS 3 - .LP Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include: .RS 3 .TP 3 1. -\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types od entry, while \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. +\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. .TP 3 2. \f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate. .RE - -.LP -.RE .TP 2 o \f3KeyStore Aliases\fP -.RS 3 .LP -All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. -.LP +All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. .LP -An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. -.LP +An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. .LP -For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: -.LP +For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: .nf \f3 .fl @@ -1263,9 +1262,8 @@ .fl \fP .fi - .LP -This specifies an inital password of "dukekeypasswd" required by subsequent commands to access the private key assocated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: +This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: .nf \f3 .fl @@ -1273,49 +1271,37 @@ .fl \fP .fi - .LP This changes the password from "dukekeypasswd" to "newpass". .LP -Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. -.LP -.RE +Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. .TP 2 o \f3KeyStore Implementation\fP -.RS 3 +.LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP -Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. -.LP +Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. .LP -There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. -.LP +There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. .LP Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP -Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. -.LP +Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. -.LP +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP -For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. -.LP +For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. .LP -If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP +If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. -.LP +Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. .LP -The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): -.LP +The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): .nf \f3 .fl @@ -1323,11 +1309,8 @@ .fl \fP .fi - .LP -.LP -The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file: -.LP +The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file: .nf \f3 .fl @@ -1335,14 +1318,10 @@ .fl \fP .fi - -.LP .LP -To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. -.LP +To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. .LP -For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to -.LP +For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to .nf \f3 .fl @@ -1350,50 +1329,45 @@ .fl \fP .fi +.LP +Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". +.RE .LP -Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". -.RE -.RE .SS Certificate .LP +A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. .RS 3 - -.LP -A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. -.RE -.RS 3 -.TP 2 -o .TP 2 o \f3Certificate Terms\fP .RS 3 - -.LP -.RS 3 .TP 3 Public Keys -These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. +.LP +These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. .TP 3 Digitally Signed -If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. +.LP +If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. .TP 3 Identity -A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. +.LP +A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. .TP 3 Signature -A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). +.LP +A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). .TP 3 Private Keys -These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. +.LP +These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. .TP 3 Entity -An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. +.LP +An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. .RE - -.LP .LP Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as .na @@ -1407,26 +1381,22 @@ .na \f2Entrust\fP @ .fi -http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as the Netscape/Microsoft Certificate Servers or the Entrust CA product for your organization. -.LP -.LP -Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. +http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization. .LP +Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. .LP -\f3keytool\fP currently handles X.509 certificates. -.LP -.RE +\f3keytool\fP currently handles X.509 certificates. .TP 2 o \f3X.509 Certificates\fP -.RS 3 +.LP The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data. .LP -All X.509 certificates have the following data, in addition to the signature: -.LP +All X.509 certificates have the following data, in addition to the signature: .RS 3 .TP 3 Version +.LP This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates. .LP \f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic. @@ -1436,475 +1406,86 @@ \f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use. .TP 3 Serial Number -The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). +.LP +The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). .TP 3 Signature Algorithm Identifier -This identifies the algorithm used by the CA to sign the certificate. +.LP +This identifies the algorithm used by the CA to sign the certificate. .TP 3 Issuer Name -The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) +.LP +The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) .TP 3 Validity Period -Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. +.LP +Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. .TP 3 Subject Name +.LP The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example, .nf \f3 .fl - CN=Java Duke, OU=Java Software Division, O=Sun Microsystems Inc, C=US + CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US .fl \fP .fi -(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) +.LP +(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) .TP 3 Subject Public Key Information -This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. -.RE - .LP +This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. .RE .TP 2 o \f3Certificate Chains\fP -.RS 3 .LP -\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. -.LP +\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. .LP -When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. -.LP +When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. .LP -Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. -.LP +Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. .LP -In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. -.LP +In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. .LP -Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. -.LP +Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. .LP -A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. -.LP +A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. .LP -The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's webpage, etc.). -.LP -.RE +The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.). .TP 2 o \f3The cacerts Certificates File\fP -.RS 3 .LP -A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP -.LP -The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with several root CA certificates with the following aliases and X.500 owner distinguished names: +A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -.RS 3 -.TP 2 -* -\f3Alias\fP: thawtepersonalfreemailca -.br -\f3Owner DN\fP: EmailAddress=personal\-freemail@thawte.com, -.br -CN=Thawte Personal Freemail CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalbasicca -.br -\f3Owner DN\fP: EmailAddress=personal\-basic@thawte.com, -.br -CN=Thawte Personal Basic CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalpremiumca -.br -\f3Owner DN\fP: EmailAddress=personal\-premium@thawte.com, -.br -CN=Thawte Personal Premium CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawteserverca -.br -\f3Owner DN\fP: EmailAddress=server\-certs@thawte.com, -.br -CN=Thawte Server CA, OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepremiumserverca -.br -\f3Owner DN\fP: EmailAddress=premium\-server@thawte.com, -.br -CN=Thawte Premium Server CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: verisignclass1ca -.br -\f3Owner DN\fP: OU=Class 1 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2ca -.br -\f3Owner DN\fP: OU=Class 2 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3ca -.br -\f3Owner DN\fP: OU=Class 3 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignserverca -.br -\f3Owner DN\fP: OU=Secure Server Certification Authority, -.br -O="RSA Data Security, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 1 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 1 Public Primary Certification Authority \- G3, OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 2 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 2 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 3 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 3 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: baltimorecodesigningca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Code Signing Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrustglobalca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Global Root, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: baltimorecybertrustca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrust5ca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Root 5, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: entrustclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab., -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustglobalclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/GCCA_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrust2048ca -.br -\f3Owner DN\fP: CN=Entrust.net Certification Authority (2048), -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrustsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustgsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/SSL_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: godaddyclass2ca -.br -\f3Owner DN\fP: OU=Go Daddy Class 2 Certification Authority, -.br -O="The Go Daddy Group, Inc.", C=US -.TP 2 -* -\f3Alias\fP: starfieldclass2ca -.br -\f3Owner DN\fP: OU=Starfield Class 2 Certification Authority, -.br -O="Starfield Technologies, Inc.", C=US -.TP 2 -* -\f3Alias\fP: valicertclass2ca -.br -\f3Owner DN\fP: EMAILADDRESS=info@valicert.com, -.br -CN=http://www.valicert.com/, -.br -OU=ValiCert Class 2 Policy Validation Authority, -.br -O="ValiCert, Inc.", L=ValiCert Validation Network -.TP 2 -* -\f3Alias\fP: geotrustglobalca -.br -\f3Owner DN\fP: CN=GeoTrust Global CA, -.br -O=GeoTrust Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureca -.br -\f3Owner DN\fP: OU=Equifax Secure Certificate Authority, -.br -O=Equifax, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca2 -.br -\f3Owner DN\fP: OU=Equifax Secure eBusiness CA\-2, -.br -O=Equifax Secure, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureglobalebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure Global eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: soneraclass1ca -.br -\f3Owner DN\fP: CN=Sonera Class1 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: soneraclass2ca -.br -\f3Owner DN\fP: CN=Sonera Class2 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: comodoaaaca -.br -\f3Owner DN\fP: CN=AAA Certificate Services, -.br -O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB -.TP 2 -* -\f3Alias\fP: addtrustclass1ca -.br -\f3Owner DN\fP: CN=AddTrust Class 1 CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustexternalca -.br -\f3Owner DN\fP: CN=AddTrust External CA Root, -.br -OU=AddTrust External TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustqualifiedca -.br -\f3Owner DN\fP: CN=AddTrust Qualified CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: utnuserfirsthardwareca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Hardware, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstclientauthemailca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Client Authentication and Email, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utndatacorpsgcca -.br -\f3Owner DN\fP: CN=UTN \- DATACorp SGC, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstobjectca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Object, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.RE - +The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command: +.nf +\f3 +.fl +keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts +.fl +\fP +.fi .LP -.LP -The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. -.LP -.RS 3 - -.LP - +The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. .LP -\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP -.br - -.LP -Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. -.br - -.LP -.RE - -.LP -.RE +\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. .TP 2 o \f3The Internet RFC 1421 Certificate Encoding Standard\fP -.RS 3 -.LP -Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP +Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP -Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. -.LP +Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. .LP -The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. -.LP +The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. .LP -The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. -.LP +The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. .LP -In its printable encoding format, the encoded certificate is bounded at the beginning by -.LP +In its printable encoding format, the encoded certificate is bounded at the beginning by .nf \f3 .fl @@ -1912,11 +1493,8 @@ .fl \fP .fi - .LP -.LP -and at the end by -.LP +and at the end by .nf \f3 .fl @@ -1925,23 +1503,21 @@ \fP .fi .RE -.RE .LP .SS X.500 Distinguished Names .LP -.RS 3 - .LP -X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +.LP .RS 3 .TP 2 o \f2commonName\fP \- common name of a person, e.g., "Susan Jones" .TP 2 o -\f2organizationUnit\fP \- small organization (e.g, department or division) name, e.g., "Purchasing" +\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing" .TP 2 o \f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc." @@ -1975,7 +1551,7 @@ .nf \f3 .fl - CN=commonName + CN=commonName .fl OU=organizationUnit .fl @@ -1997,17 +1573,19 @@ .nf \f3 .fl -CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US +CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US .fl \fP .fi .LP -and a sample command using such a string is +.LP +and a sample command using such a string is +.LP .nf \f3 .fl -keytool \-genkeypair \-dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, +keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, .fl S=California, C=US" \-alias mark .fl @@ -2024,7 +1602,7 @@ .nf \f3 .fl -CN=Steve Meier, OU=SunSoft, O=Sun, C=US +CN=Steve Meier, OU=Java, O=Oracle, C=US .fl \fP .fi @@ -2036,7 +1614,7 @@ .nf \f3 .fl - cn=peter schuster, o=Sun Microsystems\\, Inc., o=sun, c=us + cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US .fl \fP .fi @@ -2045,14 +1623,12 @@ .LP It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\". .LP -.RE .SS WARNING Regarding Importing Trusted Certificates .LP -.RS 3 - .LP -IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +.LP .LP View it first (using the \f2\-printcert\fP command, or the \f2\-importcert\fP command without the \f2\-noprompt\fP option), and make sure that the displayed certificate fingerprint(s) match the expected ones. For example, suppose someone sends or emails you a certificate, and you put it in a file named \f2/tmp/cert\fP. Before you consider adding the certificate to your list of trusted certificates, you can execute a \f2\-printcert\fP command to view its fingerprints, as in .LP @@ -2083,17 +1659,15 @@ .fi .LP -Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP +Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP .LP Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user. .LP -.RE .SS Warning Regarding Passwords .LP -.RS 3 - -.LP .LP Most commands operating on a keystore require the store password. Some commands require a private/secret key password. .LP @@ -2103,13 +1677,9 @@ .LP If you don't specify a required password option on a command line, you will be prompted for it. .LP -.RE .SS Warning Regarding Certificate Conformance .LP -.RS 3 - -.LP .LP The Internet standard .na @@ -2117,39 +1687,31 @@ .fi http://tools.ietf.org/rfc/rfc5280.txt has defined a profile on conforming X.509 certificates, which includes what values and value combinations are valid for certificate fields and extensions. \f3keytool\fP has not enforced all these rules so it can generate certificates which do not conform to the standard, and these certificates might be rejected by JRE or other applications. Users should make sure that they provide the correct options for \f2\-dname\fP, \f2\-ext\fP, etc. .LP -.RE .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o -.LP -jar(1) tool documentation +jar(1) tool documentation .TP 2 o -.LP -jarsigner(1) tool documentation +jarsigner(1) tool documentation .TP 2 o -.LP the .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial for examples of the use of \f3keytool\fP +http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP .RE .LP .SH "CHANGES" .LP - -.LP .LP The command interface for keytool changed in Java SE 6. .LP @@ -2184,19 +1746,19 @@ .na \f2\-keyclone\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#keycloneCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd .TP 2 o .na \f2\-identitydb\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#identitydbCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd .TP 2 o .na \f2\-selfcert\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#selfcertCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/native2ascii.1 --- a/jdk/src/linux/doc/man/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "02 Jun 2010" +.TH native2ascii 1 "10 May 2011" .LP .SH "Name" native2ascii \- Native\-to\-ASCII Converter .LP -.RS 3 - -.LP .LP -Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters. +Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -46,31 +40,29 @@ .LP .SH "DESCRIPTION" .LP - .LP -.LP -The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters. +\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion. .LP .LP If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-reverse -Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters. +Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment. .br .br .TP 3 \-encoding encoding_name -Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the +Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the .na \f4Supported Encodings\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document. +http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document. +.br +.br .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/orbd.1 --- a/jdk/src/linux/doc/man/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,15 +19,12 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "02 Jun 2010" +.TH orbd 1 "10 May 2011" .LP .SH "Name" orbd \- The Object Request Broker Daemon .LP -.RS 3 - -.LP .LP \f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. .LP @@ -36,13 +33,10 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,8 +48,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages: .LP @@ -77,7 +69,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "OPTIONS" .LP @@ -141,11 +133,11 @@ .na \f2CORBA objects\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The .na \f2name binding\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. .LP .LP Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service. @@ -224,7 +216,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "Server Manager" .LP @@ -239,7 +231,7 @@ .na \f2sample tutorial\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: .LP .LP Start \f2orbd\fP. @@ -362,7 +354,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .br .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/pack200.1 --- a/jdk/src/linux/doc/man/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "02 Jun 2010" +.TH pack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line or in a properties file supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -51,11 +46,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f2pack200\fP tool is a Java application that transforms a JAR file into a compressed \f2pack200\fP file using the Java \f2gzip\fP compressor. The \f2pack200\fP files are highly compressed files that can be directly deployed, saving bandwidth and reducing download time. .LP @@ -65,83 +57,56 @@ .SS Typical usage: .LP -.RS 3 - -.LP .LP \f2% pack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, \f2myarchive.pack.gz\fP is produced using the default \f2pack200\fP settings. .LP .SH "OPTIONS" .LP - -.LP .LP \f4\-r \-\-repack\fP .LP -.RS 3 - -.LP .LP Produces a JAR file by packing the file \f2myarchive.jar\fP and unpacking it. The resulting file can be used as an input to the \f2jarsigner(1)\fP tool. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP .LP .LP \f2% pack200 \-\-repack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-g \-\-no\-gzip\fP .LP -.RS 3 - -.LP .LP Produces a \f2pack200\fP file. With this option a suitable compressor must be used, and the target system must use a corresponding decompresser. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-G \-\-strip\-debug\fP .LP -.RS 3 - -.LP .LP Strips attributes used for debugging from the output. These include \f2SourceFile\fP, \f2LineNumberTable\fP, \f2LocalVariableTable\fP and \f2LocalVariableTypeTable\fP. Removing these attributes reduces the size of both downloads and installations but reduces the usefulness of debuggers. .LP -.RE +.LP +\f4\-\-keep\-file\-order\fP +.LP +.LP +Preserve the order of files in the input file; this is the default behavior. +.LP .LP \f4\-O \-\-no\-keep\-file\-order\fP .LP -.RS 3 - -.LP .LP The packer will reorder and transmit all elements. Additionally, the packer may remove JAR directory names. This will reduce the download size; however, certain JAR file optimizations, such as indexing, may not work correctly. .LP -.RE .LP \f4\-Svalue \-\-segment\-limit=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The value is the estimated target size N (in bytes) of each archive segment. If a single input file requires .br @@ -151,31 +116,23 @@ The size of each segment is estimated by counting the size of each input file to be transmitted in the segment, along with the size of its name and other transmitted properties. .LP .LP -The default is \f21000000\fP (a million bytes). This allows input JAR files of moderate size to be transmitted in one segment. It also puts a limit on memory requirements for packers and unpackers. +The default is \-1, which means the packer will always create a single segment output file. In cases where extremely large output files are generated, users are strongly encouraged to use segmenting or break up the input file into smaller JARs. .LP .LP A 10MB JAR packed without this limit will typically pack about 10% smaller, but the packer may require a larger Java heap (about ten times the segment limit). .LP -.RE .LP \f4\-Evalue \-\-effort=\fP\f2value\fP .LP -.RS 3 - -.LP .LP If the value is set to a single decimal digit, the packer will use the indicated amount of effort in compressing the archive. Level \f21\fP may produce somewhat larger size and faster compression speed, while level \f29\fP will take much longer but may produce better compression. The special value \f20\fP instructs the packer to copy through the original JAR file directly with no compression. The JSR 200 standard requires any unpacker to understand this special case as a pass\-through of the entire archive. .LP .LP The default is \f25\fP, investing a modest amount of time to produce reasonable compression. .LP -.RE .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Overrides the default, which preserves the input information, but may cause the transmitted archive to be larger. The possible values are: .LP @@ -195,13 +152,9 @@ .RE .LP -.RE .LP \f4\-mvalue \-\-modification\-time=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The possible values are: .LP @@ -215,23 +168,15 @@ .RE .LP -.RE .LP \f4\-Pfile \-\-pass\-file=\fP\f2file\fP .LP -.RS 3 - -.LP .LP Indicates that a file should be passed through bytewise with no compression. By repeating the option, multiple files may be specified. There is no pathname transformation, except that the system file separator is replaced by the JAR file separator "\f2/\fP". The resulting file names must match exactly as strings with their occurrences in the JAR file. If file is a directory name, all files under that directory will be passed. .LP -.RE .LP \f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP .LP -.RS 3 - -.LP .LP Overrides the default behavior; i.e., the classfile containing the unknown attribute will be passed through with the specified action. The possible values for actions are: .LP @@ -248,7 +193,6 @@ .RE .LP -.RE .LP \f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP .br @@ -258,9 +202,6 @@ .br \f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP .LP -.RS 3 - -.LP .LP With the above four options, the attribute layout can be specified for a class entity, such as Class attribute, Field attribute, Method attribute, and Code attribute. The attribute\-name is the name of the attribute for which the layout or action is being defined. The possible values for action are: .LP @@ -282,19 +223,12 @@ .LP Example: \f2\-\-class\-attribute=CompilationID=pass\fP will cause the class file containing this attribute to be passed through without further action by the packer. .LP -.RE .LP \f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP .LP -.RS 3 - -.LP .LP A configuration file, containing Java properties to initialize the packer, may be specified on the command line. .LP -.RS 3 - -.LP .LP \f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP .br @@ -318,69 +252,53 @@ .br \f2segment.limit=\-1\fP .LP -.RE -.RE -.RS 3 - -.LP .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP .LP -\f4\-Joption\fP +Prints help information about this command. .LP -.RS 3 - +.LP +\f4\-V \-\-version\fP .LP .LP -Passes option to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP .LP -.RE -.RE +.LP +Passes \f2option\fP to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP for successful completion; .LP .LP \f2>0\fP if an error occurs. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -392,13 +310,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -413,8 +331,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2pack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/policytool.1 --- a/jdk/src/linux/doc/man/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "02 Jun 2010" +.TH policytool 1 "10 May 2011" .LP .SH "Name" @@ -28,8 +28,6 @@ \f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 \ @@ -57,7 +55,7 @@ .na \f2the Policytool Users Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html. .SH "OPTIONS" .RS 3 .TP 3 @@ -67,22 +65,22 @@ .na \f2Default Policy Implementation and Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html .br .na \f2Policy Tool Users' Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html .br .na \f2Security Permissions\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html .br .na \f2Security Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html .br .RE .RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/rmic.1 --- a/jdk/src/linux/doc/man/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "02 Jun 2010" +.TH rmic 1 "10 May 2011" .LP .SH "Name" rmic \- The Java RMI Compiler .LP -.RS 3 - -.LP .LP \f3rmic\fP generates stub, skeleton, and tie classes for remote objects using either the JRMP or IIOP protocols. Also generates OMG IDL. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmic\fP compiler generates stub and skeleton class files (JRMP protocol) and stub and tie class files (IIOP protocol) for remote objects. These classes files are generated from compiled Java programming language classes that are remote object implementation classes. A remote implementation class is a class that implements the interface \f2java.rmi.Remote\fP. The class names in the \f3rmic\fP command must be for classes that have been compiled successfully with the \f3javac\fP command and must be fully package qualified. For example, running \f3rmic\fP on the class file name \f2HelloImpl\fP as shown here: .LP @@ -81,8 +73,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-bootclasspath path @@ -90,9 +80,6 @@ .TP 3 \-classpath path Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.RS 3 - -.LP .nf \f3 .fl @@ -100,11 +87,7 @@ .fl \fP .fi -.RE For example: -.RS 3 - -.LP .nf \f3 .fl @@ -112,13 +95,9 @@ .fl \fP .fi -.RE .TP 3 \-d directory Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command -.RS 3 - -.LP .nf \f3 .fl @@ -126,7 +105,6 @@ .fl \fP .fi -.RE would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.) .br \ @@ -136,16 +114,16 @@ .TP 3 \-g Enables generation of all debugging information, including local variables. By default, only line number information is generated. -.LP .TP 3 \-idl Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the .na \f2Java Language to IDL Mapping\fP @ .fi -http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. -.LP -When the \f2\-idl\fP option is used, other options also include: +http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. +.br +.br +When the \f2\-idl\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -160,31 +138,22 @@ \-idlFile\ fromJavaPackage[.class]\ toIDLFile Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\ .RE -.LP .TP 3 \-iiop -Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. -.LP +Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. +.br +.br Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention: -.RS 3 - -.LP .nf \f3 .fl _<implementationName>_stub.class .fl -\fP -.br -\f3 -.fl _<interfaceName>_tie.class .fl \fP .fi -.RE -.LP -When the \f2\-iiop\fP option is used, other options also include: +When the \f2\-iiop\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -197,13 +166,11 @@ Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option. .TP 3 \-poa -Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. -.LP -The \f2PortableServer\fP module for the +Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the .na \f2Portable Object Adapter\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. .RE .TP 3 \-J @@ -214,18 +181,18 @@ .TP 3 \-nowarn Turns off warnings. If used the compiler does not print out any warnings. -.LP +.TP 3 +\-nowrite +Does not write compiled classes to the file system. .TP 3 \-vcompat Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation. .TP 3 \-verbose Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded. -.LP .TP 3 \-v1.1 Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used). -.LP .TP 3 \-v1.2 (default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine. @@ -234,15 +201,10 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example, -.RS 3 - -.LP .nf \f3 .fl @@ -251,18 +213,15 @@ \fP .fi .RE -.RE .LP .SH "SEE ALSO" .LP - -.LP .LP java(1), javac(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/rmid.1 --- a/jdk/src/linux/doc/man/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "02 Jun 2010" +.TH rmid 1 "10 May 2011" .LP .SH "Name" rmid \- The Java RMI Activation System Daemon .LP -.RS 3 - -.LP .LP \f3rmid\fP starts the activation system daemon that allows objects to be registered and activated in a virtual machine (VM). .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,18 +41,16 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the .na \f2Java RMI Specification\fP @ .fi -http://java.sun.com/javase/6/docs/platform/rmi/spec/rmiTOC.html and +http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and .na \f2Activation tutorials\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. .LP .LP The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows: @@ -133,8 +125,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-C<someCommandLineOption> @@ -169,7 +159,6 @@ .TP 3 \-J\-Dsun.rmi.activation.execPolicy=<policy> Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP: -.LP .RS 3 .TP 2 o @@ -255,17 +244,9 @@ The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups. .LP To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example: -.RS 3 - .LP -.LP -\f2rmid \-J\-Djava.security.policy=rmid.policy\fP -.LP +\f2rmid \-J\-Djava.security.policy=rmid.policy\fP .RE -.RE -.TP 2 -o -.LP .TP 2 o \f4<policyClassName>\fP @@ -285,7 +266,6 @@ \fP .fi Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object. -.LP .TP 2 o \f3none\fP @@ -318,9 +298,9 @@ \-stop Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098. .RE -.SH "ENVIRONMENT VARIABLES" + .LP - +.SH "ENVIRONMENT VARIABLES" .LP .RS 3 .TP 3 @@ -338,13 +318,11 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP rmic(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath, java(1) +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/rmiregistry.1 --- a/jdk/src/linux/doc/man/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,19 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "02 Jun 2010" +.TH rmiregistry 1 "10 May 2011" .LP .SH "Name" rmiregistry \- The Java Remote Object Registry .LP .RS 3 +The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. +.RE .LP -.LP -The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. -.LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmiregistry\fP command creates and starts a remote object registry on the specified \f2port\fP on the current host. If \f2port\fP is omitted, the registry is started on port 1099. The \f3rmiregistry\fP command produces no output and is typically run in the background. For example: .LP @@ -69,8 +63,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-J @@ -80,17 +72,12 @@ .LP .SH "SEE ALSO" .LP - -.LP -.LP java(1), .na \f2java.rmi.registry.LocateRegistry\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/registry/LocateRegistry.html and +http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and .na \f2java.rmi.Naming\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/Naming.html -.LP - +http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/schemagen.1 --- a/jdk/src/linux/doc/man/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "02 Jun 2010" +.TH schemagen 1 "10 May 2011" .LP .SH "Name" @@ -30,8 +30,7 @@ .br \f3Implementation Version:\fP 2.1.3 .LP -.SS -Launching schemagen +.SH "Launching schemagen" .LP .LP The schema generator can be launched using the appropriate \f2schemagen\fP shell script in the \f2bin\fP directory for your platform. @@ -46,9 +45,6 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -58,19 +54,13 @@ .fl \fP .fi -.RE .LP .LP If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema. .LP -.RS 3 - -.LP -\f3Command Line Options\fP -.LP -.RS 3 - +.SS +Command Line Options .LP .nf \f3 @@ -79,24 +69,29 @@ .fl .fl -Options: +Options: +.fl + \-d <path> : specify where to place processor and javac generated class files .fl - \-d <path> : Specify where to place processor and javac generated class files + \-cp <path> : specify where to find user specified files +.fl + \-classpath <path> : specify where to find user specified files .fl - \-cp <path> : Specify where to find user specified files + \-encoding <encoding> : specify encoding to be used for apt/javac invocation +.fl + .fl - \-classpath <path> : Specify where to find user specified files + \-episode <file> : generate episode file for separate compilation .fl - \-help : Display this usage message + \-version : display version information +.fl + \-help : display this usage message .fl \fP .fi -.RE .LP -.RE -.SS -Generated Resource Files +.SH "Generated Resource Files" .LP .LP The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use @@ -105,7 +100,8 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.SH "See Also" +.SH "Name" +See Also .LP .RS 3 .TP 2 @@ -124,7 +120,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/serialver.1 --- a/jdk/src/linux/doc/man/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "02 Jun 2010" +.TH serialver 1 "10 May 2011" .LP .SH "Name" serialver \- The Serial Version Command .LP -.RS 3 - -.LP .LP The \f3serialver\fP command returns the \f2serialVersionUID\fP. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified in this document. @@ -57,18 +48,13 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f3serialver\fP returns the \f2serialVersionUID\fP for one or more classes in a form suitable for copying into an evolving class. When invoked with no arguments it prints a usage line. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath <directories and zip/jar files separated by :> @@ -88,36 +74,24 @@ .LP .SH "NOTES" .LP - -.LP .LP The \f3serialver\fP command loads and initializes the specified classes in its virtual machine, and by default, it does not set a security manager. If \f3serialver\fP is to be run with untrusted classes, a security manager can be set with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.manager\fP .LP -.RE .LP and, if necessary, a security policy can be specified with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.policy=<policy file>\fP .LP -.RE .SH "SEE ALSO" .LP - -.LP .LP .na \f2java.io.ObjectStreamClass\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/io/ObjectStreamClass.html +http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/servertool.1 --- a/jdk/src/linux/doc/man/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "02 Jun 2010" +.TH servertool 1 "10 May 2011" .LP .SH "Name" servertool \- The Java(TM) IDL Server Tool .LP -.RS 3 - -.LP -\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. -.RE +\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,15 +48,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f2servertool\fP provides the command\-line interface for the application programmers to register, unregister, startup, and shutdown a persistent server. Other commands are provided to obtain various statistical information about the server. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-ORBInitialHost nameserverhost @@ -75,8 +65,6 @@ .LP .SH "COMMANDS" .LP - -.LP .RS 3 .TP 3 register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ] @@ -122,6 +110,4 @@ .LP .SH "SEE ALSO" .LP - -.LP orbd(1) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/tnameserv.1 --- a/jdk/src/linux/doc/man/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "02 Jun 2010" +.TH tnameserv 1 "10 May 2011" .LP .SH "Name" @@ -30,7 +30,7 @@ .na \f2Java IDL Naming Service Included with ORBD\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html topic. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic. .LP .LP Topics in this section include: @@ -120,11 +120,11 @@ .na \f2The Hello World Example Using RMI\-IIOP\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. .na \f2Java IDL: Running the Hello World Example on TWO Machines\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. .LP .LP For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP. @@ -170,16 +170,12 @@ .LP This command\-line option is available for use with \f2tnameserve\fP: .RS 3 - -.LP -.RS 3 .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine. .RE .LP -.RE .SH "Stopping the Java\ IDL Transient Naming Service" .LP .LP @@ -190,28 +186,27 @@ .LP The following sample program illustrates how to add names to the namespace. It is a self\-contained Transient Naming Service client that creates the following simple tree. .LP -.nf -\f3 -.fl -\fP\f3 -.fl - \fP\f4Initial\fP\f3 -.fl - \fP\f4Naming Context\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - plans \fP\f4Personal\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - calendar schedule\fP -.fl -.fi +.RS 3 +.TP 2 +o +\f4Initial Naming Context\fP +.RS 3 +.TP 2 +* +\f3plans\fP +.TP 2 +* +\f4Personal\fP +.RS 3 +.TP 2 +- +\f3calendar\fP +.TP 2 +- +\f3schedule\fP +.RE +.RE +.RE .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/unpack200.1 --- a/jdk/src/linux/doc/man/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "02 Jun 2010" +.TH unpack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 input\-file Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker. @@ -48,107 +43,78 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage: .LP -.RS 3 - -.LP .LP \f2% unpack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings. .LP .SH "OPTIONS" .LP -.SS -Standard Options -.LP -.RS 3 - -.LP .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file. .LP -.RE -.RE -.SS -Non\-Standard Options -.LP -.RS 3 - -.LP .LP \f4\-r \-\-remove\-pack\-file\fP .LP -.RS 3 - -.LP .LP Removes the input packed file. .LP -.RE .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP +.LP +Prints help information about this command. +.LP +.LP +\f4\-V \-\-version\fP +.LP +.LP +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP +.LP +.LP +Passes \f2option\fP to the Java launcher called by \f2unpack200\fP. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP if successful completion; .LP .LP \f2>0\fP if an error occurred. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -160,13 +126,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -181,8 +147,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/wsgen.1 --- a/jdk/src/linux/doc/man/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "02 Jun 2010" +.TH wsgen 1 "10 May 2011" .SH "Name" wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 -.RS 3 - -.LP .LP \f3Specification Version:\fP 2.1 .br \f3Implementation Version:\fP 2.1.1 .LP -.LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation -.LP -.RE .SH "Overview" .LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see @@ -83,7 +77,6 @@ The following table lists the \f2wsgen\fP options. .br .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -354,7 +347,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 139 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 133 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -571,7 +564,6 @@ .rm i+ .rm j+ .rm k+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-53 .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/wsimport.1 --- a/jdk/src/linux/doc/man/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "02 Jun 2010" +.TH wsimport 1 "10 May 2011" .SH "Name" wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 .LP @@ -88,7 +88,6 @@ .LP The following table lists the \f2wsimport\fP options. .LP -.TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 .ps \n(.s @@ -676,7 +675,6 @@ .rm l+ .rm m+ .rm n+ -.TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-66 .LP Multiple JAX\-WS and JAXB binding files can be specified using \f2\-b\fP option and they can be used to customize various things like package names, bean names, etc. More information on JAX\-WS and JAXB binding files can be found in the @@ -685,14 +683,293 @@ .fi https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html. .LP +The following table lists \f2wsimport\fP non\-standard options: +.LP +.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 +.de 35 +.ps \n(.s +.vs \n(.vu +.in \n(.iu +.if \n(.u .fi +.if \n(.j .ad +.if \n(.j=0 .na +.. +.nf +.nr #~ 0 +.if n .nr #~ 0.6n +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.fc +.nr 33 \n(.s +.rm 80 81 +.nr 34 \n(.lu +.eo +.am 81 +.br +.di a+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Map headers not bound to request or response message to Java method parameters. +.br +.di +.nr a| \n(dn +.nr a- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di b+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +WSDL URI that specifies the file that contains authorization information; this URI is in the following format: http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl +.br +.di +.nr b| \n(dn +.nr b- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di c+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Print debugging information. +.br +.di +.nr c| \n(dn +.nr c- \n(dl +.. +.ec \ +.eo +.am 80 +.br +.di d+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(80 .ll \n(80u +.in 0 +\f3\-Xno\-addressing\-databinding\fP +.br +.di +.nr d| \n(dn +.nr d- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di e+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Enable binding of W3C \f2EndpointReferenceType\fP to Java. +.br +.di +.nr e| \n(dn +.nr e- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di f+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Do not compile generated Java files. +.br +.di +.nr f| \n(dn +.nr f- \n(dl +.. +.ec \ +.35 +.nf +.ll \n(34u +.nr 80 0 +.nr 38 \w\f3Option\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-XadditionalHeaders\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xauthfile <file>\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xdebug\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xnocompile\fP +.if \n(80<\n(38 .nr 80 \n(38 +.80 +.rm 80 +.nr 38 \n(d- +.if \n(80<\n(38 .nr 80 \n(38 +.nr 81 0 +.nr 38 \w\f3Description\fP +.if \n(81<\n(38 .nr 81 \n(38 +.81 +.rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(b- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(c- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(e- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(f- +.if \n(81<\n(38 .nr 81 \n(38 +.35 +.nf +.ll \n(34u +.nr 38 1n +.nr 79 0 +.nr 40 \n(79+(0*\n(38) +.nr 80 +\n(40 +.nr 41 \n(80+(3*\n(38) +.nr 81 +\n(41 +.nr TW \n(81 +.if t .if \n(TW>\n(.li .tm Table at line 193 file Input is too wide - \n(TW units +.fc +.nr #T 0-1 +.nr #a 0-1 +.eo +.de T# +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.mk ## +.nr ## -1v +.ls 1 +.ls +.. +.ec +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP +.ne \n(a|u+\n(.Vu +.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.a+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(b|u+\n(.Vu +.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.b+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(c|u+\n(.Vu +.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.c+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(d|u+\n(.Vu +.ne \n(e|u+\n(.Vu +.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v) +.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(40u +.in +\n(37u +.d+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.e+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(f|u+\n(.Vu +.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.f+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.fc +.nr T. 1 +.T# 1 +.35 +.rm a+ +.rm b+ +.rm c+ +.rm d+ +.rm e+ +.rm f+ +.if \n-(b.=0 .nr c. \n(.c-\n(d.-26 + +.LP .SH "Example" .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -This will generate the Java artifacts and compile them by importing the \f2http://stockquote.xyz/quote?wsdl\fP. +This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP. .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/linux/doc/man/xjc.1 --- a/jdk/src/linux/doc/man/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/linux/doc/man/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,19 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "02 Jun 2010" +.TH xjc 1 "10 May 2011" .LP -.ad c .SH "Name" xjc \- Java(TM) Architecture for XML Binding .br -Binding Compiler +Binding Compiler +.LP .LP \f3Specification Version:\fP 2.1 .br -\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l - +\f3Reference Implementation (RI) Version:\fP 2.1.3 .LP .SH "Launching xjc" .LP @@ -42,84 +41,87 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html. .LP -.RS 3 - -.LP .LP \f2% xjc \-help\fP .LP -.RE -\f3Output\fP -.LP -.RS 3 - +.SS +Output .LP .nf \f3 .fl -Usage: xjc [\-options ...] <schema_file/URL/dir> ... [\-b <bindinfo>] ... +Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ... +.fl +If dir is specified, all schema files in it will be compiled. +.fl +If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled. .fl Options: .fl - \-nv : do not perform strict validation of the input schema(s) + \-nv : do not perform strict validation of the input schema(s) .fl - \-extension : allow vendor extensions \- do not strictly follow the + \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec .fl - Compatibility Rules and App E.2 from the JAXB Spec + \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched .fl - \-b <file/dir> : specify external bindings files (each <file> must have its own \-b) + \-d <dir> : generated files will go into this directory +.fl + \-p <pkg> : specifies the target package .fl - If a directory is given, **/*.xjb is searched + \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort .fl - \-d <dir> : generated files will go into this directory + \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password .fl - \-p <pkg> : specifies the target package + \-classpath <arg> : specify where to find user class files .fl - \-httpproxy <proxy> : set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort + \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format .fl - \-httpproxyfile <file>: set the proxy string (same format as above). + \-readOnly : generated files will be in read\-only mode .fl - \-classpath <arg> : specify where to find user class files + \-npa : suppress generation of package level annotations (**/package\-info.java) +.fl + \-no\-header : suppress generation of a file header with timestamp .fl - \-catalog <file> : specify catalog files to resolve external entity references + \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features .fl - support TR9401, XCatalog, and OASIS XML Catalog format. + \-xmlschema : treat input as W3C XML Schema (default) .fl - \-readOnly : generated files will be in read\-only mode + \-relaxng : treat input as RELAX NG (experimental,unsupported) .fl - \-npa : suppress generation of package level annotations (**/package\-info.java) + \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) .fl - \-no\-header : suppress generation of a file header with timestamp + \-dtd : treat input as XML DTD (experimental,unsupported) .fl - \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features. + \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +.fl + \-verbose : be extra verbose .fl - \-xmlschema : treat input as W3C XML Schema (default) + \-quiet : suppress compiler output .fl - \-relaxng : treat input as RELAX NG (experimental,unsupported) + \-help : display this help message .fl - \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) + \-version : display version information +.fl + .fl - \-dtd : treat input as XML DTD (experimental,unsupported) + .fl - \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +Extensions: .fl - \-verbose : be extra verbose + \-Xlocator : enable source location support for generated code .fl - \-quiet : suppress compiler output + \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword .fl - \-help : display this help message + \-mark\-generated : mark the generated code as @javax.annotation.Generated .fl - \-version : display version information + \-episode <FILE> : generate the episode file for separate compilation .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-nv @@ -129,15 +131,9 @@ By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions .TP 3 \-b <file> -Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: -.RS 3 - -.LP -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP +Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP .br -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP -.RE -In addition, the ordering of the schema files and binding files on the command line does not matter. +\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter. .TP 3 \-d <dir> By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you. @@ -199,12 +195,30 @@ <schema file/URL/dir> Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them. .RE + +.LP .SS -Summary of Deprecated and Removed Command Line Options +Non\-Standard Command Line Options .LP .RS 3 +.TP 3 +\-Xlocator +Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling. +.TP 3 +\-Xsync\-methods +Causes all of the generated method signatures to include the \f2synchronized\fP keyword. +.TP 3 +\-mark\-generated +Mark the generated code with the annotation \f2@javax.annotation.Generated\fP. +.TP 3 +\-episode <file> +Generate the specified episode file for separate compilation. +.RE .LP +.SS +Deprecated and Removed Command Line Options +.LP .RS 3 .TP 3 \-host & \-port @@ -215,13 +229,9 @@ .TP 3 \-source The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase. -.TP 3 -\-Xlocator & \-Xsync\-methods -These switches have been disabled for now. We plan on releasing this functionality as a separate download in the future. .RE .LP -.RE .SS Compiler Restrictions .LP @@ -280,7 +290,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties --- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Sat May 14 11:52:15 2011 -0700 @@ -131,7 +131,7 @@ # accessible states # managesDescendants=gestiona descendientes -indeterminate=indeterminado +indeterminate=indeterminada truncated=truncado # new for J2SE 1.6.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Sat May 14 11:52:15 2011 -0700 @@ -56,9 +56,9 @@ FileChooser.renameFileButtonText=Rename File FileChooser.renameFileButtonMnemonic=82 FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 +#FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 +#FileChooser.saveButtonMnemonic=79 FileChooser.openButtonText=OK FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=Save @@ -79,9 +79,5 @@ FileChooser.renameFileErrorTitle=Error FileChooser.renameFileErrorText=Error renaming file "{0}" to "{1}" -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Cancel -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Sat May 14 11:52:15 2011 -0700 @@ -24,7 +24,7 @@ GTKColorChooserPanel.hueMnemonic=70 GTKColorChooserPanel.redText=Rot: -GTKColorChooserPanel.redMnemonic=79 +GTKColorChooserPanel.redMnemonic=82 GTKColorChooserPanel.saturationText=S\u00E4ttigung: GTKColorChooserPanel.saturationMnemonic=83 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valor: GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Vert : -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valeur : GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valore: GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=OK(O) +FileChooser.saveButtonText=OK FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK(O) +FileChooser.openButtonText=OK FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u4FDD\u5B58 FileChooser.openDialogTitleText=\u958B\u304F @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC FileChooser.renameFileErrorText=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F -# dummy resource added for translation automation -OptionPane.okButtonText=OK(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\u53D6\u6D88(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\uCDE8\uC18C(C) +FileChooser.cancelButtonText=\uCDE8\uC18C FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\uD655\uC778(O) +FileChooser.saveButtonText=\uD655\uC778 FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\uD655\uC778(O) +FileChooser.openButtonText=\uD655\uC778 FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\uC800\uC7A5 FileChooser.openDialogTitleText=\uC5F4\uAE30 @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\uC624\uB958 FileChooser.renameFileErrorText="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. -# dummy resource added for translation automation -OptionPane.okButtonText=\uD655\uC778(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\uCDE8\uC18C(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=68 GTKColorChooserPanel.valueText=Valor: GTKColorChooserPanel.valueMnemonic=86 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -39,7 +39,7 @@ GTKColorChooserPanel.blueMnemonic=66 GTKColorChooserPanel.colorNameText=F\u00E4rgnamn: -GTKColorChooserPanel.colorNameMnemonic=78 +GTKColorChooserPanel.colorNameMnemonic=70 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u786E\u5B9A(O) +FileChooser.saveButtonText=\u786E\u5B9A FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u786E\u5B9A(O) +FileChooser.openButtonText=\u786E\u5B9A FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u4FDD\u5B58 FileChooser.openDialogTitleText=\u6253\u5F00 @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\u9519\u8BEF FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519 -# dummy resource added for translation automation -OptionPane.okButtonText=\u786E\u5B9A(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\u53D6\u6D88(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u78BA\u5B9A(O) +FileChooser.saveButtonText=\u78BA\u5B9A FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u78BA\u5B9A(O) +FileChooser.openButtonText=\u78BA\u5B9A FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u5132\u5B58 FileChooser.openDialogTitleText=\u958B\u555F @@ -79,10 +79,6 @@ FileChooser.renameFileErrorTitle=\u932F\u8AA4 FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4 -# dummy resource added for translation automation -OptionPane.okButtonText=\u78BA\u5B9A(O) -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=\u53D6\u6D88(C) -OptionPane.cancelButtonMnemonic=67 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java --- a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Sat May 14 11:52:15 2011 -0700 @@ -92,4 +92,39 @@ * @return the total amount of physical memory in bytes. */ public long getTotalPhysicalMemorySize(); + + /** + * Returns the "recent cpu usage" for the whole system. This value is a + * double in the [0.0,1.0] interval. A value of 0.0 means that all CPUs + * were idle during the recent period of time observed, while a value + * of 1.0 means that all CPUs were actively running 100% of the time + * during the recent period being observed. All values betweens 0.0 and + * 1.0 are possible depending of the activities going on in the system. + * If the system recent cpu usage is not available, the method returns a + * negative value. + * + * @return the "recent cpu usage" for the whole system; a negative + * value if not available. + * @since 1.7 + */ + public double getSystemCpuLoad(); + + /** + * Returns the "recent cpu usage" for the Java Virtual Machine process. + * This value is a double in the [0.0,1.0] interval. A value of 0.0 means + * that none of the CPUs were running threads from the JVM process during + * the recent period of time observed, while a value of 1.0 means that all + * CPUs were actively running threads from the JVM 100% of the time + * during the recent period being observed. Threads from the JVM include + * the application threads as well as the JVM internal threads. All values + * betweens 0.0 and 1.0 are possible depending of the activities going on + * in the JVM process and the whole system. If the Java Virtual Machine + * recent CPU usage is not available, the method returns a negative value. + * + * @return the "recent cpu usage" for the Java Virtual Machine process; + * a negative value if not available. + * @since 1.7 + */ + public double getProcessCpuLoad(); + } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java --- a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1666,7 +1666,7 @@ */ protected void removeCurrentRow() { ((Row)getCurrentRow()).setDeleted(); - rvh.remove(cursorPos); + rvh.remove(cursorPos - 1); --numRows; } @@ -6349,7 +6349,6 @@ // this can happen if deleted rows are being shown if (row.getDeleted() == true) { removeCurrentRow(); - --numRows; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java --- a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -395,7 +395,13 @@ private boolean succeeded = false; private boolean commitSucceeded = false; private String username; + + // Encryption keys calculated from password. Assigned when storekey == true + // and useKeyTab == false (or true but not found) private EncryptionKey[] encKeys = null; + + KeyTab ktab = null; + private Credentials cred = null; private PrincipalName principal = null; @@ -663,28 +669,49 @@ (krb5PrincName.toString(), PrincipalName.KRB_NT_PRINCIPAL); } + + /* + * Before dynamic KeyTab support (6894072), here we check if + * the keytab contains keys for the principal. If no, keytab + * will not be used and password is prompted for. + * + * After 6894072, we normally don't check it, and expect the + * keys can be populated until a real connection is made. The + * check is still done when isInitiator == true, where the keys + * will be used right now. + * + * Probably tricky relations: + * + * useKeyTab is config flag, but when it's true but the ktab + * does not contains keys for principal, we would use password + * and keep the flag unchanged (for reuse?). In this method, + * we use (ktab != null) to check whether keytab is used. + * After this method (and when storeKey == true), we use + * (encKeys == null) to check. + */ if (useKeyTab) { - encKeys = - EncryptionKey.acquireSecretKeys(principal, keyTabName); - - if (debug) { - if (encKeys != null) - System.out.println - ("principal's key obtained from the keytab"); - else - System.out.println - ("Key for the principal " + - principal + - " not available in " + - ((keyTabName == null) ? - "default key tab" : keyTabName)); + ktab = (keyTabName == null) + ? KeyTab.getInstance() + : KeyTab.getInstance(new File(keyTabName)); + if (isInitiator) { + if (Krb5Util.keysFromJavaxKeyTab(ktab, principal).length + == 0) { + ktab = null; + if (debug) { + System.out.println + ("Key for the principal " + + principal + + " not available in " + + ((keyTabName == null) ? + "default key tab" : keyTabName)); + } + } } - } KrbAsReqBuilder builder; - // We can't get the key from the keytab so prompt - if (encKeys == null) { + + if (ktab == null) { promptForPass(getPasswdFromSharedState); builder = new KrbAsReqBuilder(principal, password); if (isInitiator) { @@ -693,9 +720,13 @@ // updated with PA info cred = builder.action().getCreds(); } - encKeys = builder.getKeys(); + if (storeKey) { + encKeys = builder.getKeys(); + // When encKeys is empty, the login actually fails. + // For compatibility, exception is thrown in commit(). + } } else { - builder = new KrbAsReqBuilder(principal, encKeys); + builder = new KrbAsReqBuilder(principal, ktab); if (isInitiator) { cred = builder.action().getCreds(); } @@ -705,10 +736,15 @@ if (debug) { System.out.println("principal is " + principal); HexDumpEncoder hd = new HexDumpEncoder(); - for (int i = 0; i < encKeys.length; i++) { - System.out.println("EncryptionKey: keyType=" + - encKeys[i].getEType() + " keyBytes (hex dump)=" + - hd.encodeBuffer(encKeys[i].getBytes())); + if (ktab != null) { + System.out.println("Will use keytab"); + } else if (storeKey) { + for (int i = 0; i < encKeys.length; i++) { + System.out.println("EncryptionKey: keyType=" + + encKeys[i].getEType() + + " keyBytes (hex dump)=" + + hd.encodeBuffer(encKeys[i].getBytes())); + } } } @@ -989,8 +1025,8 @@ kerbTicket = Krb5Util.credsToTicket(cred); } - if (storeKey) { - if (encKeys == null || encKeys.length <= 0) { + if (storeKey && encKeys != null) { + if (encKeys.length == 0) { succeeded = false; throw new LoginException("Null Server Key "); } @@ -1006,10 +1042,11 @@ } } - // Let us add the kerbClientPrinc,kerbTicket and kerbKey (if + // Let us add the kerbClientPrinc,kerbTicket and KeyTab/KerbKey (if // storeKey is true) - if (!princSet.contains(kerbClientPrinc)) + if (!princSet.contains(kerbClientPrinc)) { princSet.add(kerbClientPrinc); + } // add the TGT if (kerbTicket != null) { @@ -1018,19 +1055,29 @@ } if (storeKey) { - for (int i = 0; i < kerbKeys.length; i++) { - if (!privCredSet.contains(kerbKeys[i])) { - privCredSet.add(kerbKeys[i]); + if (encKeys == null) { + if (!privCredSet.contains(ktab)) { + privCredSet.add(ktab); + // Compatibility; also add keys to privCredSet + for (KerberosKey key: ktab.getKeys(kerbClientPrinc)) { + privCredSet.add(new Krb5Util.KeysFromKeyTab(key)); + } } - encKeys[i].destroy(); - encKeys[i] = null; - if (debug) { - System.out.println("Added server's key" - + kerbKeys[i]); - System.out.println("\t\t[Krb5LoginModule] " + - "added Krb5Principal " + - kerbClientPrinc.toString() - + " to Subject"); + } else { + for (int i = 0; i < kerbKeys.length; i ++) { + if (!privCredSet.contains(kerbKeys[i])) { + privCredSet.add(kerbKeys[i]); + } + encKeys[i].destroy(); + encKeys[i] = null; + if (debug) { + System.out.println("Added server's key" + + kerbKeys[i]); + System.out.println("\t\t[Krb5LoginModule] " + + "added Krb5Principal " + + kerbClientPrinc.toString() + + " to Subject"); + } } } } @@ -1106,7 +1153,8 @@ while (it.hasNext()) { Object o = it.next(); if (o instanceof KerberosTicket || - o instanceof KerberosKey) { + o instanceof KerberosKey || + o instanceof KeyTab) { it.remove(); } } @@ -1161,6 +1209,7 @@ } else { // remove temp results for the next try encKeys = null; + ktab = null; principal = null; } username = null; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Sat May 14 11:52:15 2011 -0700 @@ -57,7 +57,7 @@ Specify a different file name. FileChooser.acceptAllFileFilterText=All Files FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 +#FileChooser.cancelButtonMnemonic=67 // not needed? FileChooser.saveButtonText=Save FileChooser.saveButtonMnemonic=83 // not needed? FileChooser.openButtonText=Open @@ -146,9 +146,9 @@ OptionPane.noButtonText=No OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=0 +#OptionPane.okButtonMnemonic=0 OptionPane.cancelButtonText=Cancel -OptionPane.cancelButtonMnemonic=0 +#OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=Select an Option # Title for the dialog for the showInputDialog methods. Only used if # the developer uses one of the variants that doesn't take a title. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Sat May 14 11:52:15 2011 -0700 @@ -144,7 +144,7 @@ OptionPane.yesButtonMnemonic=83 OptionPane.noButtonText=No OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=Aceptar OptionPane.okButtonMnemonic=O OptionPane.cancelButtonText=Cancelar OptionPane.cancelButtonMnemonic=C diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093 FileChooser.renameErrorFileExistsText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u4FDD\u5B58 FileChooser.saveButtonMnemonic=83 @@ -146,7 +146,7 @@ OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. FileChooser.renameErrorFileExistsText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624. FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C -FileChooser.cancelButtonText=\uCDE8\uC18C(C) +FileChooser.cancelButtonText=\uCDE8\uC18C FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\uC800\uC7A5 FileChooser.saveButtonMnemonic=83 @@ -144,9 +144,9 @@ OptionPane.yesButtonMnemonic=89 OptionPane.noButtonText=\uC544\uB2C8\uC624(N) OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=\uD655\uC778 OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\uCDE8\uC18C(0) +OptionPane.cancelButtonText=\uCDE8\uC18C OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\uC635\uC158 \uC120\uD0DD # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -96,7 +96,7 @@ ColorChooser.cancelText=Avbryt ColorChooser.resetText=\u00C5terst\u00E4ll # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 +ColorChooser.resetMnemonic=84 ColorChooser.sampleText=Exempeltext Exempeltext ColorChooser.swatchesNameText=Prov ColorChooser.swatchesMnemonic=80 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText=\u65E0\u6CD5\u91CD\u547D\u540D{0} FileChooser.renameErrorFileExistsText=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u4FDD\u5B58 FileChooser.saveButtonMnemonic=83 @@ -144,9 +144,9 @@ OptionPane.yesButtonMnemonic=89 OptionPane.noButtonText=\u5426(N) OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=\u786E\u5B9A OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879 # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0} FileChooser.renameErrorFileExistsText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u5132\u5B58 FileChooser.saveButtonMnemonic=83 @@ -144,9 +144,9 @@ OptionPane.yesButtonMnemonic=89 OptionPane.noButtonText=\u5426(N) OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK +OptionPane.okButtonText=\u78BA\u5B9A OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805 # Title for the dialog for the showInputDialog methods. Only used if diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; public class AccessWatchpointSpec extends WatchpointSpec { @@ -38,6 +37,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws InvalidTypeException, NoSuchFieldException { if (!(refType instanceof ClassType)) { @@ -51,6 +51,7 @@ .createAccessWatchpointRequest(field)); } + @Override public boolean equals(Object obj) { return (obj instanceof AccessWatchpointSpec) && super.equals(obj); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,9 @@ public class AmbiguousMethodException extends Exception { + + private static final long serialVersionUID = 7793370943251707514L; + public AmbiguousMethodException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,30 +25,33 @@ package com.sun.tools.example.debug.bdi; -import com.sun.jdi.request.*; - public abstract class BreakpointSpec extends EventRequestSpec { BreakpointSpec(EventRequestSpecList specs, ReferenceTypeSpec refSpec) { super(specs, refSpec); } + @Override void notifySet(SpecListener listener, SpecEvent evt) { listener.breakpointSet(evt); } + @Override void notifyDeferred(SpecListener listener, SpecEvent evt) { listener.breakpointDeferred(evt); } + @Override void notifyResolved(SpecListener listener, SpecEvent evt) { listener.breakpointResolved(evt); } + @Override void notifyDeleted(SpecListener listener, SpecEvent evt) { listener.breakpointDeleted(evt); } + @Override void notifyError(SpecListener listener, SpecErrorEvent evt) { listener.breakpointError(evt); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java Sat May 14 11:52:15 2011 -0700 @@ -43,10 +43,6 @@ private BufferedReader out; private BufferedReader err; - private InputWriter inputWriter; - private OutputReader outputReader; - private OutputReader errorReader; - private InputListener input; private OutputListener output; private OutputListener error; @@ -84,6 +80,7 @@ this.error = error; } + @Override public boolean attach() { if (!connectToVMProcess()) { @@ -131,6 +128,7 @@ return true; } + @Override public void detach() { //### debug @@ -242,10 +240,7 @@ this.diagnostics = diagnostics; } - public void quit() { - running = false; - } - + @Override public void run() { try { int count; @@ -254,6 +249,7 @@ // Run in Swing event dispatcher thread. final String chars = new String(buffer, 0, count); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { output.putString(chars); } @@ -264,6 +260,7 @@ } catch (IOException e) { // Run in Swing event dispatcher thread. SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { diagnostics.putString("IO error reading " + streamName + @@ -288,11 +285,7 @@ this.input = input; } - public void quit() { - //### Won't have much effect if blocked on input! - running = false; - } - + @Override public void run() { String line; while (running) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class EvaluationException extends Exception {} +public class EvaluationException extends Exception { + + private static final long serialVersionUID = 4947109680354951694L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,8 +25,6 @@ package com.sun.tools.example.debug.bdi; -import java.util.*; - import com.sun.jdi.*; import com.sun.jdi.request.EventRequest; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,11 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.ReferenceType; -import com.sun.jdi.request.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Iterator; public class ExceptionSpec extends EventRequestSpec { @@ -45,22 +40,27 @@ this.notifyUncaught = notifyUncaught; } + @Override void notifySet(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptSet(evt); } + @Override void notifyDeferred(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptDeferred(evt); } + @Override void notifyResolved(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptResolved(evt); } + @Override void notifyDeleted(SpecListener listener, SpecEvent evt) { listener.exceptionInterceptDeleted(evt); } + @Override void notifyError(SpecListener listener, SpecErrorEvent evt) { listener.exceptionInterceptError(evt); } @@ -68,16 +68,19 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) { setRequest(refType.virtualMachine().eventRequestManager() .createExceptionRequest(refType, notifyCaught, notifyUncaught)); } + @Override public int hashCode() { return refSpec.hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof ExceptionSpec) { ExceptionSpec es = (ExceptionSpec)obj; @@ -88,6 +91,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer("exception catch "); buffer.append(refSpec.toString()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.event.*; import com.sun.jdi.request.*; import com.sun.jdi.connect.*; import com.sun.tools.example.debug.expr.ExpressionParser; @@ -56,7 +55,7 @@ // Session Listeners - Vector<SessionListener> sessionListeners = new Vector<SessionListener>(); + ArrayList<SessionListener> sessionListeners = new ArrayList<SessionListener>(); public void addSessionListener(SessionListener listener) { sessionListeners.add(listener); @@ -68,7 +67,7 @@ // Spec Listeners - Vector<SpecListener> specListeners = new Vector<SpecListener>(); + ArrayList<SpecListener> specListeners = new ArrayList<SpecListener>(); public void addSpecListener(SpecListener cl) { specListeners.add(cl); @@ -80,7 +79,7 @@ // JDI Listeners - Vector<JDIListener> jdiListeners = new Vector<JDIListener>(); + ArrayList<JDIListener> jdiListeners = new ArrayList<JDIListener>(); /** * Adds a JDIListener @@ -105,50 +104,50 @@ // App Echo Listeners - private Vector<OutputListener> appEchoListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> appEchoListeners = new ArrayList<OutputListener>(); public void addApplicationEchoListener(OutputListener l) { - appEchoListeners.addElement(l); + appEchoListeners.add(l); } public void removeApplicationEchoListener(OutputListener l) { - appEchoListeners.removeElement(l); + appEchoListeners.remove(l); } // App Output Listeners - private Vector<OutputListener> appOutputListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> appOutputListeners = new ArrayList<OutputListener>(); public void addApplicationOutputListener(OutputListener l) { - appOutputListeners.addElement(l); + appOutputListeners.add(l); } public void removeApplicationOutputListener(OutputListener l) { - appOutputListeners.removeElement(l); + appOutputListeners.remove(l); } // App Error Listeners - private Vector<OutputListener> appErrorListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> appErrorListeners = new ArrayList<OutputListener>(); public void addApplicationErrorListener(OutputListener l) { - appErrorListeners.addElement(l); + appErrorListeners.add(l); } public void removeApplicationErrorListener(OutputListener l) { - appErrorListeners.removeElement(l); + appErrorListeners.remove(l); } // Diagnostic Listeners - private Vector<OutputListener> diagnosticsListeners = new Vector<OutputListener>(); + private ArrayList<OutputListener> diagnosticsListeners = new ArrayList<OutputListener>(); public void addDiagnosticsListener(OutputListener l) { - diagnosticsListeners.addElement(l); + diagnosticsListeners.add(l); } public void removeDiagnosticsListener(OutputListener l) { - diagnosticsListeners.removeElement(l); + diagnosticsListeners.remove(l); } /////////// End Listener Registration ////////////// @@ -159,7 +158,9 @@ } void ensureActiveSession() throws NoSessionException { - if (session == null) throw new NoSessionException(); + if (session == null) { + throw new NoSessionException(); + } } public EventRequestManager eventRequestManager() { @@ -293,6 +294,7 @@ ensureActiveSession(); if (f != null) { frameGetter = new ExpressionParser.GetFrame() { + @Override public StackFrame get() /* throws IncompatibleThreadStateException */ { return f; } @@ -628,35 +630,35 @@ */ private void notifyInterrupted() { - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionInterrupt(evt); + l.get(i).sessionInterrupt(evt); } } private void notifyContinued() { - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionContinue(evt); + l.get(i).sessionContinue(evt); } } private void notifySessionStart() { - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionStart(evt); + l.get(i).sessionStart(evt); } } private void notifySessionDeath() { /*** noop for now - Vector l = (Vector)sessionListeners.clone(); + ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners); EventObject evt = new EventObject(this); for (int i = 0; i < l.size(); i++) { - ((SessionListener)l.elementAt(i)).sessionDeath(evt); + ((SessionListener)l.get(i)).sessionDeath(evt); } ****/ } @@ -684,6 +686,7 @@ } private InputListener appInput = new InputListener() { + @Override public String getLine() { // Don't allow reader to be interrupted -- catch and retry. String line = null; @@ -703,6 +706,7 @@ // Run in Swing event dispatcher thread. final String input = line; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { echoInputLine(input); } @@ -714,37 +718,40 @@ private static String newline = System.getProperty("line.separator"); private void echoInputLine(String line) { - Vector l = (Vector)appEchoListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners); for (int i = 0; i < l.size(); i++) { - OutputListener ol = (OutputListener)l.elementAt(i); + OutputListener ol = l.get(i); ol.putString(line); ol.putString(newline); } } private OutputListener appOutput = new OutputListener() { + @Override public void putString(String string) { - Vector l = (Vector)appOutputListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners); for (int i = 0; i < l.size(); i++) { - ((OutputListener)l.elementAt(i)).putString(string); + l.get(i).putString(string); } } }; private OutputListener appError = new OutputListener() { + @Override public void putString(String string) { - Vector l = (Vector)appErrorListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners); for (int i = 0; i < l.size(); i++) { - ((OutputListener)l.elementAt(i)).putString(string); + l.get(i).putString(string); } } }; private OutputListener diagnostics = new OutputListener() { + @Override public void putString(String string) { - Vector l = (Vector)diagnosticsListeners.clone(); + ArrayList<OutputListener> l = new ArrayList<OutputListener>(diagnosticsListeners); for (int i = 0; i < l.size(); i++) { - ((OutputListener)l.elementAt(i)).putString(string); + l.get(i).putString(string); } } }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException {} +public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException { + + private static final long serialVersionUID = -4870148107027371437L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Sat May 14 11:52:15 2011 -0700 @@ -28,8 +28,6 @@ import com.sun.jdi.*; import com.sun.jdi.event.*; -import java.util.*; - import com.sun.tools.example.debug.event.*; import javax.swing.SwingUtilities; @@ -55,6 +53,7 @@ this.queue = session.vm.eventQueue(); } + @Override public void run() { try { runLoop(); @@ -78,6 +77,7 @@ //### Gross foul hackery! private void dispatchEventSet(final AbstractEventSet es) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { boolean interrupted = es.suspendedAll(); es.notify(firstListener); @@ -117,54 +117,65 @@ //### This is a Hack, deal with it private class FirstListener implements JDIListener { + @Override public void accessWatchpoint(AccessWatchpointEventSet e) { session.runtime.validateThreadInfo(); wantInterrupt = true; } + @Override public void classPrepare(ClassPrepareEventSet e) { wantInterrupt = false; runtime.resolve(e.getReferenceType()); } + @Override public void classUnload(ClassUnloadEventSet e) { wantInterrupt = false; } + @Override public void exception(ExceptionEventSet e) { wantInterrupt = true; } + @Override public void locationTrigger(LocationTriggerEventSet e) { session.runtime.validateThreadInfo(); wantInterrupt = true; } + @Override public void modificationWatchpoint(ModificationWatchpointEventSet e) { session.runtime.validateThreadInfo(); wantInterrupt = true; } + @Override public void threadDeath(ThreadDeathEventSet e) { wantInterrupt = false; } + @Override public void threadStart(ThreadStartEventSet e) { wantInterrupt = false; } + @Override public void vmDeath(VMDeathEventSet e) { //### Should have some way to notify user //### that VM died before the session ended. wantInterrupt = false; } + @Override public void vmDisconnect(VMDisconnectEventSet e) { //### Notify user? wantInterrupt = false; session.runtime.endSession(); } + @Override public void vmStart(VMStartEventSet e) { //### Do we need to do anything with it? wantInterrupt = false; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,11 +26,7 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; - -import java.util.ArrayList; import java.util.List; -import java.util.Iterator; public class LineBreakpointSpec extends BreakpointSpec { int lineNumber; @@ -44,6 +40,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws InvalidTypeException, LineNotFoundException { if (!(refType instanceof ClassType)) { @@ -81,10 +78,12 @@ return lineNumber; } + @Override public int hashCode() { return refSpec.hashCode() + lineNumber; } + @Override public boolean equals(Object obj) { if (obj instanceof LineBreakpointSpec) { LineBreakpointSpec breakpoint = (LineBreakpointSpec)obj; @@ -96,6 +95,7 @@ } } + @Override public String errorMessageFor(Exception e) { if (e instanceof LineNotFoundException) { return ("No code at line " + lineNumber() + " in " + refSpec); @@ -107,6 +107,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer("breakpoint "); buffer.append(refSpec.toString()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,9 @@ public class LineNotFoundException extends Exception { + + private static final long serialVersionUID = -5630418117861587582L; + public LineNotFoundException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,9 @@ package com.sun.tools.example.debug.bdi; class MalformedMemberNameException extends Exception { + + private static final long serialVersionUID = -7726664097374844485L; + public MalformedMemberNameException() { super(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,11 +26,8 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; - import java.util.ArrayList; import java.util.List; -import java.util.Iterator; public class MethodBreakpointSpec extends BreakpointSpec { String methodId; @@ -47,6 +44,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws MalformedMemberNameException, AmbiguousMethodException, InvalidTypeException, @@ -80,12 +78,14 @@ return methodArgs; } + @Override public int hashCode() { return refSpec.hashCode() + ((methodId != null) ? methodId.hashCode() : 0) + ((methodArgs != null) ? methodArgs.hashCode() : 0); } + @Override public boolean equals(Object obj) { if (obj instanceof MethodBreakpointSpec) { MethodBreakpointSpec breakpoint = (MethodBreakpointSpec)obj; @@ -98,6 +98,7 @@ } } + @Override public String errorMessageFor(Exception e) { if (e instanceof AmbiguousMethodException) { return ("Method " + methodName() + " is overloaded; specify arguments"); @@ -114,6 +115,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer("breakpoint "); buffer.append(refSpec.toString()); @@ -257,7 +259,7 @@ */ if ((name.indexOf('.') == -1) || name.startsWith("*.")) { try { - List refs = specs.runtime.findClassesMatchingPattern(name); + List<?> refs = specs.runtime.findClassesMatchingPattern(name); if (refs.size() > 0) { //### ambiguity??? name = ((ReferenceType)(refs.get(0))).name(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class MethodNotFoundException extends Exception { + private static final long serialVersionUID = -2064968107599632609L; + public MethodNotFoundException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import com.sun.jdi.request.*; public class ModificationWatchpointSpec extends WatchpointSpec { @@ -38,6 +37,7 @@ /** * The 'refType' is known to match. */ + @Override void resolve(ReferenceType refType) throws InvalidTypeException, NoSuchFieldException { if (!(refType instanceof ClassType)) { @@ -51,6 +51,7 @@ .createModificationWatchpointRequest(field)); } + @Override public boolean equals(Object obj) { return (obj instanceof ModificationWatchpointSpec) && super.equals(obj); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class NoSessionException extends Exception {} +public class NoSessionException extends Exception { + + private static final long serialVersionUID = -7324357828115128603L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,8 @@ package com.sun.tools.example.debug.bdi; -public class NoThreadException extends Exception {} +public class NoThreadException extends Exception { + + private static final long serialVersionUID = 1846613539928921998L; + +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -47,6 +47,7 @@ /** * Does the specified ReferenceType match this spec. */ + @Override public boolean matches(ReferenceType refType) { if (isWild) { return refType.name().endsWith(classId); @@ -55,10 +56,12 @@ } } + @Override public int hashCode() { return classId.hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof PatternReferenceTypeSpec) { PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj; @@ -89,6 +92,7 @@ } } + @Override public String toString() { return isWild? "*" + classId : classId; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -33,7 +33,9 @@ */ boolean matches(ReferenceType refType); + @Override int hashCode(); + @Override boolean equals(Object obj); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java Sat May 14 11:52:15 2011 -0700 @@ -27,7 +27,6 @@ import com.sun.jdi.VirtualMachine; import com.sun.jdi.VMDisconnectedException; -import com.sun.jdi.event.EventSet; /** * Our repository of what we know about the state of one diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -39,6 +39,7 @@ /** * Does the specified ReferenceType match this spec. */ + @Override public boolean matches(ReferenceType refType) { try { if (refType.sourceName().equals(sourceName)) { @@ -48,9 +49,6 @@ return true; } catch(AbsentInformationException exc) { } catch(ObjectCollectedException exc) { - } catch(InvalidLineNumberException exc) { -// } catch(ClassNotPreparedException exc) { -// -- should not happen, so don't catch this --- } } } catch(AbsentInformationException exc) { @@ -59,10 +57,12 @@ return false; } + @Override public int hashCode() { return sourceName.hashCode() + linenumber; } + @Override public boolean equals(Object obj) { if (obj instanceof SourceNameReferenceTypeSpec) { SourceNameReferenceTypeSpec spec = (SourceNameReferenceTypeSpec)obj; @@ -74,6 +74,7 @@ } } + @Override public String toString() { return sourceName + "@" + linenumber; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java Sat May 14 11:52:15 2011 -0700 @@ -25,10 +25,9 @@ package com.sun.tools.example.debug.bdi; -import java.util.EventObject; - public class SpecErrorEvent extends SpecEvent { + private static final long serialVersionUID = 8162634387866409578L; private Exception reason; public SpecErrorEvent(EventRequestSpec eventRequestSpec, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java Sat May 14 11:52:15 2011 -0700 @@ -31,6 +31,7 @@ public class SpecEvent extends EventObject { + private static final long serialVersionUID = 4820735456787276230L; private EventRequestSpec eventRequestSpec; public SpecEvent(EventRequestSpec eventRequestSpec) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.ThreadGroupReference; -import com.sun.jdi.ThreadReference; import java.util.List; import java.util.Stack; import java.util.ArrayList; @@ -73,10 +72,12 @@ } } + @Override public boolean hasNext() { return !stack.isEmpty(); } + @Override public ThreadGroupReference next() { return nextThreadGroup(); } @@ -87,6 +88,7 @@ return tg; } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java Sat May 14 11:52:15 2011 -0700 @@ -26,9 +26,6 @@ package com.sun.tools.example.debug.bdi; import com.sun.jdi.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; //### Should handle target VM death or connection failure cleanly. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Sat May 14 11:52:15 2011 -0700 @@ -43,6 +43,7 @@ tgi = new ThreadGroupIterator(tgl); } + @Override public boolean hasNext() { while (it == null || !it.hasNext()) { if (!tgi.hasNext()) { @@ -53,6 +54,7 @@ return true; } + @Override public ThreadReference next() { return it.next(); } @@ -61,6 +63,7 @@ return next(); } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java Sat May 14 11:52:15 2011 -0700 @@ -26,9 +26,6 @@ package com.sun.tools.example.debug.bdi; //### does it belong here? import com.sun.jdi.*; -import com.sun.tools.jdi.*; -import java.util.*; -import java.io.*; public class Utils { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class VMLaunchFailureException extends Exception {} +public class VMLaunchFailureException extends Exception { + + private static final long serialVersionUID = -2439646729274310108L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java Sat May 14 11:52:15 2011 -0700 @@ -25,4 +25,7 @@ package com.sun.tools.example.debug.bdi; -public class VMNotInterruptedException extends Exception {} +public class VMNotInterruptedException extends Exception { + + private static final long serialVersionUID = 8111074582188765600L; +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,9 +25,6 @@ package com.sun.tools.example.debug.bdi; -import com.sun.jdi.*; -import com.sun.jdi.request.*; - public abstract class WatchpointSpec extends EventRequestSpec { final String fieldId; @@ -40,31 +37,38 @@ // } } + @Override void notifySet(SpecListener listener, SpecEvent evt) { listener.watchpointSet(evt); } + @Override void notifyDeferred(SpecListener listener, SpecEvent evt) { listener.watchpointDeferred(evt); } + @Override void notifyResolved(SpecListener listener, SpecEvent evt) { listener.watchpointResolved(evt); } + @Override void notifyDeleted(SpecListener listener, SpecEvent evt) { listener.watchpointDeleted(evt); } + @Override void notifyError(SpecListener listener, SpecErrorEvent evt) { listener.watchpointError(evt); } + @Override public int hashCode() { return refSpec.hashCode() + fieldId.hashCode() + getClass().hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof WatchpointSpec) { WatchpointSpec watchpoint = (WatchpointSpec)obj; @@ -77,6 +81,7 @@ } } + @Override public String errorMessageFor(Exception e) { if (e instanceof NoSuchFieldException) { return ("No field " + fieldId + " in " + refSpec); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -33,6 +33,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet { + private static final long serialVersionUID = 2772717574222076977L; private final EventSet jdiEventSet; final Event oneEvent; @@ -81,6 +82,7 @@ // Implement Mirror + @Override public VirtualMachine virtualMachine() { return jdiEventSet.virtualMachine(); } @@ -105,10 +107,12 @@ return jdiEventSet.suspendPolicy(); } + @Override public void resume() { jdiEventSet.resume(); } + @Override public int suspendPolicy() { return jdiEventSet.suspendPolicy(); } @@ -128,6 +132,7 @@ /** * Return an iterator specific to {@link Event} objects. */ + @Override public EventIterator eventIterator() { return jdiEventSet.eventIterator(); } @@ -142,6 +147,7 @@ * * @return the number of elements in this set (its cardinality). */ + @Override public int size() { return jdiEventSet.size(); } @@ -151,6 +157,7 @@ * * @return <tt>true</tt> if this set contains no elements. */ + @Override public boolean isEmpty() { return jdiEventSet.isEmpty(); } @@ -163,6 +170,7 @@ * * @return <tt>true</tt> if this set contains the specified element. */ + @Override public boolean contains(Object o) { return jdiEventSet.contains(o); } @@ -174,6 +182,7 @@ * * @return an iterator over the elements in this set. */ + @Override public Iterator<Event> iterator() { return jdiEventSet.iterator(); } @@ -184,6 +193,7 @@ * * @return an array containing all of the elements in this set. */ + @Override public Object[] toArray() { return jdiEventSet.toArray(); } @@ -202,6 +212,7 @@ * @throws ArrayStoreException the runtime type of a is not a supertype * of the runtime type of every element in this set. */ + @Override public <T> T[] toArray(T a[]) { return jdiEventSet.toArray(a); } @@ -217,6 +228,7 @@ * @return <tt>true</tt> if this set contains all of the elements of the * specified collection. */ + @Override public boolean containsAll(Collection<?> c) { return jdiEventSet.containsAll(c); } @@ -224,21 +236,27 @@ // Make the rest of Set unmodifiable + @Override public boolean add(Event e){ throw new UnsupportedOperationException(); } + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection<? extends Event> coll) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection<?> coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection<?> coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,17 @@ package com.sun.tools.example.debug.event; -import com.sun.jdi.*; import com.sun.jdi.event.*; public class AccessWatchpointEventSet extends WatchpointEventSet { + private static final long serialVersionUID = -2620394219156607673L; + AccessWatchpointEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.accessWatchpoint(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ClassPrepareEventSet extends AbstractEventSet { + private static final long serialVersionUID = 5958493423581010491L; + ClassPrepareEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -55,6 +57,7 @@ return ((ClassPrepareEvent)oneEvent).referenceType(); } + @Override public void notify(JDIListener listener) { listener.classPrepare(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -25,11 +25,12 @@ package com.sun.tools.example.debug.event; -import com.sun.jdi.*; import com.sun.jdi.event.*; public class ClassUnloadEventSet extends AbstractEventSet { + private static final long serialVersionUID = 8370341450345835866L; + ClassUnloadEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -48,6 +49,7 @@ return ((ClassUnloadEvent)oneEvent).classSignature(); } + @Override public void notify(JDIListener listener) { listener.classUnload(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ExceptionEventSet extends LocatableEventSet { + private static final long serialVersionUID = 5328140167954640711L; + ExceptionEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -75,6 +77,7 @@ return ((ExceptionEvent)oneEvent).catchLocation(); } + @Override public void notify(JDIListener listener) { listener.exception(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java Sat May 14 11:52:15 2011 -0700 @@ -33,36 +33,47 @@ */ public class JDIAdapter implements JDIListener { + @Override public void accessWatchpoint(AccessWatchpointEventSet e) { } + @Override public void classPrepare(ClassPrepareEventSet e) { } + @Override public void classUnload(ClassUnloadEventSet e) { } + @Override public void exception(ExceptionEventSet e) { } + @Override public void locationTrigger(LocationTriggerEventSet e) { } + @Override public void modificationWatchpoint(ModificationWatchpointEventSet e) { } + @Override public void threadDeath(ThreadDeathEventSet e) { } + @Override public void threadStart(ThreadStartEventSet e) { } + @Override public void vmDeath(VMDeathEventSet e) { } + @Override public void vmDisconnect(VMDisconnectEventSet e) { } + @Override public void vmStart(VMStartEventSet e) { } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -33,6 +33,8 @@ */ public abstract class LocatableEventSet extends AbstractEventSet { + private static final long serialVersionUID = 1027131209997915620L; + LocatableEventSet(EventSet jdiEventSet) { super(jdiEventSet); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,17 @@ package com.sun.tools.example.debug.event; -import com.sun.jdi.*; import com.sun.jdi.event.*; public class LocationTriggerEventSet extends LocatableEventSet { + private static final long serialVersionUID = -3674631710485872487L; + LocationTriggerEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.locationTrigger(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ModificationWatchpointEventSet extends WatchpointEventSet { + private static final long serialVersionUID = -680889300856154719L; + ModificationWatchpointEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -42,6 +44,7 @@ return ((ModificationWatchpointEvent)oneEvent).valueToBe(); } + @Override public void notify(JDIListener listener) { listener.modificationWatchpoint(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ThreadDeathEventSet extends AbstractEventSet { + private static final long serialVersionUID = -8801604712308151331L; + ThreadDeathEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -44,6 +46,7 @@ return ((ThreadDeathEvent)oneEvent).thread(); } + @Override public void notify(JDIListener listener) { listener.threadDeath(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class ThreadStartEventSet extends AbstractEventSet { + private static final long serialVersionUID = -3802096132294933502L; + ThreadStartEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -44,6 +46,7 @@ return ((ThreadStartEvent)oneEvent).thread(); } + @Override public void notify(JDIListener listener) { listener.threadStart(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -29,10 +29,13 @@ public class VMDeathEventSet extends AbstractEventSet { + private static final long serialVersionUID = 1163097303940092229L; + VMDeathEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.vmDeath(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -29,10 +29,13 @@ public class VMDisconnectEventSet extends AbstractEventSet { + private static final long serialVersionUID = 7968123152344675342L; + VMDisconnectEventSet(EventSet jdiEventSet) { super(jdiEventSet); } + @Override public void notify(JDIListener listener) { listener.vmDisconnect(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public class VMStartEventSet extends AbstractEventSet { + private static final long serialVersionUID = -3384957227835478191L; + VMStartEventSet(EventSet jdiEventSet) { super(jdiEventSet); } @@ -44,6 +46,7 @@ return ((VMStartEvent)oneEvent).thread(); } + @Override public void notify(JDIListener listener) { listener.vmStart(this); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,8 @@ public abstract class WatchpointEventSet extends LocatableEventSet { + private static final long serialVersionUID = 5606285209703845409L; + WatchpointEventSet(EventSet jdiEventSet) { super(jdiEventSet); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Sat May 14 11:52:15 2011 -0700 @@ -27,25 +27,25 @@ package com.sun.tools.example.debug.expr; import com.sun.jdi.*; + import java.util.Stack; import java.util.List; import java.util.ArrayList; -@SuppressWarnings("unchecked") public class ExpressionParser implements ExpressionParserConstants { - Stack stack = new Stack(); + Stack<LValue> stack = new Stack<LValue>(); VirtualMachine vm = null; GetFrame frameGetter = null; private static GetFrame lastFrameGetter; private static LValue lastLValue; LValue peek() { - return (LValue)stack.peek(); + return stack.peek(); } LValue pop() { - return (LValue)stack.pop(); + return stack.pop(); } void push(LValue lval) { @@ -61,17 +61,14 @@ } public static Value evaluate(String expr, VirtualMachine vm, - GetFrame frameGetter) throws ParseException, - InvocationException, - InvalidTypeException, - ClassNotLoadedException, + GetFrame frameGetter) throws ParseException, InvocationException, + InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException { // TODO StringBufferInputStream is deprecated. java.io.InputStream in = new java.io.StringBufferInputStream(expr); ExpressionParser parser = new ExpressionParser(in); parser.vm = vm; parser.frameGetter = frameGetter; - Value value = null; parser.Expression(); lastFrameGetter = frameGetter; lastLValue = parser.pop(); @@ -89,8 +86,8 @@ try { parser = new ExpressionParser(new java.io.FileInputStream(args[0])); } catch (java.io.FileNotFoundException e) { - System.out.println("Java Parser Version 1.0.2: File " + - args[0] + " not found."); + System.out.println("Java Parser Version 1.0.2: File " + args[0] + + " not found."); return; } } else { @@ -137,8 +134,7 @@ jj_consume_token(-1); throw new ParseException(); } - label_1: - while (true) { + label_1: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: ; @@ -189,8 +185,7 @@ StringBuffer sb = new StringBuffer(); jj_consume_token(IDENTIFIER); sb.append(token); - label_2: - while (true) { + label_2: while (true) { if (jj_2_1(2)) { ; } else { @@ -198,16 +193,18 @@ } jj_consume_token(DOT); jj_consume_token(IDENTIFIER); - sb.append('.'); sb.append(token); - } - {if (true) return sb.toString();} + sb.append('.'); + sb.append(token); + } + if (true) { + return sb.toString(); + } throw new Error("Missing return statement in function"); } final public void NameList() throws ParseException { Name(); - label_3: - while (true) { + label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; @@ -261,7 +258,9 @@ PrimaryExpression(); AssignmentOperator(); Expression(); - LValue exprVal = pop(); pop().setValue(exprVal); push(exprVal); + LValue exprVal = pop(); + pop().setValue(exprVal); + push(exprVal); } final public void AssignmentOperator() throws ParseException { @@ -317,13 +316,18 @@ Expression(); jj_consume_token(COLON); ConditionalExpression(); - LValue falseBranch = pop(); LValue trueBranch = pop(); + LValue falseBranch = pop(); + LValue trueBranch = pop(); Value cond = pop().interiorGetValue(); if (cond instanceof BooleanValue) { - push(((BooleanValue)cond).booleanValue()? - trueBranch : falseBranch); + push(((BooleanValue) cond).booleanValue() ? trueBranch + : falseBranch); } else { - {if (true) throw new ParseException("Condition must be boolean");} + { + if (true) { + throw new ParseException("Condition must be boolean"); + } + } } break; default: @@ -334,8 +338,7 @@ final public void ConditionalOrExpression() throws ParseException { ConditionalAndExpression(); - label_4: - while (true) { + label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SC_OR: ; @@ -346,14 +349,17 @@ } jj_consume_token(SC_OR); ConditionalAndExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void ConditionalAndExpression() throws ParseException { InclusiveOrExpression(); - label_5: - while (true) { + label_5: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SC_AND: ; @@ -364,14 +370,17 @@ } jj_consume_token(SC_AND); InclusiveOrExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void InclusiveOrExpression() throws ParseException { ExclusiveOrExpression(); - label_6: - while (true) { + label_6: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_OR: ; @@ -382,14 +391,17 @@ } jj_consume_token(BIT_OR); ExclusiveOrExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void ExclusiveOrExpression() throws ParseException { AndExpression(); - label_7: - while (true) { + label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case XOR: ; @@ -400,14 +412,17 @@ } jj_consume_token(XOR); AndExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void AndExpression() throws ParseException { EqualityExpression(); - label_8: - while (true) { + label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: ; @@ -418,15 +433,18 @@ } jj_consume_token(BIT_AND); EqualityExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void EqualityExpression() throws ParseException { Token tok; InstanceOfExpression(); - label_9: - while (true) { + label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EQ: case NE: @@ -460,7 +478,11 @@ case INSTANCEOF: jj_consume_token(INSTANCEOF); Type(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[14] = jj_gen; @@ -471,8 +493,7 @@ final public void RelationalExpression() throws ParseException { Token tok; ShiftExpression(); - label_10: - while (true) { + label_10: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case GT: case LT: @@ -510,8 +531,7 @@ final public void ShiftExpression() throws ParseException { AdditiveExpression(); - label_11: - while (true) { + label_11: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LSHIFT: case RSIGNEDSHIFT: @@ -538,15 +558,18 @@ throw new ParseException(); } AdditiveExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } } final public void AdditiveExpression() throws ParseException { Token tok; MultiplicativeExpression(); - label_12: - while (true) { + label_12: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case MINUS: @@ -577,8 +600,7 @@ final public void MultiplicativeExpression() throws ParseException { Token tok; UnaryExpression(); - label_13: - while (true) { + label_13: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STAR: case SLASH: @@ -627,7 +649,11 @@ throw new ParseException(); } UnaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; case INCR: PreIncrementExpression(); @@ -661,13 +687,21 @@ final public void PreIncrementExpression() throws ParseException { jj_consume_token(INCR); PrimaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } final public void PreDecrementExpression() throws ParseException { jj_consume_token(DECR); PrimaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } } final public void UnaryExpressionNotPlusMinus() throws ParseException { @@ -687,7 +721,11 @@ throw new ParseException(); } UnaryExpression(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[26] = jj_gen; @@ -718,8 +756,10 @@ } } -// This production is to determine lookahead only. The LOOKAHEAD specifications -// below are not used, but they are there just to indicate that we know about + // This production is to determine lookahead only. The LOOKAHEAD + // specifications + // below are not used, but they are there just to indicate that we know + // about // this. final public void CastLookahead() throws ParseException { if (jj_2_4(2)) { @@ -792,7 +832,11 @@ break; case DECR: jj_consume_token(DECR); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[30] = jj_gen; @@ -810,8 +854,7 @@ if (jj_2_6(2)) { jj_consume_token(LPAREN); PrimitiveType(); - label_14: - while (true) { + label_14: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: ; @@ -830,8 +873,7 @@ case LPAREN: jj_consume_token(LPAREN); Name(); - label_15: - while (true) { + label_15: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: ; @@ -856,8 +898,7 @@ final public void PrimaryExpression() throws ParseException { PrimaryPrefix(); - label_16: - while (true) { + label_16: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: case LBRACKET: @@ -896,7 +937,11 @@ jj_consume_token(SUPER); jj_consume_token(DOT); jj_consume_token(IDENTIFIER); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; case LPAREN: jj_consume_token(LPAREN); @@ -914,7 +959,7 @@ } final public void PrimarySuffix() throws ParseException { - List argList; + List<Value> argList; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: jj_consume_token(LBRACKET); @@ -992,8 +1037,8 @@ jj_consume_token(NULL); } - final public List Arguments() throws ParseException { - List argList = new ArrayList(); + final public List<Value> Arguments() throws ParseException { + List<Value> argList = new ArrayList<Value>(); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FALSE: @@ -1021,15 +1066,18 @@ ; } jj_consume_token(RPAREN); - {if (true) return argList;} + { + if (true) { + return argList; + } + } throw new Error("Missing return statement in function"); } - final public void ArgumentList(List argList) throws ParseException { + final public void ArgumentList(List<Value> argList) throws ParseException { Expression(); argList.add(pop().interiorGetValue()); - label_17: - while (true) { + label_17: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; @@ -1045,7 +1093,8 @@ } final public void AllocationExpression() throws ParseException { - List argList; String className; + List<Value> argList; + String className; if (jj_2_7(2)) { jj_consume_token(NEW); PrimitiveType(); @@ -1062,7 +1111,11 @@ break; case LBRACKET: ArrayDimensions(); - {if (true) throw new ParseException("operation not yet supported");} + { + if (true) { + throw new ParseException("operation not yet supported"); + } + } break; default: jj_la1[42] = jj_gen; @@ -1079,12 +1132,11 @@ } /* - * The second LOOKAHEAD specification below is to parse to PrimarySuffix - * if there is an expression between the "[...]". + * The second LOOKAHEAD specification below is to parse to PrimarySuffix if + * there is an expression between the "[...]". */ final public void ArrayDimensions() throws ParseException { - label_18: - while (true) { + label_18: while (true) { jj_consume_token(LBRACKET); Expression(); jj_consume_token(RBRACKET); @@ -1094,8 +1146,7 @@ break label_18; } } - label_19: - while (true) { + label_19: while (true) { if (jj_2_9(2)) { ; } else { @@ -1107,71 +1158,84 @@ } final private boolean jj_2_1(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_1(); jj_save(0, xla); return retval; } final private boolean jj_2_2(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_2(); jj_save(1, xla); return retval; } final private boolean jj_2_3(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_3(); jj_save(2, xla); return retval; } final private boolean jj_2_4(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_4(); jj_save(3, xla); return retval; } final private boolean jj_2_5(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_5(); jj_save(4, xla); return retval; } final private boolean jj_2_6(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_6(); jj_save(5, xla); return retval; } final private boolean jj_2_7(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_7(); jj_save(6, xla); return retval; } final private boolean jj_2_8(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_8(); jj_save(7, xla); return retval; } final private boolean jj_2_9(int xla) { - jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_la = xla; + jj_lastpos = jj_scanpos = token; boolean retval = !jj_3_9(); jj_save(8, xla); return retval; } final private boolean jj_3R_154() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INCR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1180,9 +1244,15 @@ xsp = jj_scanpos; if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_155()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_155()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1191,27 +1261,54 @@ xsp = jj_scanpos; if (jj_3_6()) { jj_scanpos = xsp; - if (jj_3R_150()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_150()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_6() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_152()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_152()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1220,45 +1317,86 @@ xsp = jj_scanpos; if (jj_3R_50()) { jj_scanpos = xsp; - if (jj_3R_51()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_51()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_50() { - if (jj_3R_67()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_67()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_5() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_149() { - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_151()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_151()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_41() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; if (jj_3R_59()) { @@ -1275,51 +1413,109 @@ jj_scanpos = xsp; if (jj_3R_65()) { jj_scanpos = xsp; - if (jj_3R_66()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_66()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_40() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_123() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_1() { - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_4() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1330,76 +1526,129 @@ jj_scanpos = xsp; if (jj_3R_40()) { jj_scanpos = xsp; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_3() { - if (jj_3R_22()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_22()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_24() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_1()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_147() { - if (jj_scan_token(BANG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BANG)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_142() { - if (jj_3R_149()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_149()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_122() { - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_49() { - if (jj_scan_token(DOUBLE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOUBLE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_141() { - if (jj_3R_148()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_148()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_48() { - if (jj_scan_token(FLOAT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(FLOAT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_146() { - if (jj_scan_token(TILDE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(TILDE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_47() { - if (jj_scan_token(LONG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LONG)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1408,11 +1657,21 @@ xsp = jj_scanpos; if (jj_3R_146()) { jj_scanpos = xsp; - if (jj_3R_147()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_147()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1423,48 +1682,84 @@ jj_scanpos = xsp; if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_142()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_142()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_46() { - if (jj_scan_token(INT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_145() { - if (jj_scan_token(REM)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(REM)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_45() { - if (jj_scan_token(SHORT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SHORT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_44() { - if (jj_scan_token(BYTE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BYTE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_135() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DECR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_43() { - if (jj_scan_token(CHAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(CHAR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1485,49 +1780,95 @@ jj_scanpos = xsp; if (jj_3R_48()) { jj_scanpos = xsp; - if (jj_3R_49()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_49()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_42() { - if (jj_scan_token(BOOLEAN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BOOLEAN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_9() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_121() { - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_144() { - if (jj_scan_token(SLASH)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SLASH)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_134() { - if (jj_scan_token(INCR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INCR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1536,62 +1877,105 @@ xsp = jj_scanpos; if (jj_3R_121()) { jj_scanpos = xsp; - if (jj_3R_122()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_122()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } while (true) { xsp = jj_scanpos; - if (jj_3R_123()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_123()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_120() { - if (jj_scan_token(GE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(GE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_133() { - if (jj_scan_token(MINUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(MINUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_127() { - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_136()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_126() { - if (jj_3R_135()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_135()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_139() { - if (jj_scan_token(MINUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(MINUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_125() { - if (jj_3R_134()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_134()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_132() { - if (jj_scan_token(PLUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(PLUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_143() { - if (jj_scan_token(STAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STAR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1600,11 +1984,21 @@ xsp = jj_scanpos; if (jj_3R_132()) { jj_scanpos = xsp; - if (jj_3R_133()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_133()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1617,11 +2011,21 @@ jj_scanpos = xsp; if (jj_3R_126()) { jj_scanpos = xsp; - if (jj_3R_127()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_127()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1632,54 +2036,95 @@ jj_scanpos = xsp; if (jj_3R_144()) { jj_scanpos = xsp; - if (jj_3R_145()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_145()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_131() { - if (jj_scan_token(RUNSIGNEDSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RUNSIGNEDSHIFT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_119() { - if (jj_scan_token(LE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_138() { - if (jj_scan_token(PLUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(PLUS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_112() { - if (jj_3R_115()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_115()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_137()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_137()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_88() { - if (jj_3R_86()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_86()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_130() { - if (jj_scan_token(RSIGNEDSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RSIGNEDSHIFT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1688,29 +2133,51 @@ xsp = jj_scanpos; if (jj_3R_138()) { jj_scanpos = xsp; - if (jj_3R_139()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_112()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_139()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_112()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_87() { - if (jj_3R_82()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_82()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_118() { - if (jj_scan_token(GT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(GT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_129() { - if (jj_scan_token(LSHIFT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LSHIFT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1721,68 +2188,128 @@ jj_scanpos = xsp; if (jj_3R_130()) { jj_scanpos = xsp; - if (jj_3R_131()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_108()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_131()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_108()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_108() { - if (jj_3R_112()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_112()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_128()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_128()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3_8() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_86() { Token xsp; - if (jj_3_8()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_8()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } while (true) { xsp = jj_scanpos; - if (jj_3_8()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_8()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } while (true) { xsp = jj_scanpos; - if (jj_3_9()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3_9()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_117() { - if (jj_scan_token(LT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_106() { - if (jj_3R_108()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_108()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_116()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_116()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } @@ -1796,64 +2323,125 @@ jj_scanpos = xsp; if (jj_3R_119()) { jj_scanpos = xsp; - if (jj_3R_120()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_106()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_120()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_106()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_111() { - if (jj_scan_token(NE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_109() { - if (jj_scan_token(INSTANCEOF)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_114()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INSTANCEOF)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_114()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_104() { - if (jj_3R_106()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_106()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_113()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_113()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_81() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; if (jj_3R_87()) { jj_scanpos = xsp; - if (jj_3R_88()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_88()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_7() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_23()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_86()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_23()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_86()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1862,39 +2450,68 @@ xsp = jj_scanpos; if (jj_3_7()) { jj_scanpos = xsp; - if (jj_3R_81()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_81()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_97() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COMMA)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_39() { - if (jj_scan_token(ORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(ORASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_110() { - if (jj_scan_token(EQ)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(EQ)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_102() { - if (jj_3R_104()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_104()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_109()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_109()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -1903,117 +2520,209 @@ xsp = jj_scanpos; if (jj_3R_110()) { jj_scanpos = xsp; - if (jj_3R_111()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_102()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_111()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_102()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_94() { - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_97()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_97()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_89() { - if (jj_3R_94()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_94()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_38() { - if (jj_scan_token(XORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(XORASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_82() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_89()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_89()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_105() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_100()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BIT_AND)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_100()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_100() { - if (jj_3R_102()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_102()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_107()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_107()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_37() { - if (jj_scan_token(ANDASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(ANDASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_85() { - if (jj_scan_token(NULL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NULL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_103() { - if (jj_scan_token(XOR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_98()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(XOR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_98()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_98() { - if (jj_3R_100()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_100()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_105()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_105()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_92() { - if (jj_scan_token(FALSE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(FALSE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_36() { - if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_91() { - if (jj_scan_token(TRUE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(TRUE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2022,109 +2731,189 @@ xsp = jj_scanpos; if (jj_3R_91()) { jj_scanpos = xsp; - if (jj_3R_92()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_92()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_101() { - if (jj_scan_token(BIT_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_95()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BIT_OR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_95()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_95() { - if (jj_3R_98()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_98()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_103()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_103()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_35() { - if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RSIGNEDSHIFTASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_80() { - if (jj_3R_85()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_85()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_66() { - if (jj_3R_69()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_69()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_79() { - if (jj_3R_84()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_84()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_78() { - if (jj_scan_token(STRING_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STRING_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_99() { - if (jj_scan_token(SC_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_90()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SC_AND)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_90()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_90() { - if (jj_3R_95()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_95()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_101()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_101()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_34() { - if (jj_scan_token(LSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LSHIFTASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_65() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(NEW)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_77() { - if (jj_scan_token(CHARACTER_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(CHARACTER_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_76() { - if (jj_scan_token(FLOATING_POINT_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(FLOATING_POINT_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_33() { - if (jj_scan_token(MINUSASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(MINUSASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2141,89 +2930,161 @@ jj_scanpos = xsp; if (jj_3R_79()) { jj_scanpos = xsp; - if (jj_3R_80()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_80()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_75() { - if (jj_scan_token(INTEGER_LITERAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(INTEGER_LITERAL)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_96() { - if (jj_scan_token(SC_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_83()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SC_OR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_83()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_83() { - if (jj_3R_90()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_90()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_99()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_99()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_64() { - if (jj_scan_token(SUPER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SUPER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_32() { - if (jj_scan_token(PLUSASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(PLUSASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_73() { - if (jj_3R_82()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_82()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_72() { - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DOT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_74() { - if (jj_3R_83()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_83()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_96()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_96()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_63() { - if (jj_scan_token(THIS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(THIS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_31() { - if (jj_scan_token(REMASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(REMASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2234,120 +3095,231 @@ jj_scanpos = xsp; if (jj_3R_72()) { jj_scanpos = xsp; - if (jj_3R_73()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_73()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_71() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_93() { - if (jj_scan_token(HOOK)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(HOOK)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(COLON)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_68()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_57() { - if (jj_3R_70()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_70()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_30() { - if (jj_scan_token(SLASHASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SLASHASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_27() { - if (jj_3R_58()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_58()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_56() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_152() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_55() { - if (jj_scan_token(SUPER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(DOT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(SUPER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(DOT)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_29() { - if (jj_scan_token(STARASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(STARASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_68() { - if (jj_3R_74()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_74()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; xsp = jj_scanpos; - if (jj_3R_93()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_93()) { + jj_scanpos = xsp; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_54() { - if (jj_scan_token(THIS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(THIS)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_62() { - if (jj_scan_token(IDENTIFIER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(IDENTIFIER)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_53() { - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_153() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_scan_token(RBRACKET)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2364,19 +3336,37 @@ jj_scanpos = xsp; if (jj_3R_56()) { jj_scanpos = xsp; - if (jj_3R_57()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_57()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_52() { - if (jj_3R_69()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_69()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2405,103 +3395,206 @@ jj_scanpos = xsp; if (jj_3R_38()) { jj_scanpos = xsp; - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_39()) { + return true; + } + if (jj_la == 0 + && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 + && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 + && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_28() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(ASSIGN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_61() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3_2() { - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_21()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_21()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_20() { - if (jj_3R_26()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_26()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_27()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_27()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } } return false; } final private boolean jj_3R_60() { - if (jj_scan_token(BANG)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(BANG)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_155() { - if (jj_scan_token(DECR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(DECR)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_67() { - if (jj_3R_20()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_21()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_25()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_20()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_21()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_25()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_150() { - if (jj_scan_token(LPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_24()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(LPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_24()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_153()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - if (jj_scan_token(RPAREN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_136()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_153()) { + jj_scanpos = xsp; + break; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + } + if (jj_scan_token(RPAREN)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } + if (jj_3R_136()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_59() { - if (jj_scan_token(TILDE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(TILDE)) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } final private boolean jj_3R_51() { - if (jj_3R_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_68()) { + return true; + } + if (jj_la == 0 && jj_scanpos == jj_lastpos) { + return false; + } return false; } @@ -2512,13 +3605,28 @@ private Token jj_scanpos, jj_lastpos; private int jj_la; public boolean lookingAhead = false; - private boolean jj_semLA; private int jj_gen; final private int[] jj_la1 = new int[44]; - final private int[] jj_la1_0 = {0x8209400,0x0,0x8209400,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x0,}; - final private int[] jj_la1_1 = {0x2014,0x0,0x2014,0x0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x0,0x884480c0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x88400080,0x400000,0x884480c0,0x0,0x0,0x40,}; - final private int[] jj_la1_2 = {0x8,0x400,0x0,0x2000,0xf00c004e,0x8000,0x100000,0x4000000,0x8000000,0x0,0x0,0x0,0x2400000,0x2400000,0x0,0x1830000,0x1830000,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0xc0000000,0xf00c004e,0xc0000,0xc0000,0x4e,0xc004e,0x40,0x30000000,0x30000000,0x400,0x400,0x40,0x4440,0x4e,0x4440,0x6,0x0,0xf00c004e,0x2000,0x440,0x0,}; - final private int[] jj_la1_3 = {0x0,0x0,0x0,0x0,0x0,0xffe00,0x0,0x0,0x0,0x8,0x10,0x4,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x23,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + final private int[] jj_la1_0 = { 0x8209400, 0x0, 0x8209400, 0x0, 0x1000000, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x0, 0x1000000, 0x1000000, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x1000000, + 0x1000000, 0x1000000, 0x0, 0x0, 0x0, }; + final private int[] jj_la1_1 = { 0x2014, 0x0, 0x2014, 0x0, 0x884480c0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x0, 0x884480c0, 0x884480c0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x88400080, 0x400000, + 0x884480c0, 0x0, 0x0, 0x40, }; + final private int[] jj_la1_2 = { 0x8, 0x400, 0x0, 0x2000, 0xf00c004e, + 0x8000, 0x100000, 0x4000000, 0x8000000, 0x0, 0x0, 0x0, 0x2400000, + 0x2400000, 0x0, 0x1830000, 0x1830000, 0x0, 0x0, 0xc0000000, + 0xc0000000, 0x0, 0x0, 0xc0000000, 0xf00c004e, 0xc0000, 0xc0000, 0x4e, + 0xc004e, 0x40, 0x30000000, 0x30000000, 0x400, 0x400, 0x40, 0x4440, + 0x4e, 0x4440, 0x6, 0x0, 0xf00c004e, 0x2000, 0x440, 0x0, }; + final private int[] jj_la1_3 = { 0x0, 0x0, 0x0, 0x0, 0x0, 0xffe00, 0x0, 0x0, + 0x0, 0x8, 0x10, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c0, 0x1c0, 0x0, 0x0, + 0x23, 0x23, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, }; final private JJExpressionParserCalls[] jj_2_rtns = new JJExpressionParserCalls[9]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -2529,8 +3637,12 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } public void ReInit(java.io.InputStream stream) { @@ -2539,8 +3651,12 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } public ExpressionParser(ExpressionParserTokenManager tm) { @@ -2548,8 +3664,12 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } public void ReInit(ExpressionParserTokenManager tm) { @@ -2557,23 +3677,32 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 44; i++) jj_la1[i] = -1; - for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls(); + for (int i = 0; i < 44; i++) { + jj_la1[i] = -1; + } + for (int i = 0; i < jj_2_rtns.length; i++) { + jj_2_rtns[i] = new JJExpressionParserCalls(); + } } final private Token jj_consume_token(int kind) throws ParseException { Token oldToken; - if ((oldToken = token).next != null) token = token.next; - else token = token.next = token_source.getNextToken(); + if ((oldToken = token).next != null) { + token = token.next; + } else { + token = token.next = token_source.getNextToken(); + } jj_ntk = -1; if (token.kind == kind) { jj_gen++; if (++jj_gc > 100) { jj_gc = 0; - for (int i = 0; i < jj_2_rtns.length; i++) { - JJExpressionParserCalls c = jj_2_rtns[i]; + for (JJExpressionParserCalls jj_2_rtn : jj_2_rtns) { + JJExpressionParserCalls c = jj_2_rtn; while (c != null) { - if (c.gen < jj_gen) c.first = null; + if (c.gen < jj_gen) { + c.first = null; + } c = c.next; } } @@ -2589,7 +3718,8 @@ if (jj_scanpos == jj_lastpos) { jj_la--; if (jj_scanpos.next == null) { - jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken(); + jj_lastpos = jj_scanpos = jj_scanpos.next = token_source + .getNextToken(); } else { jj_lastpos = jj_scanpos = jj_scanpos.next; } @@ -2597,16 +3727,25 @@ jj_scanpos = jj_scanpos.next; } if (jj_rescan) { - int i = 0; Token tok = token; - while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; } - if (tok != null) jj_add_error_token(kind, i); + int i = 0; + Token tok = token; + while (tok != null && tok != jj_scanpos) { + i++; + tok = tok.next; + } + if (tok != null) { + jj_add_error_token(kind, i); + } } return (jj_scanpos.kind != kind); } final public Token getNextToken() { - if (token.next != null) token = token.next; - else token = token.next = token_source.getNextToken(); + if (token.next != null) { + token = token.next; + } else { + token = token.next = token_source.getNextToken(); + } jj_ntk = -1; jj_gen++; return token; @@ -2615,27 +3754,33 @@ final public Token getToken(int index) { Token t = lookingAhead ? jj_scanpos : token; for (int i = 0; i < index; i++) { - if (t.next != null) t = t.next; - else t = t.next = token_source.getNextToken(); + if (t.next != null) { + t = t.next; + } else { + t = t.next = token_source.getNextToken(); + } } return t; } final private int jj_ntk() { - if ((jj_nt=token.next) == null) + if ((jj_nt = token.next) == null) { return (jj_ntk = (token.next=token_source.getNextToken()).kind); - else + } else { return (jj_ntk = jj_nt.kind); } + } - private java.util.Vector jj_expentries = new java.util.Vector(); + private java.util.Vector<int[]> jj_expentries = new java.util.Vector<int[]>(); private int[] jj_expentry; private int jj_kind = -1; private int[] jj_lasttokens = new int[100]; private int jj_endpos; private void jj_add_error_token(int kind, int pos) { - if (pos >= 100) return; + if (pos >= 100) { + return; + } if (pos == jj_endpos + 1) { jj_lasttokens[jj_endpos++] = kind; } else if (jj_endpos != 0) { @@ -2644,8 +3789,9 @@ jj_expentry[i] = jj_lasttokens[i]; } boolean exists = false; - for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) { - int[] oldentry = (int[])(enum_.nextElement()); + for (java.util.Enumeration<int[]> enum_ = jj_expentries.elements(); enum_ + .hasMoreElements();) { + int[] oldentry = (enum_.nextElement()); if (oldentry.length == jj_expentry.length) { exists = true; for (int i = 0; i < jj_expentry.length; i++) { @@ -2654,11 +3800,17 @@ break; } } - if (exists) break; - } - } - if (!exists) jj_expentries.addElement(jj_expentry); - if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind; + if (exists) { + break; + } + } + } + if (!exists) { + jj_expentries.addElement(jj_expentry); + } + if (pos != 0) { + jj_lasttokens[(jj_endpos = pos) - 1] = kind; + } } } @@ -2702,7 +3854,7 @@ jj_add_error_token(0, 0); int[][] exptokseq = new int[jj_expentries.size()][]; for (int i = 0; i < jj_expentries.size(); i++) { - exptokseq[i] = (int[])jj_expentries.elementAt(i); + exptokseq[i] = jj_expentries.elementAt(i); } return new ParseException(token, exptokseq, tokenImage); } @@ -2719,17 +3871,36 @@ JJExpressionParserCalls p = jj_2_rtns[i]; do { if (p.gen > jj_gen) { - jj_la = p.arg; jj_lastpos = jj_scanpos = p.first; + jj_la = p.arg; + jj_lastpos = jj_scanpos = p.first; switch (i) { - case 0: jj_3_1(); break; - case 1: jj_3_2(); break; - case 2: jj_3_3(); break; - case 3: jj_3_4(); break; - case 4: jj_3_5(); break; - case 5: jj_3_6(); break; - case 6: jj_3_7(); break; - case 7: jj_3_8(); break; - case 8: jj_3_9(); break; + case 0: + jj_3_1(); + break; + case 1: + jj_3_2(); + break; + case 2: + jj_3_3(); + break; + case 3: + jj_3_4(); + break; + case 4: + jj_3_5(); + break; + case 5: + jj_3_6(); + break; + case 6: + jj_3_7(); + break; + case 7: + jj_3_8(); + break; + case 8: + jj_3_9(); + break; } } p = p.next; @@ -2741,10 +3912,15 @@ final private void jj_save(int index, int xla) { JJExpressionParserCalls p = jj_2_rtns[index]; while (p.gen > jj_gen) { - if (p.next == null) { p = p.next = new JJExpressionParserCalls(); break; } + if (p.next == null) { + p = p.next = new JJExpressionParserCalls(); + break; + } p = p.next; } - p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla; + p.gen = jj_gen + xla - jj_la; + p.first = token; + p.arg = xla; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java Sat May 14 11:52:15 2011 -0700 @@ -25,10 +25,6 @@ /* Generated By:JavaCC: Do not edit this line. ExpressionParserTokenManager.java */ package com.sun.tools.example.debug.expr; -import com.sun.jdi.*; -import java.util.Stack; -import java.util.List; -import java.util.ArrayList; public class ExpressionParserTokenManager implements ExpressionParserConstants { @@ -37,15 +33,17 @@ switch (pos) { case 0: - if ((active1 & 0x4000L) != 0L) + if ((active1 & 0x4000L) != 0L) { return 4; + } if ((active0 & 0x7fffffffffffe00L) != 0L) { jjmatchedKind = 67; return 28; } - if ((active1 & 0x100200000000L) != 0L) + if ((active1 & 0x100200000000L) != 0L) { return 49; + } return -1; case 1: if ((active0 & 0x7ffffffbfcffe00L) != 0L) @@ -57,8 +55,9 @@ } return 28; } - if ((active0 & 0x40300000L) != 0L) + if ((active0 & 0x40300000L) != 0L) { return 28; + } return -1; case 2: if ((active0 & 0x77fffb3afeffe00L) != 0L) @@ -70,8 +69,9 @@ } return 28; } - if ((active0 & 0x80004c10000000L) != 0L) + if ((active0 & 0x80004c10000000L) != 0L) { return 28; + } return -1; case 3: if ((active0 & 0x63bff2b8faf4e00L) != 0L) @@ -80,8 +80,9 @@ jjmatchedPos = 3; return 28; } - if ((active0 & 0x14400902040b000L) != 0L) + if ((active0 & 0x14400902040b000L) != 0L) { return 28; + } return -1; case 4: if ((active0 & 0x2235f2b80ac0600L) != 0L) @@ -93,8 +94,9 @@ } return 28; } - if ((active0 & 0x418a0000f034800L) != 0L) + if ((active0 & 0x418a0000f034800L) != 0L) { return 28; + } return -1; case 5: if ((active0 & 0x222070a848c0600L) != 0L) @@ -103,8 +105,9 @@ jjmatchedPos = 5; return 28; } - if ((active0 & 0x11582100200000L) != 0L) + if ((active0 & 0x11582100200000L) != 0L) { return 28; + } return -1; case 6: if ((active0 & 0x222040a80040200L) != 0L) @@ -113,8 +116,9 @@ jjmatchedPos = 6; return 28; } - if ((active0 & 0x30004880400L) != 0L) + if ((active0 & 0x30004880400L) != 0L) { return 28; + } return -1; case 7: if ((active0 & 0x22040a80000000L) != 0L) @@ -123,8 +127,9 @@ jjmatchedPos = 7; return 28; } - if ((active0 & 0x200000000040200L) != 0L) + if ((active0 & 0x200000000040200L) != 0L) { return 28; + } return -1; case 8: if ((active0 & 0x2000280000000L) != 0L) @@ -133,8 +138,9 @@ jjmatchedPos = 8; return 28; } - if ((active0 & 0x20040800000000L) != 0L) + if ((active0 & 0x20040800000000L) != 0L) { return 28; + } return -1; case 9: if ((active0 & 0x2000000000000L) != 0L) @@ -143,8 +149,9 @@ jjmatchedPos = 9; return 28; } - if ((active0 & 0x280000000L) != 0L) + if ((active0 & 0x280000000L) != 0L) { return 28; + } return -1; case 10: if ((active0 & 0x2000000000000L) != 0L) @@ -286,16 +293,19 @@ switch(curChar) { case 38: - if ((active1 & 0x8000000L) != 0L) + if ((active1 & 0x8000000L) != 0L) { return jjStopAtPos(1, 91); + } break; case 43: - if ((active1 & 0x10000000L) != 0L) + if ((active1 & 0x10000000L) != 0L) { return jjStopAtPos(1, 92); + } break; case 45: - if ((active1 & 0x20000000L) != 0L) + if ((active1 & 0x20000000L) != 0L) { return jjStopAtPos(1, 93); + } break; case 60: if ((active1 & 0x4000000000L) != 0L) @@ -305,30 +315,31 @@ } return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000L); case 61: - if ((active1 & 0x400000L) != 0L) + if ((active1 & 0x400000L) != 0L) { return jjStopAtPos(1, 86); - else if ((active1 & 0x800000L) != 0L) + } else if ((active1 & 0x800000L) != 0L) { return jjStopAtPos(1, 87); - else if ((active1 & 0x1000000L) != 0L) + } else if ((active1 & 0x1000000L) != 0L) { return jjStopAtPos(1, 88); - else if ((active1 & 0x2000000L) != 0L) + } else if ((active1 & 0x2000000L) != 0L) { return jjStopAtPos(1, 89); - else if ((active1 & 0x20000000000L) != 0L) + } else if ((active1 & 0x20000000000L) != 0L) { return jjStopAtPos(1, 105); - else if ((active1 & 0x40000000000L) != 0L) + } else if ((active1 & 0x40000000000L) != 0L) { return jjStopAtPos(1, 106); - else if ((active1 & 0x80000000000L) != 0L) + } else if ((active1 & 0x80000000000L) != 0L) { return jjStopAtPos(1, 107); - else if ((active1 & 0x100000000000L) != 0L) + } else if ((active1 & 0x100000000000L) != 0L) { return jjStopAtPos(1, 108); - else if ((active1 & 0x200000000000L) != 0L) + } else if ((active1 & 0x200000000000L) != 0L) { return jjStopAtPos(1, 109); - else if ((active1 & 0x400000000000L) != 0L) + } else if ((active1 & 0x400000000000L) != 0L) { return jjStopAtPos(1, 110); - else if ((active1 & 0x800000000000L) != 0L) + } else if ((active1 & 0x800000000000L) != 0L) { return jjStopAtPos(1, 111); - else if ((active1 & 0x1000000000000L) != 0L) + } else if ((active1 & 0x1000000000000L) != 0L) { return jjStopAtPos(1, 112); + } break; case 62: if ((active1 & 0x8000000000L) != 0L) @@ -344,8 +355,9 @@ case 101: return jjMoveStringLiteralDfa2_0(active0, 0x104000080000L, active1, 0L); case 102: - if ((active0 & 0x40000000L) != 0L) + if ((active0 & 0x40000000L) != 0L) { return jjStartNfaWithStates_0(1, 30, 28); + } break; case 104: return jjMoveStringLiteralDfa2_0(active0, 0x41c200000008000L, active1, 0L); @@ -377,8 +389,9 @@ case 121: return jjMoveStringLiteralDfa2_0(active0, 0x2000000001000L, active1, 0L); case 124: - if ((active1 & 0x4000000L) != 0L) + if ((active1 & 0x4000000L) != 0L) { return jjStopAtPos(1, 90); + } break; default : break; @@ -387,8 +400,9 @@ } private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) + if (((active0 &= old0) | (active1 &= old1)) == 0L) { return jjStartNfa_0(0, old0, old1); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(1, active0, active1); @@ -397,10 +411,11 @@ switch(curChar) { case 61: - if ((active1 & 0x2000000000000L) != 0L) + if ((active1 & 0x2000000000000L) != 0L) { return jjStopAtPos(2, 113); - else if ((active1 & 0x4000000000000L) != 0L) + } else if ((active1 & 0x4000000000000L) != 0L) { return jjStopAtPos(2, 114); + } break; case 62: if ((active1 & 0x10000000000L) != 0L) @@ -430,8 +445,9 @@ case 112: return jjMoveStringLiteralDfa3_0(active0, 0x800180000000L, active1, 0L); case 114: - if ((active0 & 0x10000000L) != 0L) + if ((active0 & 0x10000000L) != 0L) { return jjStartNfaWithStates_0(2, 28, 28); + } return jjMoveStringLiteralDfa3_0(active0, 0x18000000000000L, active1, 0L); case 115: return jjMoveStringLiteralDfa3_0(active0, 0x200402200L, active1, 0L); @@ -445,12 +461,14 @@ case 117: return jjMoveStringLiteralDfa3_0(active0, 0x40000000200000L, active1, 0L); case 119: - if ((active0 & 0x4000000000L) != 0L) + if ((active0 & 0x4000000000L) != 0L) { return jjStartNfaWithStates_0(2, 38, 28); + } break; case 121: - if ((active0 & 0x80000000000000L) != 0L) + if ((active0 & 0x80000000000000L) != 0L) { return jjStartNfaWithStates_0(2, 55, 28); + } break; default : break; @@ -459,8 +477,9 @@ } private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) + if (((active0 &= old0) | (active1 &= old1)) == 0L) { return jjStartNfa_0(1, old0, old1); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(2, active0, active1); @@ -469,8 +488,9 @@ switch(curChar) { case 61: - if ((active1 & 0x8000000000000L) != 0L) + if ((active1 & 0x8000000000000L) != 0L) { return jjStopAtPos(3, 115); + } break; case 97: return jjMoveStringLiteralDfa4_0(active0, 0x20000000e080800L, active1, 0L); @@ -479,44 +499,51 @@ case 99: return jjMoveStringLiteralDfa4_0(active0, 0x2000000004000L, active1, 0L); case 100: - if ((active0 & 0x100000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) { return jjStartNfaWithStates_0(3, 56, 28); + } break; case 101: - if ((active0 & 0x1000L) != 0L) + if ((active0 & 0x1000L) != 0L) { return jjStartNfaWithStates_0(3, 12, 28); - else if ((active0 & 0x2000L) != 0L) + } else if ((active0 & 0x2000L) != 0L) { return jjStartNfaWithStates_0(3, 13, 28); - else if ((active0 & 0x400000L) != 0L) + } else if ((active0 & 0x400000L) != 0L) { return jjStartNfaWithStates_0(3, 22, 28); - else if ((active0 & 0x40000000000000L) != 0L) + } else if ((active0 & 0x40000000000000L) != 0L) { return jjStartNfaWithStates_0(3, 54, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x800800800000L, active1, 0L); case 103: - if ((active0 & 0x1000000000L) != 0L) + if ((active0 & 0x1000000000L) != 0L) { return jjStartNfaWithStates_0(3, 36, 28); + } break; case 105: return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0L); case 107: return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0L); case 108: - if ((active0 & 0x8000000000L) != 0L) + if ((active0 & 0x8000000000L) != 0L) { return jjStartNfaWithStates_0(3, 39, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x400080080000400L, active1, 0L); case 110: return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L); case 111: - if ((active0 & 0x20000000L) != 0L) + if ((active0 & 0x20000000L) != 0L) { return jjStartNfaWithStates_0(3, 29, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x18000100000000L, active1, 0L); case 114: - if ((active0 & 0x8000L) != 0L) + if ((active0 & 0x8000L) != 0L) { return jjStartNfaWithStates_0(3, 15, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L); case 115: - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x4000000000000L) != 0L) { return jjStartNfaWithStates_0(3, 50, 28); + } return jjMoveStringLiteralDfa4_0(active0, 0x1030000L, active1, 0L); case 116: return jjMoveStringLiteralDfa4_0(active0, 0x1440200040200L, active1, 0L); @@ -531,8 +558,9 @@ } private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) + if (((active0 &= old0) | (active1 &= old1)) == 0L) { return jjStartNfa_0(2, old0, old1); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(3, active0, 0L); @@ -545,20 +573,23 @@ case 99: return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L); case 101: - if ((active0 & 0x1000000L) != 0L) + if ((active0 & 0x1000000L) != 0L) { return jjStartNfaWithStates_0(4, 24, 28); - else if ((active0 & 0x400000000000000L) != 0L) + } else if ((active0 & 0x400000000000000L) != 0L) { return jjStartNfaWithStates_0(4, 58, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x40080000400L); case 104: - if ((active0 & 0x4000L) != 0L) + if ((active0 & 0x4000L) != 0L) { return jjStartNfaWithStates_0(4, 14, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L); case 105: return jjMoveStringLiteralDfa5_0(active0, 0x480000040000L); case 107: - if ((active0 & 0x800L) != 0L) + if ((active0 & 0x800L) != 0L) { return jjStartNfaWithStates_0(4, 11, 28); + } break; case 108: if ((active0 & 0x2000000L) != 0L) @@ -570,20 +601,23 @@ case 110: return jjMoveStringLiteralDfa5_0(active0, 0x800000L); case 114: - if ((active0 & 0x800000000000L) != 0L) + if ((active0 & 0x800000000000L) != 0L) { return jjStartNfaWithStates_0(4, 47, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x100900000200L); case 115: - if ((active0 & 0x10000L) != 0L) + if ((active0 & 0x10000L) != 0L) { return jjStartNfaWithStates_0(4, 16, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L); case 116: - if ((active0 & 0x20000L) != 0L) + if ((active0 & 0x20000L) != 0L) { return jjStartNfaWithStates_0(4, 17, 28); - else if ((active0 & 0x8000000L) != 0L) + } else if ((active0 & 0x8000000L) != 0L) { return jjStartNfaWithStates_0(4, 27, 28); - else if ((active0 & 0x200000000000L) != 0L) + } else if ((active0 & 0x200000000000L) != 0L) { return jjStartNfaWithStates_0(4, 45, 28); + } return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L); case 117: return jjMoveStringLiteralDfa5_0(active0, 0x80000L); @@ -603,8 +637,9 @@ } private final int jjMoveStringLiteralDfa5_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(3, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(4, active0, 0L); @@ -615,26 +650,29 @@ case 97: return jjMoveStringLiteralDfa6_0(active0, 0x600L); case 99: - if ((active0 & 0x80000000000L) != 0L) + if ((active0 & 0x80000000000L) != 0L) { return jjStartNfaWithStates_0(5, 43, 28); - else if ((active0 & 0x400000000000L) != 0L) + } else if ((active0 & 0x400000000000L) != 0L) { return jjStartNfaWithStates_0(5, 46, 28); + } return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L); case 100: return jjMoveStringLiteralDfa6_0(active0, 0x800000L); case 101: - if ((active0 & 0x200000L) != 0L) + if ((active0 & 0x200000L) != 0L) { return jjStartNfaWithStates_0(5, 21, 28); - else if ((active0 & 0x2000000000L) != 0L) + } else if ((active0 & 0x2000000000L) != 0L) { return jjStartNfaWithStates_0(5, 37, 28); + } break; case 102: return jjMoveStringLiteralDfa6_0(active0, 0x800000000L); case 103: return jjMoveStringLiteralDfa6_0(active0, 0x10000000000L); case 104: - if ((active0 & 0x1000000000000L) != 0L) + if ((active0 & 0x1000000000000L) != 0L) { return jjStartNfaWithStates_0(5, 48, 28); + } break; case 105: return jjMoveStringLiteralDfa6_0(active0, 0x220000000000000L); @@ -643,18 +681,21 @@ case 109: return jjMoveStringLiteralDfa6_0(active0, 0x80000000L); case 110: - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x100000000000L) != 0L) { return jjStartNfaWithStates_0(5, 44, 28); + } return jjMoveStringLiteralDfa6_0(active0, 0x200040000L); case 114: return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000L); case 115: - if ((active0 & 0x10000000000000L) != 0L) + if ((active0 & 0x10000000000000L) != 0L) { return jjStartNfaWithStates_0(5, 52, 28); + } break; case 116: - if ((active0 & 0x100000000L) != 0L) + if ((active0 & 0x100000000L) != 0L) { return jjStartNfaWithStates_0(5, 32, 28); + } return jjMoveStringLiteralDfa6_0(active0, 0x20000000000L); default : break; @@ -663,8 +704,9 @@ } private final int jjMoveStringLiteralDfa6_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(4, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(5, active0, 0L); @@ -677,32 +719,37 @@ case 99: return jjMoveStringLiteralDfa7_0(active0, 0x200000200L); case 101: - if ((active0 & 0x10000000000L) != 0L) + if ((active0 & 0x10000000000L) != 0L) { return jjStartNfaWithStates_0(6, 40, 28); - else if ((active0 & 0x20000000000L) != 0L) + } else if ((active0 & 0x20000000000L) != 0L) { return jjStartNfaWithStates_0(6, 41, 28); + } return jjMoveStringLiteralDfa7_0(active0, 0x20000080000000L); case 108: return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L); case 110: - if ((active0 & 0x400L) != 0L) + if ((active0 & 0x400L) != 0L) { return jjStartNfaWithStates_0(6, 10, 28); + } break; case 111: return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L); case 115: - if ((active0 & 0x800000L) != 0L) + if ((active0 & 0x800000L) != 0L) { return jjStartNfaWithStates_0(6, 23, 28); + } break; case 116: - if ((active0 & 0x80000L) != 0L) + if ((active0 & 0x80000L) != 0L) { return jjStartNfaWithStates_0(6, 19, 28); + } return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L); case 117: return jjMoveStringLiteralDfa7_0(active0, 0x40000L); case 121: - if ((active0 & 0x4000000L) != 0L) + if ((active0 & 0x4000000L) != 0L) { return jjStartNfaWithStates_0(6, 26, 28); + } break; default : break; @@ -711,8 +758,9 @@ } private final int jjMoveStringLiteralDfa7_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(5, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(6, active0, 0L); @@ -723,16 +771,18 @@ case 99: return jjMoveStringLiteralDfa8_0(active0, 0x800000000L); case 101: - if ((active0 & 0x40000L) != 0L) + if ((active0 & 0x40000L) != 0L) { return jjStartNfaWithStates_0(7, 18, 28); - else if ((active0 & 0x200000000000000L) != 0L) + } else if ((active0 & 0x200000000000000L) != 0L) { return jjStartNfaWithStates_0(7, 57, 28); + } return jjMoveStringLiteralDfa8_0(active0, 0x40200000000L); case 110: return jjMoveStringLiteralDfa8_0(active0, 0x22000080000000L); case 116: - if ((active0 & 0x200L) != 0L) + if ((active0 & 0x200L) != 0L) { return jjStartNfaWithStates_0(7, 9, 28); + } break; default : break; @@ -741,8 +791,9 @@ } private final int jjMoveStringLiteralDfa8_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(6, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(7, active0, 0L); @@ -751,20 +802,23 @@ switch(curChar) { case 100: - if ((active0 & 0x40000000000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { return jjStartNfaWithStates_0(8, 42, 28); + } break; case 101: - if ((active0 & 0x800000000L) != 0L) + if ((active0 & 0x800000000L) != 0L) { return jjStartNfaWithStates_0(8, 35, 28); + } break; case 105: return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000L); case 111: return jjMoveStringLiteralDfa9_0(active0, 0x200000000L); case 116: - if ((active0 & 0x20000000000000L) != 0L) + if ((active0 & 0x20000000000000L) != 0L) { return jjStartNfaWithStates_0(8, 53, 28); + } return jjMoveStringLiteralDfa9_0(active0, 0x80000000L); default : break; @@ -773,8 +827,9 @@ } private final int jjMoveStringLiteralDfa9_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(7, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(8, active0, 0L); @@ -783,12 +838,14 @@ switch(curChar) { case 102: - if ((active0 & 0x200000000L) != 0L) + if ((active0 & 0x200000000L) != 0L) { return jjStartNfaWithStates_0(9, 33, 28); + } break; case 115: - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x80000000L) != 0L) { return jjStartNfaWithStates_0(9, 31, 28); + } break; case 122: return jjMoveStringLiteralDfa10_0(active0, 0x2000000000000L); @@ -799,8 +856,9 @@ } private final int jjMoveStringLiteralDfa10_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(8, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(9, active0, 0L); @@ -817,8 +875,9 @@ } private final int jjMoveStringLiteralDfa11_0(long old0, long active0) { - if (((active0 &= old0)) == 0L) + if (((active0 &= old0)) == 0L) { return jjStartNfa_0(9, old0, 0L); + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_0(10, active0, 0L); @@ -827,8 +886,9 @@ switch(curChar) { case 100: - if ((active0 & 0x2000000000000L) != 0L) + if ((active0 & 0x2000000000000L) != 0L) { return jjStartNfaWithStates_0(11, 49, 28); + } break; default : break; @@ -891,320 +951,395 @@ }; private final int jjMoveNfa_0(int startState, int curPos) { - int[] nextStates; int startsAt = 0; jjnewStateCnt = 67; int i = 1; jjstateSet[0] = startState; - int j, kind = 0x7fffffff; + int kind = 0x7fffffff; for (;;) { - if (++jjround == 0x7fffffff) + if (++jjround == 0x7fffffff) { ReInitRounds(); + } if (curChar < 64) { long l = 1L << curChar; - MatchLoop: do + //MatchLoop + do { switch(jjstateSet[--i]) { case 0: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddStates(0, 6); - else if (curChar == 47) + } else if (curChar == 47) { jjAddStates(7, 9); - else if (curChar == 36) + } else if (curChar == 36) { - if (kind > 67) + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); } - else if (curChar == 34) + else if (curChar == 34) { jjCheckNAddStates(10, 12); - else if (curChar == 39) + } else if (curChar == 39) { jjAddStates(13, 14); - else if (curChar == 46) + } else if (curChar == 46) { jjCheckNAdd(4); + } if ((0x3fe000000000000L & l) != 0L) { - if (kind > 59) + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(1, 2); } else if (curChar == 48) { - if (kind > 59) + if (kind > 59) { kind = 59; + } jjCheckNAddStates(15, 17); } break; case 49: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddTwoStates(62, 63); - else if (curChar == 47) + } else if (curChar == 47) { jjCheckNAddStates(18, 20); - if (curChar == 42) + } + if (curChar == 42) { jjstateSet[jjnewStateCnt++] = 54; + } break; case 1: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(1, 2); break; case 3: - if (curChar == 46) + if (curChar == 46) { jjCheckNAdd(4); + } break; case 4: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddStates(21, 23); break; case 6: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(7); + } break; case 7: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddTwoStates(7, 8); break; case 9: - if (curChar == 39) + if (curChar == 39) { jjAddStates(13, 14); + } break; case 10: - if ((0xffffff7fffffdbffL & l) != 0L) + if ((0xffffff7fffffdbffL & l) != 0L) { jjCheckNAdd(11); + } break; case 11: - if (curChar == 39 && kind > 65) + if (curChar == 39 && kind > 65) { kind = 65; + } break; case 13: - if ((0x8400000000L & l) != 0L) + if ((0x8400000000L & l) != 0L) { jjCheckNAdd(11); + } break; case 14: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAddTwoStates(15, 11); + } break; case 15: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAdd(11); + } break; case 16: - if ((0xf000000000000L & l) != 0L) + if ((0xf000000000000L & l) != 0L) { jjstateSet[jjnewStateCnt++] = 17; + } break; case 17: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAdd(15); + } break; case 18: - if (curChar == 34) + if (curChar == 34) { jjCheckNAddStates(10, 12); + } break; case 19: - if ((0xfffffffbffffdbffL & l) != 0L) + if ((0xfffffffbffffdbffL & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 21: - if ((0x8400000000L & l) != 0L) + if ((0x8400000000L & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 22: - if (curChar == 34 && kind > 66) + if (curChar == 34 && kind > 66) { kind = 66; + } break; case 23: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAddStates(24, 27); + } break; case 24: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 25: - if ((0xf000000000000L & l) != 0L) + if ((0xf000000000000L & l) != 0L) { jjstateSet[jjnewStateCnt++] = 26; + } break; case 26: - if ((0xff000000000000L & l) != 0L) + if ((0xff000000000000L & l) != 0L) { jjCheckNAdd(24); + } break; case 27: - if (curChar != 36) + if (curChar != 36) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 28: - if ((0x3ff001000000000L & l) == 0L) + if ((0x3ff001000000000L & l) == 0L) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 29: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddStates(0, 6); + } break; case 30: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(30, 31); + } break; case 31: - if (curChar != 46) + if (curChar != 46) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddStates(28, 30); break; case 32: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddStates(28, 30); break; case 34: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(35); + } break; case 35: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddTwoStates(35, 8); break; case 36: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(36, 37); + } break; case 38: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(39); + } break; case 39: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 63) + } + if (kind > 63) { kind = 63; + } jjCheckNAddTwoStates(39, 8); break; case 40: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddStates(31, 33); + } break; case 42: - if ((0x280000000000L & l) != 0L) + if ((0x280000000000L & l) != 0L) { jjCheckNAdd(43); + } break; case 43: - if ((0x3ff000000000000L & l) != 0L) + if ((0x3ff000000000000L & l) != 0L) { jjCheckNAddTwoStates(43, 8); + } break; case 44: - if (curChar != 48) + if (curChar != 48) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddStates(15, 17); break; case 46: - if ((0x3ff000000000000L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(46, 2); break; case 47: - if ((0xff000000000000L & l) == 0L) + if ((0xff000000000000L & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(47, 2); break; case 48: - if (curChar == 47) + if (curChar == 47) { jjAddStates(7, 9); + } break; case 50: - if ((0xffffffffffffdbffL & l) != 0L) + if ((0xffffffffffffdbffL & l) != 0L) { jjCheckNAddStates(18, 20); + } break; case 51: - if ((0x2400L & l) != 0L && kind > 6) + if ((0x2400L & l) != 0L && kind > 6) { kind = 6; + } break; case 52: - if (curChar == 10 && kind > 6) + if (curChar == 10 && kind > 6) { kind = 6; + } break; case 53: - if (curChar == 13) + if (curChar == 13) { jjstateSet[jjnewStateCnt++] = 52; + } break; case 54: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddTwoStates(55, 56); + } break; case 55: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(55, 56); + } break; case 56: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddStates(34, 36); + } break; case 57: - if ((0xffff7bffffffffffL & l) != 0L) + if ((0xffff7bffffffffffL & l) != 0L) { jjCheckNAddTwoStates(58, 56); + } break; case 58: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(58, 56); + } break; case 59: - if (curChar == 47 && kind > 7) + if (curChar == 47 && kind > 7) { kind = 7; + } break; case 60: - if (curChar == 42) + if (curChar == 42) { jjstateSet[jjnewStateCnt++] = 54; + } break; case 61: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddTwoStates(62, 63); + } break; case 62: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(62, 63); + } break; case 63: - if (curChar == 42) + if (curChar == 42) { jjCheckNAddStates(37, 39); + } break; case 64: - if ((0xffff7bffffffffffL & l) != 0L) + if ((0xffff7bffffffffffL & l) != 0L) { jjCheckNAddTwoStates(65, 63); + } break; case 65: - if ((0xfffffbffffffffffL & l) != 0L) + if ((0xfffffbffffffffffL & l) != 0L) { jjCheckNAddTwoStates(65, 63); + } break; case 66: - if (curChar == 47 && kind > 8) + if (curChar == 47 && kind > 8) { kind = 8; + } break; default : break; } @@ -1213,75 +1348,93 @@ else if (curChar < 128) { long l = 1L << (curChar & 077); - MatchLoop: do + //MatchLoop + do { switch(jjstateSet[--i]) { case 0: case 28: - if ((0x7fffffe87fffffeL & l) == 0L) + if ((0x7fffffe87fffffeL & l) == 0L) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 2: - if ((0x100000001000L & l) != 0L && kind > 59) + if ((0x100000001000L & l) != 0L && kind > 59) { kind = 59; + } break; case 5: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(40, 41); + } break; case 8: - if ((0x5000000050L & l) != 0L && kind > 63) + if ((0x5000000050L & l) != 0L && kind > 63) { kind = 63; + } break; case 10: - if ((0xffffffffefffffffL & l) != 0L) + if ((0xffffffffefffffffL & l) != 0L) { jjCheckNAdd(11); + } break; case 12: - if (curChar == 92) + if (curChar == 92) { jjAddStates(42, 44); + } break; case 13: - if ((0x14404410000000L & l) != 0L) + if ((0x14404410000000L & l) != 0L) { jjCheckNAdd(11); + } break; case 19: - if ((0xffffffffefffffffL & l) != 0L) + if ((0xffffffffefffffffL & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 20: - if (curChar == 92) + if (curChar == 92) { jjAddStates(45, 47); + } break; case 21: - if ((0x14404410000000L & l) != 0L) + if ((0x14404410000000L & l) != 0L) { jjCheckNAddStates(10, 12); + } break; case 33: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(48, 49); + } break; case 37: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(50, 51); + } break; case 41: - if ((0x2000000020L & l) != 0L) + if ((0x2000000020L & l) != 0L) { jjAddStates(52, 53); + } break; case 45: - if ((0x100000001000000L & l) != 0L) + if ((0x100000001000000L & l) != 0L) { jjCheckNAdd(46); + } break; case 46: - if ((0x7e0000007eL & l) == 0L) + if ((0x7e0000007eL & l) == 0L) { break; - if (kind > 59) + } + if (kind > 59) { kind = 59; + } jjCheckNAddTwoStates(46, 2); break; case 50: @@ -1312,47 +1465,57 @@ long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); - MatchLoop: do + //MatchLoop + do { switch(jjstateSet[--i]) { case 0: case 28: - if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) + if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) { break; - if (kind > 67) + } + if (kind > 67) { kind = 67; + } jjCheckNAdd(28); break; case 10: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjstateSet[jjnewStateCnt++] = 11; + } break; case 19: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjAddStates(10, 12); + } break; case 50: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjAddStates(18, 20); + } break; case 55: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(55, 56); + } break; case 57: case 58: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(58, 56); + } break; case 62: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(62, 63); + } break; case 64: case 65: - if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) { jjCheckNAddTwoStates(65, 63); + } break; default : break; } @@ -1365,8 +1528,9 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt))) { return curPos; + } try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } @@ -1384,8 +1548,9 @@ case 0: return ((jjbitVec2[i2] & l2) != 0L); default : - if ((jjbitVec0[i1] & l1) != 0L) + if ((jjbitVec0[i1] & l1) != 0L) { return true; + } return false; } } @@ -1404,8 +1569,9 @@ case 61: return ((jjbitVec8[i2] & l2) != 0L); default : - if ((jjbitVec3[i1] & l1) != 0L) + if ((jjbitVec3[i1] & l1) != 0L) { return true; + } return false; } } @@ -1449,8 +1615,9 @@ protected char curChar; public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream) { - if (ASCII_UCodeESC_CharStream.staticFlag) + if (ASCII_UCodeESC_CharStream.staticFlag) { throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer."); + } input_stream = stream; } public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream, int lexState) @@ -1469,9 +1636,10 @@ { int i; jjround = 0x80000001; - for (i = 67; i-- > 0;) + for (i = 67; i-- > 0;) { jjrounds[i] = 0x80000000; } +} public void ReInit(ASCII_UCodeESC_CharStream stream, int lexState) { ReInit(stream); @@ -1479,11 +1647,12 @@ } public void SwitchTo(int lexState) { - if (lexState >= 1 || lexState < 0) + if (lexState >= 1 || lexState < 0) { throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); - else + } else { curLexState = lexState; } +} private final Token jjFillToken() { @@ -1507,7 +1676,6 @@ public final Token getNextToken() { - int kind; Token specialToken = null; Token matchedToken; int curPos = 0; @@ -1528,17 +1696,19 @@ } try { - while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L) + while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L) { curChar = input_stream.BeginToken(); } + } catch (java.io.IOException e1) { continue EOFLoop; } jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); if (jjmatchedKind != 0x7fffffff) { - if (jjmatchedPos + 1 < curPos) + if (jjmatchedPos + 1 < curPos) { input_stream.backup(curPos - jjmatchedPos - 1); + } if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { matchedToken = jjFillToken(); @@ -1550,9 +1720,9 @@ if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) { matchedToken = jjFillToken(); - if (specialToken == null) + if (specialToken == null) { specialToken = matchedToken; - else + } else { matchedToken.specialToken = specialToken; specialToken = (specialToken.next = matchedToken); @@ -1572,9 +1742,9 @@ if (curChar == '\n' || curChar == '\r') { error_line++; error_column = 0; + } else { + error_column++; } - else - error_column++; } if (!EOFSeen) { input_stream.backup(1); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Sat May 14 11:52:15 2011 -0700 @@ -156,6 +156,7 @@ return new LValueArrayElement(interiorGetValue(), index); } + @Override public String toString() { try { return interiorGetValue().toString(); @@ -419,6 +420,7 @@ this.var = var; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = frame.getValue(var); @@ -426,12 +428,14 @@ return jdiValue; } + @Override void setValue0(Value val) throws InvalidTypeException, ClassNotLoadedException { frame.setValue(var, val); jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException(var.name() + " is not a method"); } @@ -469,6 +473,7 @@ } } + @Override Value getValue() throws InvocationException, InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException, ParseException { @@ -485,6 +490,7 @@ } } + @Override void setValue0(Value val) throws ParseException, InvalidTypeException, ClassNotLoadedException { @@ -495,6 +501,7 @@ jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { if (matchingMethod != null) { throw new ParseException("Invalid consecutive invocations"); @@ -531,6 +538,7 @@ } } + @Override Value getValue() throws InvocationException, InvalidTypeException, ClassNotLoadedException, IncompatibleThreadStateException, ParseException { @@ -548,6 +556,7 @@ } } + @Override void setValue0(Value val) throws ParseException, InvalidTypeException, ClassNotLoadedException { @@ -562,6 +571,7 @@ jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { if (matchingMethod != null) { throw new ParseException("Invalid consecutive invocations"); @@ -589,6 +599,7 @@ this.arrayRef = value; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = arrayRef.virtualMachine().mirrorOf(arrayRef.length()); @@ -596,10 +607,12 @@ return jdiValue; } + @Override void setValue0(Value value) throws ParseException { throw new ParseException("Cannot set constant: " + value); } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException("Array element is not a method"); } @@ -618,6 +631,7 @@ this.index = index; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = array.getValue(index); @@ -625,12 +639,14 @@ return jdiValue; } + @Override void setValue0(Value val) throws InvalidTypeException, ClassNotLoadedException { array.setValue(index, val); jdiValue = val; } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException("Array element is not a method"); } @@ -643,6 +659,7 @@ this.value = value; } + @Override Value getValue() { if (jdiValue == null) { jdiValue = value; @@ -650,10 +667,12 @@ return jdiValue; } + @Override void setValue0(Value val) throws ParseException { throw new ParseException("Cannot set constant: " + value); } + @Override void invokeWith(List<Value> arguments) throws ParseException { throw new ParseException("Constant is not a method"); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Sat May 14 11:52:15 2011 -0700 @@ -37,6 +37,8 @@ */ public class ParseException extends Exception { + private static final long serialVersionUID = 7978489144303647901L; + /** * This constructor is used by the method "generateParseException" * in the generated parser. Calling this constructor generates @@ -119,20 +121,21 @@ * of the final stack trace, and hence the correct error message * gets displayed. */ + @Override public String getMessage() { if (!specialConstructor) { return super.getMessage(); } String expected = ""; int maxSize = 0; - for (int i = 0; i < expectedTokenSequences.length; i++) { - if (maxSize < expectedTokenSequences[i].length) { - maxSize = expectedTokenSequences[i].length; + for (int[] expectedTokenSequence : expectedTokenSequences) { + if (maxSize < expectedTokenSequence.length) { + maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequences[i].length; j++) { - expected += tokenImage[expectedTokenSequences[i][j]] + " "; + for (int j = 0; j < expectedTokenSequence.length; j++) { + expected += tokenImage[expectedTokenSequence[j]] + " "; } - if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { + if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) { expected += "..."; } expected += eol + " "; @@ -140,7 +143,9 @@ String retval = "Encountered \""; Token tok = currentToken.next; for (int i = 0; i < maxSize; i++) { - if (i != 0) retval += " "; + if (i != 0) { + retval += " "; + } if (tok.kind == 0) { retval += tokenImage[0]; break; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java Sat May 14 11:52:15 2011 -0700 @@ -78,6 +78,7 @@ /** * Returns the image. */ + @Override public final String toString() { return image; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Sat May 14 11:52:15 2011 -0700 @@ -32,6 +32,8 @@ * Ordinals for various reasons why an Error of this type can be thrown. */ + private static final long serialVersionUID = -6236440836177601522L; + /** * Lexical error occured. */ @@ -136,6 +138,7 @@ * * from this method for such cases in the release version of your parser. */ + @Override public String getMessage() { return super.getMessage(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java Sat May 14 11:52:15 2011 -0700 @@ -29,12 +29,12 @@ import java.awt.*; import java.awt.event.*; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; public class ApplicationTool extends JPanel { - private Environment env; + private static final long serialVersionUID = 310966063293205714L; + private ExecutionManager runtime; private TypeScript script; @@ -45,13 +45,13 @@ super(new BorderLayout()); - this.env = env; this.runtime = env.getExecutionManager(); this.script = new TypeScript(PROMPT, false); // No implicit echo. this.add(script); script.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { runtime.sendLineToApplication(script.readln()); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,12 +25,10 @@ package com.sun.tools.example.debug.gui; -import java.io.*; import java.util.*; import javax.swing.*; import javax.swing.tree.*; -import javax.swing.event.*; import java.awt.*; import java.awt.event.*; @@ -40,6 +38,8 @@ public class ClassTreeTool extends JPanel { + private static final long serialVersionUID = 526178912591739259L; + private Environment env; private ExecutionManager runtime; @@ -49,7 +49,7 @@ private JTree tree; private DefaultTreeModel treeModel; private ClassTreeNode root; - private SearchPath sourcePath; +// private SearchPath sourcePath; private CommandInterpreter interpreter; @@ -87,6 +87,7 @@ ******/ MouseListener ml = new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); @@ -121,6 +122,7 @@ // SessionListener + @Override public void sessionStart(EventObject e) { // Get system classes and any others loaded before attaching. try { @@ -134,19 +136,24 @@ } } + @Override public void sessionInterrupt(EventObject e) {} + @Override public void sessionContinue(EventObject e) {} // JDIListener + @Override public void classPrepare(ClassPrepareEventSet e) { root.addClass(e.getReferenceType()); } + @Override public void classUnload(ClassUnloadEventSet e) { root.removeClass(e.getClassName()); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { // Clear contents of this view. root = createClassTree(HEADING); @@ -169,6 +176,7 @@ this.refTy = refTy; } + @Override public String toString() { return name; } @@ -185,6 +193,7 @@ return (refTy == null); } + @Override public boolean isLeaf() { return !isPackage(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Sat May 14 11:52:15 2011 -0700 @@ -29,8 +29,6 @@ import java.util.*; import com.sun.jdi.*; -import com.sun.jdi.request.*; - import com.sun.tools.example.debug.bdi.*; public class CommandInterpreter { @@ -93,9 +91,9 @@ try { ThreadReference[] threads = threads(); long threadID = Long.parseLong(id, 16); - for (int i = 0; i < threads.length; i++) { - if (threads[i].uniqueID() == threadID) { - thread = threads[i]; + for (ThreadReference thread2 : threads) { + if (thread2.uniqueID() == threadID) { + thread = thread2; break; } } @@ -239,16 +237,18 @@ for (int i = 0 ; i < tlist.size() ; i++) { ThreadReference thr = tlist.get(i); int len = Utils.description(thr).length(); - if (len > maxId) + if (len > maxId) { maxId = len; + } String name = thr.name(); int iDot = name.lastIndexOf('.'); if (iDot >= 0 && name.length() > iDot) { name = name.substring(iDot + 1); } - if (name.length() > maxName) + if (name.length() > maxName) { maxName = name.length(); } + } String maxNumString = String.valueOf(iThread + tlist.size()); int maxNumDigits = maxNumString.length(); for (int i = 0 ; i < tlist.size() ; i++) { @@ -616,7 +616,6 @@ int cnt = 1; if (t.hasMoreTokens()) { String idToken = t.nextToken(); - int n; try { cnt = Integer.valueOf(idToken).intValue(); } catch (NumberFormatException e) { @@ -885,7 +884,6 @@ } private void commandStop(StringTokenizer t) throws NoSessionException { - Location bploc; String token; if (!t.hasMoreTokens()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java Sat May 14 11:52:15 2011 -0700 @@ -40,6 +40,8 @@ public class CommandTool extends JPanel { + private static final long serialVersionUID = 8613516856378346415L; + private Environment env; private ContextManager context; @@ -68,6 +70,7 @@ // Establish handler for incoming commands. script.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(script.readln()); } @@ -107,15 +110,17 @@ // JDIListener + @Override public void accessWatchpoint(AccessWatchpointEventSet e) { setThread(e); for (EventIterator it = e.eventIterator(); it.hasNext(); ) { - Event evt = it.nextEvent(); + it.nextEvent(); diagnostics.putString("Watchpoint hit: " + locationString(e)); } } + @Override public void classPrepare(ClassPrepareEventSet e) { if (context.getVerboseFlag()) { String name = e.getReferenceType().name(); @@ -123,6 +128,7 @@ } } + @Override public void classUnload(ClassUnloadEventSet e) { if (context.getVerboseFlag()) { diagnostics.putString("Class " + e.getClassName() + @@ -130,12 +136,14 @@ } } + @Override public void exception(ExceptionEventSet e) { setThread(e); String name = e.getException().referenceType().name(); diagnostics.putString("Exception: " + name); } + @Override public void locationTrigger(LocationTriggerEventSet e) { String locString = locationString(e); setThread(e); @@ -155,15 +163,17 @@ } } + @Override public void modificationWatchpoint(ModificationWatchpointEventSet e) { setThread(e); for (EventIterator it = e.eventIterator(); it.hasNext(); ) { - Event evt = it.nextEvent(); + it.nextEvent(); diagnostics.putString("Watchpoint hit: " + locationString(e)); } } + @Override public void threadDeath(ThreadDeathEventSet e) { if (context.getVerboseFlag()) { diagnostics.putString("Thread " + e.getThread() + @@ -171,6 +181,7 @@ } } + @Override public void threadStart(ThreadStartEventSet e) { if (context.getVerboseFlag()) { diagnostics.putString("Thread " + e.getThread() + @@ -178,16 +189,19 @@ } } + @Override public void vmDeath(VMDeathEventSet e) { script.setPrompt(DEFAULT_CMD_PROMPT); diagnostics.putString("VM exited"); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { script.setPrompt(DEFAULT_CMD_PROMPT); diagnostics.putString("Disconnected from VM"); } + @Override public void vmStart(VMStartEventSet e) { script.setPrompt(DEFAULT_CMD_PROMPT); diagnostics.putString("VM started"); @@ -195,14 +209,17 @@ // SessionListener + @Override public void sessionStart(EventObject e) {} + @Override public void sessionInterrupt(EventObject e) { Thread.yield(); // fetch output diagnostics.putString("VM interrupted by user."); script.setPrompt(DEFAULT_CMD_PROMPT); } + @Override public void sessionContinue(EventObject e) { diagnostics.putString("Execution resumed."); script.setPrompt(DEFAULT_CMD_PROMPT); @@ -210,23 +227,28 @@ // SpecListener + @Override public void breakpointSet(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint set at " + spec + "."); } + @Override public void breakpointDeferred(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint will be set at " + spec + " when its class is loaded."); } + @Override public void breakpointDeleted(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint at " + spec.toString() + " deleted."); } + @Override public void breakpointResolved(SpecEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Breakpoint resolved to " + spec.toString() + "."); } + @Override public void breakpointError(SpecErrorEvent e) { EventRequestSpec spec = e.getEventRequestSpec(); diagnostics.putString("Deferred breakpoint at " + @@ -236,25 +258,35 @@ //### Add info for watchpoints and exceptions + @Override public void watchpointSet(SpecEvent e) { } + @Override public void watchpointDeferred(SpecEvent e) { } + @Override public void watchpointDeleted(SpecEvent e) { } + @Override public void watchpointResolved(SpecEvent e) { } + @Override public void watchpointError(SpecErrorEvent e) { } + @Override public void exceptionInterceptSet(SpecEvent e) { } + @Override public void exceptionInterceptDeferred(SpecEvent e) { } + @Override public void exceptionInterceptDeleted(SpecEvent e) { } + @Override public void exceptionInterceptResolved(SpecEvent e) { } + @Override public void exceptionInterceptError(SpecErrorEvent e) { } @@ -263,6 +295,7 @@ // If the user selects a new current thread or frame, update prompt. + @Override public void currentFrameChanged(CurrentFrameChangedEvent e) { // Update prompt only if affect thread is current. ThreadReference thread = e.getThread(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Sat May 14 11:52:15 2011 -0700 @@ -46,7 +46,7 @@ private boolean verbose; - private Vector<ContextListener> contextListeners = new Vector<ContextListener>(); + private ArrayList<ContextListener> contextListeners = new ArrayList<ContextListener>(); public ContextManager(Environment env) { classManager = env.getClassManager(); @@ -264,11 +264,11 @@ private void notifyCurrentFrameChanged(ThreadInfo tinfo, int index, boolean invalidate) { - Vector l = (Vector)contextListeners.clone(); + ArrayList<ContextListener> l = new ArrayList<ContextListener>(contextListeners); CurrentFrameChangedEvent evt = new CurrentFrameChangedEvent(this, tinfo, index, invalidate); for (int i = 0; i < l.size(); i++) { - ((ContextListener)l.elementAt(i)).currentFrameChanged(evt); + l.get(i).currentFrameChanged(evt); } } @@ -277,28 +277,34 @@ // SessionListener + @Override public void sessionStart(EventObject e) { invalidateCurrentThread(); } + @Override public void sessionInterrupt(EventObject e) { setCurrentThreadInvalidate(currentThread); } + @Override public void sessionContinue(EventObject e) { invalidateCurrentThread(); } // JDIListener + @Override public void locationTrigger(LocationTriggerEventSet e) { setCurrentThreadInvalidate(e.getThread()); } + @Override public void exception(ExceptionEventSet e) { setCurrentThreadInvalidate(e.getThread()); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { invalidateCurrentThread(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java Sat May 14 11:52:15 2011 -0700 @@ -31,6 +31,7 @@ public class CurrentFrameChangedEvent extends EventObject { + private static final long serialVersionUID = 4214479486546762179L; private ThreadInfo tinfo; private int index; private boolean invalidate; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java Sat May 14 11:52:15 2011 -0700 @@ -26,8 +26,6 @@ package com.sun.tools.example.debug.gui; import java.io.*; -import java.util.*; - import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java Sat May 14 11:52:15 2011 -0700 @@ -26,8 +26,6 @@ package com.sun.tools.example.debug.gui; import java.io.*; -import java.util.*; - import javax.swing.*; import javax.swing.border.*; import java.awt.*; @@ -38,6 +36,7 @@ public class GUI extends JPanel { + private static final long serialVersionUID = 3292463234530679091L; private CommandTool cmdTool; private ApplicationTool appTool; //###HACK## @@ -87,7 +86,7 @@ threadTreeTool = new ThreadTreeTool(env); threadTreeTool.setPreferredSize(new java.awt.Dimension(200, 450)); - JTabbedPane treePane = new JTabbedPane(JTabbedPane.BOTTOM); + JTabbedPane treePane = new JTabbedPane(SwingConstants.BOTTOM); treePane.addTab("Source", null, sourceTreeTool); treePane.addTab("Classes", null, classTreeTool); treePane.addTab("Threads", null, threadTreeTool); @@ -139,12 +138,9 @@ } public static void main(String argv[]) { - String remote = null; String clsName = ""; String progArgs = ""; String javaArgs = ""; - boolean verbose = false; //### Not implemented. - final Environment env = new Environment(); JPanel mainPanel = new GUI(env); @@ -246,13 +242,14 @@ frame.setContentPane(mainPanel); frame.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { env.terminate(); } }); frame.pack(); - frame.show(); + frame.setVisible(true); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Sat May 14 11:52:15 2011 -0700 @@ -28,7 +28,6 @@ import java.io.File; import java.util.Hashtable; import java.util.Enumeration; -import javax.swing.*; import javax.swing.filechooser.*; //### Renamed from 'ExampleFileFilter.java' provided with Swing demos. @@ -93,8 +92,12 @@ */ public JDBFileFilter(String extension, String description) { this(); - if(extension!=null) addExtension(extension); - if(description!=null) setDescription(description); + if(extension!=null) { + addExtension(extension); + } + if(description!=null) { + setDescription(description); + } } /** @@ -120,11 +123,13 @@ */ public JDBFileFilter(String[] filters, String description) { this(); - for (int i = 0; i < filters.length; i++) { + for (String filter : filters) { // add filters one by one - addExtension(filters[i]); + addExtension(filter); } - if(description!=null) setDescription(description); + if(description!=null) { + setDescription(description); + } } /** @@ -136,6 +141,7 @@ * @see #getExtension * @see FileFilter#accepts */ + @Override public boolean accept(File f) { if(f != null) { if(f.isDirectory()) { @@ -196,6 +202,7 @@ * @see isExtensionListInDescription * @see FileFilter#getDescription */ + @Override public String getDescription() { if(fullDescription == null) { if(description == null || isExtensionListInDescription()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java Sat May 14 11:52:15 2011 -0700 @@ -31,7 +31,6 @@ import java.util.Vector; import java.util.List; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; //### This is currently just a placeholder! @@ -57,6 +56,7 @@ JMenuItem openItem = new JMenuItem("Open...", 'O'); openItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { openCommand(); } @@ -93,6 +93,7 @@ JMenuItem monitorItem = new JMenuItem("Monitor Expression...", 'M'); monitorItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { monitorCommand(); } @@ -101,6 +102,7 @@ JMenuItem unmonitorItem = new JMenuItem("Unmonitor Expression..."); unmonitorItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { unmonitorCommand(); } @@ -110,6 +112,7 @@ JMenu breakpointMenu = new JMenu("Breakpoint"); JMenuItem stopItem = new JMenuItem("Stop in...", 'S'); stopItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { buildBreakpoint(); } @@ -176,6 +179,7 @@ mi.setToolTipText(toolTip); final String cmd = command; mi.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(cmd); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java Sat May 14 11:52:15 2011 -0700 @@ -26,10 +26,8 @@ package com.sun.tools.example.debug.gui; import javax.swing.*; -import java.awt.*; import java.awt.event.*; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; class JDBToolBar extends JToolBar { @@ -92,6 +90,7 @@ button.setToolTipText(toolTip); final String cmd = command; button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(cmd); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Sat May 14 11:52:15 2011 -0700 @@ -29,18 +29,10 @@ import java.util.ArrayList; import java.util.Map; import java.util.HashMap; -import java.util.Iterator; - -import java.io.IOException; - import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Container; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.TitledBorder; @@ -98,6 +90,7 @@ comp.add(panel); } + @Override String getText() { return textField.getText(); } @@ -114,6 +107,7 @@ comp.add(panel); } + @Override String getText() { return ((Connector.BooleanArgument)arg) .stringValueOf(check.getModel().isSelected()); @@ -147,6 +141,7 @@ final boolean[] oked = {false}; JPanel buttonPanel = okCancel( dialog, new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { if (radioGroup.getSelection() == null) { JOptionPane.showMessageDialog(dialog, @@ -162,7 +157,7 @@ } ); content.add(BorderLayout.SOUTH, buttonPanel); dialog.pack(); - dialog.show(); + dialog.setVisible(true); return oked[0] ? modelToConnector.get(radioGroup.getSelection()) : @@ -178,7 +173,7 @@ Container content = dialog.getContentPane(); JPanel guts = new JPanel(); Border etched = BorderFactory.createEtchedBorder(); - Border titled = BorderFactory.createTitledBorder(etched, + BorderFactory.createTitledBorder(etched, connector.description(), TitledBorder.LEFT, TitledBorder.TOP); guts.setBorder(etched); @@ -199,6 +194,7 @@ content.add(guts); JPanel buttonPanel = okCancel( dialog, new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { for (ArgRep ar : argReps) { if (!ar.isSpecified()) { @@ -236,7 +232,7 @@ } ); content.add(BorderLayout.SOUTH, buttonPanel); dialog.pack(); - dialog.show(); + dialog.setVisible(true); } private JPanel okCancel(final JDialog dialog, ActionListener okListener) { @@ -247,6 +243,7 @@ buttonPanel.add(cancel); ok.addActionListener(okListener); cancel.addActionListener( new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { dialog.setVisible(false); dialog.dispose(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java Sat May 14 11:52:15 2011 -0700 @@ -42,10 +42,12 @@ //### remove listeners on exit! } + @Override public Object getElementAt(int index) { return monitors.get(index); } + @Override public int getSize() { return monitors.size(); } @@ -70,7 +72,7 @@ return Collections.unmodifiableList(monitors); } - public Iterator iterator() { + public Iterator<?> iterator() { return monitors().iterator(); } @@ -80,7 +82,8 @@ private class MonitorListListener implements ContextListener { - public void currentFrameChanged(CurrentFrameChangedEvent e) { + @Override + public void currentFrameChanged(final CurrentFrameChangedEvent e) { invalidate(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,9 @@ package com.sun.tools.example.debug.gui; -import java.io.*; -import java.util.*; - import javax.swing.*; -import javax.swing.tree.*; import javax.swing.event.*; import java.awt.*; -import java.awt.event.*; - import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; import com.sun.tools.example.debug.expr.ExpressionParser; @@ -41,6 +35,7 @@ public class MonitorTool extends JPanel { + private static final long serialVersionUID = -645235951031726647L; private ExecutionManager runtime; private ContextManager context; @@ -64,6 +59,7 @@ } private class MonitorToolListener implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { int index = list.getSelectedIndex(); if (index != -1) { @@ -78,6 +74,7 @@ IncompatibleThreadStateException { ExpressionParser.GetFrame frameGetter = new ExpressionParser.GetFrame() { + @Override public StackFrame get() throws IncompatibleThreadStateException { @@ -93,6 +90,7 @@ private class MonitorRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Sat May 14 11:52:15 2011 -0700 @@ -58,8 +58,8 @@ } public File resolve(String relativeFileName) { - for (int i = 0; i < pathArray.length; i++) { - File path = new File(pathArray[i], relativeFileName); + for (String element : pathArray) { + File path = new File(element, relativeFileName); if (path.exists()) { return path; } @@ -76,8 +76,8 @@ // classpath is retained. This is the one that will be // found if we later do a 'resolve'. SortedSet<String> s = new TreeSet<String>(); // sorted, no duplicates - for (int i = 0; i < pathArray.length; i++) { - File path = new File(pathArray[i], relativeDirName); + for (String element : pathArray) { + File path = new File(element, relativeDirName); if (path.exists()) { String[] childArray = path.list(filter); if (childArray != null) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java Sat May 14 11:52:15 2011 -0700 @@ -25,22 +25,25 @@ package com.sun.tools.example.debug.gui; -import javax.swing.*; import javax.swing.tree.*; public class SingleLeafTreeSelectionModel extends DefaultTreeSelectionModel { + private static final long serialVersionUID = -7849105107888117679L; + SingleLeafTreeSelectionModel() { super(); selectionMode = SINGLE_TREE_SELECTION; } + @Override public void setSelectionPath(TreePath path) { if(((TreeNode)(path.getLastPathComponent())).isLeaf()) { super.setSelectionPath(path); } } + @Override public void setSelectionPaths(TreePath[] paths) { // Only look at first path, as all others will be // ignored anyway in single tree selection mode. @@ -49,12 +52,14 @@ } } + @Override public void addSelectionPath(TreePath path) { if(((TreeNode)(path.getLastPathComponent())).isLeaf()) { super.setSelectionPath(path); } } + @Override public void addSelectionPaths(TreePath[] paths) { // Only look at first path, as all others will be // ignored anyway in single tree selection mode. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Sat May 14 11:52:15 2011 -0700 @@ -31,7 +31,6 @@ import com.sun.jdi.*; import com.sun.tools.example.debug.event.*; -import com.sun.tools.example.debug.bdi.*; /** * Manage the list of source files. @@ -45,7 +44,7 @@ private List<SourceModel> sourceList; private SearchPath sourcePath; - private Vector<SourceListener> sourceListeners = new Vector<SourceListener>(); + private ArrayList<SourceListener> sourceListeners = new ArrayList<SourceListener>(); private Map<ReferenceType, SourceModel> classToSource = new HashMap<ReferenceType, SourceModel>(); @@ -79,18 +78,18 @@ } public void addSourceListener(SourceListener l) { - sourceListeners.addElement(l); + sourceListeners.add(l); } public void removeSourceListener(SourceListener l) { - sourceListeners.removeElement(l); + sourceListeners.remove(l); } private void notifySourcepathChanged() { - Vector l = (Vector)sourceListeners.clone(); + ArrayList<SourceListener> l = new ArrayList<SourceListener>(sourceListeners); SourcepathChangedEvent evt = new SourcepathChangedEvent(this); for (int i = 0; i < l.size(); i++) { - ((SourceListener)l.elementAt(i)).sourcepathChanged(evt); + l.get(i).sourcepathChanged(evt); } } @@ -163,6 +162,7 @@ private class SMClassListener extends JDIAdapter implements JDIListener { + @Override public void classPrepare(ClassPrepareEventSet e) { ReferenceType refType = e.getReferenceType(); SourceModel sm = sourceForClass(refType); @@ -171,6 +171,7 @@ } } + @Override public void classUnload(ClassUnloadEventSet e) { //### iterate through looking for (e.getTypeName()). //### then remove it. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Sat May 14 11:52:15 2011 -0700 @@ -31,8 +31,6 @@ import com.sun.jdi.*; import com.sun.jdi.request.*; -import com.sun.tools.example.debug.bdi.*; - import javax.swing.*; /** @@ -101,6 +99,7 @@ // **** Implement ListModel ***** + @Override public Object getElementAt(int index) { if (sourceLines == null) { initialize(); @@ -108,6 +107,7 @@ return sourceLines.get(index); } + @Override public int getSize() { if (sourceLines == null) { initialize(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java Sat May 14 11:52:15 2011 -0700 @@ -26,8 +26,6 @@ package com.sun.tools.example.debug.gui; import java.io.*; -import java.util.*; - import java.awt.*; import java.awt.event.*; import javax.swing.*; @@ -35,12 +33,11 @@ import com.sun.jdi.*; import com.sun.jdi.request.*; -import com.sun.tools.example.debug.event.*; import com.sun.tools.example.debug.bdi.*; -import java.util.List; +public class SourceTool extends JPanel { -public class SourceTool extends JPanel { + private static final long serialVersionUID = -5461299294186395257L; private Environment env; @@ -99,6 +96,7 @@ // ContextListener + @Override public void currentFrameChanged(CurrentFrameChangedEvent e) { showSourceContext(e.getThread(), e.getIndex()); } @@ -108,6 +106,7 @@ // SourceListener + @Override public void sourcepathChanged(SourcepathChangedEvent e) { // Reload source view if its contents depend // on the source path. @@ -120,12 +119,15 @@ // SpecListener + @Override public void breakpointSet(SpecEvent e) { breakpointResolved(e); } + @Override public void breakpointDeferred(SpecEvent e) { } + @Override public void breakpointDeleted(SpecEvent e) { BreakpointRequest req = (BreakpointRequest)e.getEventRequest(); Location loc = req.location(); @@ -139,6 +141,7 @@ } } + @Override public void breakpointResolved(SpecEvent e) { BreakpointRequest req = (BreakpointRequest)e.getEventRequest(); Location loc = req.location(); @@ -150,29 +153,40 @@ } } + @Override public void breakpointError(SpecErrorEvent e) { breakpointDeleted(e); } + @Override public void watchpointSet(SpecEvent e) { } + @Override public void watchpointDeferred(SpecEvent e) { } + @Override public void watchpointDeleted(SpecEvent e) { } + @Override public void watchpointResolved(SpecEvent e) { } + @Override public void watchpointError(SpecErrorEvent e) { } + @Override public void exceptionInterceptSet(SpecEvent e) { } + @Override public void exceptionInterceptDeferred(SpecEvent e) { } + @Override public void exceptionInterceptDeleted(SpecEvent e) { } + @Override public void exceptionInterceptResolved(SpecEvent e) { } + @Override public void exceptionInterceptError(SpecErrorEvent e) { } } @@ -269,6 +283,7 @@ private class SourceLineRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, @@ -301,6 +316,7 @@ return this; } + @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); return new Dimension(dim.width, dim.height-5); @@ -309,6 +325,7 @@ } private class STMouseListener extends MouseAdapter implements MouseListener { + @Override public void mousePressed(MouseEvent e) { if (e.isPopupTrigger()) { showPopupMenu((Component)e.getSource(), @@ -316,6 +333,7 @@ } } + @Override public void mouseReleased(MouseEvent e) { if (e.isPopupTrigger()) { showPopupMenu((Component)e.getSource(), @@ -354,6 +372,7 @@ private JMenuItem commandItem(String label, final String cmd) { JMenuItem item = new JMenuItem(label); item.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { interpreter.executeCommand(cmd); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java Sat May 14 11:52:15 2011 -0700 @@ -30,15 +30,15 @@ import javax.swing.*; import javax.swing.tree.*; -import javax.swing.event.*; import java.awt.*; import java.awt.event.*; -import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; public class SourceTreeTool extends JPanel { + private static final long serialVersionUID = 3336680912107956419L; + private Environment env; private ExecutionManager runtime; @@ -81,6 +81,7 @@ ******/ MouseListener ml = new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); @@ -112,6 +113,7 @@ private class SourceTreeToolListener implements SourceListener { + @Override public void sourcepathChanged(SourcepathChangedEvent e) { sourcePath = sourceManager.getSourcePath(); root = createDirectoryTree(HEADING); @@ -121,6 +123,7 @@ } private static class SourceOrDirectoryFilter implements FilenameFilter { + @Override public boolean accept(File dir, String name) { return (name.endsWith(".java") || new File(dir, name).isDirectory()); @@ -158,6 +161,7 @@ this.isDirectory = isDirectory; } + @Override public String toString() { return name; } @@ -195,6 +199,7 @@ * Returns the child <code>TreeNode</code> at index * <code>childIndex</code>. */ + @Override public TreeNode getChildAt(int childIndex) { expandIfNeeded(); return children[childIndex]; @@ -204,6 +209,7 @@ * Returns the number of children <code>TreeNode</code>s the receiver * contains. */ + @Override public int getChildCount() { expandIfNeeded(); return children.length; @@ -212,6 +218,7 @@ /** * Returns the parent <code>TreeNode</code> of the receiver. */ + @Override public TreeNode getParent() { return parent; } @@ -221,18 +228,21 @@ * If the receiver does not contain <code>node</code>, -1 will be * returned. */ + @Override public int getIndex(TreeNode node) { expandIfNeeded(); for (int i = 0; i < children.length; i++) { - if (children[i] == node) + if (children[i] == node) { return i; } + } return -1; } /** * Returns true if the receiver allows children. */ + @Override public boolean getAllowsChildren() { return isDirectory; } @@ -240,6 +250,7 @@ /** * Returns true if the receiver is a leaf. */ + @Override public boolean isLeaf() { expandIfNeeded(); return !isDirectory; @@ -248,13 +259,16 @@ /** * Returns the children of the receiver as an Enumeration. */ + @Override public Enumeration children() { expandIfNeeded(); return new Enumeration() { int i = 0; + @Override public boolean hasMoreElements() { return (i < children.length); } + @Override public Object nextElement() throws NoSuchElementException { if (i >= children.length) { throw new NoSuchElementException(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java Sat May 14 11:52:15 2011 -0700 @@ -29,6 +29,8 @@ public class SourcepathChangedEvent extends EventObject { + private static final long serialVersionUID = 8762169481005804121L; + public SourcepathChangedEvent(Object source) { super(source); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,21 +25,16 @@ package com.sun.tools.example.debug.gui; -import java.io.*; -import java.util.*; -import java.util.List; // Must import explicitly due to conflict with javax.awt.List - import javax.swing.*; -import javax.swing.tree.*; import javax.swing.event.*; import java.awt.*; -import java.awt.event.*; - import com.sun.jdi.*; import com.sun.tools.example.debug.bdi.*; public class StackTraceTool extends JPanel { + private static final long serialVersionUID = 9140041989427965718L; + private Environment env; private ExecutionManager runtime; @@ -85,6 +80,7 @@ //### I suspect we handle the case badly that the VM is not interrupted. + @Override public void currentFrameChanged(CurrentFrameChangedEvent e) { // If the current frame of the thread appearing in this // view is changed, move the selection to track it. @@ -103,6 +99,7 @@ // ListSelectionListener + @Override public void valueChanged(ListSelectionEvent e) { int index = list.getSelectedIndex(); if (index != -1) { @@ -117,6 +114,7 @@ private class StackFrameRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, @@ -174,6 +172,7 @@ this.tinfo = tinfo; } + @Override public Object getElementAt(int index) { try { return tinfo == null? null : tinfo.getFrame(index); @@ -186,6 +185,7 @@ } } + @Override public int getSize() { try { return tinfo == null? 1 : tinfo.getFrameCount(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Sat May 14 11:52:15 2011 -0700 @@ -25,13 +25,11 @@ package com.sun.tools.example.debug.gui; -import java.io.*; import java.util.*; import java.util.List; // Must import explicitly due to conflict with javax.awt.List import javax.swing.*; import javax.swing.tree.*; -import javax.swing.event.*; import java.awt.*; import java.awt.event.*; @@ -45,6 +43,8 @@ public class ThreadTreeTool extends JPanel { + private static final long serialVersionUID = 4168599992853038878L; + private Environment env; private ExecutionManager runtime; @@ -79,6 +79,7 @@ tree.setSelectionModel(new SingleLeafTreeSelectionModel()); MouseListener ml = new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); TreePath selPath = tree.getPathForLocation(e.getX(), e.getY()); @@ -131,6 +132,7 @@ // SessionListener + @Override public void sessionStart(EventObject e) { try { for (ThreadReference thread : runtime.allThreads()) { @@ -143,20 +145,25 @@ } } + @Override public void sessionInterrupt(EventObject e) {} + @Override public void sessionContinue(EventObject e) {} // JDIListener + @Override public void threadStart(ThreadStartEventSet e) { root.addThread(e.getThread()); } + @Override public void threadDeath(ThreadDeathEventSet e) { root.removeThread(e.getThread()); } + @Override public void vmDisconnect(VMDisconnectEventSet e) { // Clear the contents of this view. root = createThreadTree(HEADING); @@ -193,6 +200,7 @@ } } + @Override public String toString() { return description; } @@ -213,6 +221,7 @@ return (thread == null); } + @Override public boolean isLeaf() { return !isThreadGroup(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java Sat May 14 11:52:15 2011 -0700 @@ -28,10 +28,10 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -import javax.swing.border.*; public class TypeScript extends JPanel { + private static final long serialVersionUID = -983704841363534885L; private JTextArea history; private JTextField entry; @@ -41,7 +41,6 @@ private JScrollBar historyHScrollBar; private boolean echoInput = false; - private boolean nlPending = false; private static String newline = System.getProperty("line.separator"); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java Sat May 14 11:52:15 2011 -0700 @@ -25,7 +25,6 @@ package com.sun.tools.example.debug.gui; -import javax.swing.*; import com.sun.tools.example.debug.bdi.OutputListener; public class TypeScriptOutputListener implements OutputListener { @@ -42,10 +41,12 @@ this.appendNewline = appendNewline; } + @Override public void putString(String s) { script.append(s); - if (appendNewline) + if (appendNewline) { script.newline(); } + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java Sat May 14 11:52:15 2011 -0700 @@ -35,14 +35,17 @@ this.script = script; } + @Override public void write(char[] cbuf, int off, int len) throws IOException { script.append(String.valueOf(cbuf, off, len)); } + @Override public void flush() { script.flush(); } + @Override public void close() { script.flush(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -38,6 +38,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) throws NoSuchFieldException { Field field = refType.fieldByName(fieldId); @@ -48,6 +49,7 @@ return wp; } + @Override public String toString() { return MessageOutput.format("watch accesses of", new Object [] {refSpec.toString(), diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class AmbiguousMethodException extends Exception { + private static final long serialVersionUID = -5372629264936918654L; + public AmbiguousMethodException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Iterator; class BreakpointSpec extends EventRequestSpec { String methodId; @@ -58,6 +57,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) throws AmbiguousMethodException, AbsentInformationException, @@ -91,12 +91,14 @@ return (methodId != null); } + @Override public int hashCode() { return refSpec.hashCode() + lineNumber + ((methodId != null) ? methodId.hashCode() : 0) + ((methodArgs != null) ? methodArgs.hashCode() : 0); } + @Override public boolean equals(Object obj) { if (obj instanceof BreakpointSpec) { BreakpointSpec breakpoint = (BreakpointSpec)obj; @@ -114,6 +116,7 @@ } } + @Override String errorMessageFor(Exception e) { if (e instanceof AmbiguousMethodException) { return (MessageOutput.format("Method is overloaded; specify arguments", @@ -140,6 +143,7 @@ } } + @Override public String toString() { StringBuffer buffer = new StringBuffer(refSpec.toString()); if (isMethodBreakpoint()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Sat May 14 11:52:15 2011 -0700 @@ -51,6 +51,7 @@ final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo(); final int stackFrame = threadInfo == null? 0 : threadInfo.getCurrentFrameIndex(); Thread thread = new Thread("asynchronous jdb command") { + @Override public void run() { try { action(); @@ -95,6 +96,7 @@ final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo(); if ((threadInfo != null) && (threadInfo.getCurrentFrame() != null)) { frameGetter = new ExpressionParser.GetFrame() { + @Override public StackFrame get() throws IncompatibleThreadStateException { return threadInfo.getCurrentFrame(); } @@ -224,7 +226,6 @@ } void commandClass(StringTokenizer t) { - List<ReferenceType> list = Env.vm().allClasses(); if (!t.hasMoreTokens()) { MessageOutput.println("No class specified."); @@ -709,6 +710,7 @@ void doKillThread(final ThreadReference threadToKill, final StringTokenizer tokenizer) { new AsyncExecution() { + @Override void action() { doKill(threadToKill, tokenizer); } @@ -1118,7 +1120,6 @@ } void commandStop(StringTokenizer t) { - Location bploc; String atIn; byte suspendPolicy = EventRequest.SUSPEND_ALL; @@ -1665,6 +1666,7 @@ void commandPrint(final StringTokenizer t, final boolean dumpObject) { new AsyncExecution() { + @Override void action() { doPrint(t, dumpObject); } @@ -1734,6 +1736,7 @@ void commandLock(final StringTokenizer t) { new AsyncExecution() { + @Override void action() { doLock(t); } @@ -1809,6 +1812,7 @@ void commandDisableGC(final StringTokenizer t) { new AsyncExecution() { + @Override void action() { doDisableGC(t); } @@ -1837,6 +1841,7 @@ void commandEnableGC(final StringTokenizer t) { new AsyncExecution() { + @Override void action() { doEnableGC(t); } @@ -1892,6 +1897,7 @@ } } else { new AsyncExecution() { + @Override void action() { doSave(t); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Sat May 14 11:52:15 2011 -0700 @@ -29,7 +29,6 @@ import com.sun.jdi.request.StepRequest; import com.sun.jdi.request.MethodEntryRequest; import com.sun.jdi.request.MethodExitRequest; -import com.sun.tools.jdi.*; import java.util.*; import java.io.*; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Sat May 14 11:52:15 2011 -0700 @@ -27,14 +27,8 @@ import com.sun.jdi.*; import com.sun.jdi.event.*; -import com.sun.jdi.request.EventRequestManager; import com.sun.jdi.request.EventRequest; -import java.io.PrintStream; -import java.util.StringTokenizer; -import java.util.Collection; -import java.util.Iterator; - public class EventHandler implements Runnable { EventNotifier notifier; @@ -59,6 +53,7 @@ } } + @Override public void run() { EventQueue queue = Env.vm().eventQueue(); while (connected) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Sat May 14 11:52:15 2011 -0700 @@ -30,9 +30,7 @@ import com.sun.jdi.request.ExceptionRequest; import com.sun.jdi.request.ClassPrepareRequest; import com.sun.jdi.event.ClassPrepareEvent; -import java.util.List; import java.util.ArrayList; -import java.util.Iterator; abstract class EventRequestSpec { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Sat May 14 11:52:15 2011 -0700 @@ -25,15 +25,12 @@ package com.sun.tools.example.debug.tty; -import com.sun.jdi.*; import com.sun.jdi.request.EventRequest; import com.sun.jdi.event.ClassPrepareEvent; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; -import java.util.StringTokenizer; class EventRequestSpecList { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java Sat May 14 11:52:15 2011 -0700 @@ -28,10 +28,6 @@ import com.sun.jdi.ReferenceType; import com.sun.jdi.request.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Iterator; - class ExceptionSpec extends EventRequestSpec { private boolean notifyCaught; private boolean notifyUncaught; @@ -51,6 +47,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) { EventRequestManager em = refType.virtualMachine().eventRequestManager(); ExceptionRequest excReq = em.createExceptionRequest(refType, @@ -68,6 +65,7 @@ return notifyUncaught; } + @Override public int hashCode() { //Reference: Effective Java[tm] (Bloch, 2001), Item 8 int result = 17; @@ -77,6 +75,7 @@ return result; } + @Override public boolean equals(Object obj) { if (obj instanceof ExceptionSpec) { ExceptionSpec es = (ExceptionSpec)obj; @@ -90,6 +89,7 @@ return false; } + @Override public String toString() { String s; if (notifyCaught && !notifyUncaught) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class LineNotFoundException extends Exception { + private static final long serialVersionUID = 3748297722519448995L; + public LineNotFoundException() { super(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,8 @@ package com.sun.tools.example.debug.tty; class MalformedMemberNameException extends Exception { + private static final long serialVersionUID = 7759071468833196630L; + public MalformedMemberNameException() { super(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -38,6 +38,7 @@ /** * The 'refType' is known to match, return the EventRequest. */ + @Override EventRequest resolveEventRequest(ReferenceType refType) throws NoSuchFieldException { Field field = refType.fieldByName(fieldId); @@ -48,6 +49,7 @@ return wp; } + @Override public String toString() { return MessageOutput.format("watch modification of", new Object [] {refSpec.toString(), diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -55,6 +55,7 @@ /** * Does the specified ReferenceType match this spec. */ + @Override public boolean matches(ReferenceType refType) { if (classId.startsWith("*")) { return refType.name().endsWith(stem); @@ -65,6 +66,7 @@ } } + @Override public ClassPrepareRequest createPrepareRequest() { ClassPrepareRequest request = Env.vm().eventRequestManager().createClassPrepareRequest(); @@ -73,10 +75,12 @@ return request; } + @Override public int hashCode() { return classId.hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof PatternReferenceTypeSpec) { PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj; @@ -125,6 +129,7 @@ return true; } + @Override public String toString() { return classId; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java Sat May 14 11:52:15 2011 -0700 @@ -35,7 +35,9 @@ boolean matches(ReferenceType refType); ClassPrepareRequest createPrepareRequest(); + @Override int hashCode(); + @Override boolean equals(Object obj); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Sat May 14 11:52:15 2011 -0700 @@ -27,11 +27,8 @@ import com.sun.jdi.Location; import com.sun.jdi.AbsentInformationException; -import java.util.Map; -import java.util.HashMap; import java.util.List; import java.util.ArrayList; -import java.util.Iterator; import java.util.StringTokenizer; import java.io.*; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Sat May 14 11:52:15 2011 -0700 @@ -47,34 +47,43 @@ */ private static final String progname = "jdb"; + @Override public void vmStartEvent(VMStartEvent se) { Thread.yield(); // fetch output MessageOutput.lnprint("VM Started:"); } + @Override public void vmDeathEvent(VMDeathEvent e) { } + @Override public void vmDisconnectEvent(VMDisconnectEvent e) { } + @Override public void threadStartEvent(ThreadStartEvent e) { } + @Override public void threadDeathEvent(ThreadDeathEvent e) { } + @Override public void classPrepareEvent(ClassPrepareEvent e) { } + @Override public void classUnloadEvent(ClassUnloadEvent e) { } + @Override public void breakpointEvent(BreakpointEvent be) { Thread.yield(); // fetch output MessageOutput.lnprint("Breakpoint hit:"); } + @Override public void fieldWatchEvent(WatchpointEvent fwe) { Field field = fwe.field(); ObjectReference obj = fwe.object(); @@ -90,11 +99,13 @@ } } + @Override public void stepEvent(StepEvent se) { Thread.yield(); // fetch output MessageOutput.lnprint("Step completed:"); } + @Override public void exceptionEvent(ExceptionEvent ee) { Thread.yield(); // fetch output Location catchLocation = ee.catchLocation(); @@ -108,6 +119,7 @@ } } + @Override public void methodEntryEvent(MethodEntryEvent me) { Thread.yield(); // fetch output /* @@ -125,6 +137,7 @@ } } + @Override public boolean methodExitEvent(MethodExitEvent me) { Thread.yield(); // fetch output /* @@ -173,6 +186,7 @@ return false; } + @Override public void vmInterrupted() { Thread.yield(); // fetch output printCurrentLocation(); @@ -184,6 +198,7 @@ MessageOutput.printPrompt(); } + @Override public void receivedEvent(Event event) { } @@ -317,18 +332,19 @@ // Adapted for use with String[][0]. int low = 0; int high = commandList.length - 1; - long i = 0; while (low <= high) { int mid = (low + high) >>> 1; String midVal = commandList[mid][0]; int compare = midVal.compareTo(key); - if (compare < 0) + if (compare < 0) { low = mid + 1; - else if (compare > 0) + } else if (compare > 0) { high = mid - 1; - else + } + else { return mid; // key found } + } return -(low + 1); // key not found. }; @@ -336,7 +352,9 @@ * Return true if the command is OK when disconnected. */ private boolean isDisconnectCmd(int ii) { - if (ii < 0 || ii >= commandList.length) return false; + if (ii < 0 || ii >= commandList.length) { + return false; + } return (commandList[ii][1].equals("y")); } @@ -344,7 +362,9 @@ * Return true if the command is OK when readonly. */ private boolean isReadOnlyCmd(int ii) { - if (ii < 0 || ii >= commandList.length) return false; + if (ii < 0 || ii >= commandList.length) { + return false; + } return (commandList[ii][2].equals("y")); }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ * * @return the contents of this <code>ResourceBundle</code>. */ + @Override public Object[][] getContents() { Object[][] temp = new Object[][] { // NOTE: The value strings in this file containing "{0}" are diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ * * @return the contents of this <code>ResourceBundle</code>. */ + @Override public Object[][] getContents() { Object[][] temp = new Object[][] { // NOTE: The value strings in this file containing "{0}" are diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ * * @return the contents of this <code>ResourceBundle</code>. */ + @Override public Object[][] getContents() { Object[][] temp = new Object[][] { // NOTE: The value strings in this file containing "{0}" are diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.example.debug.tty; import com.sun.jdi.ThreadGroupReference; -import com.sun.jdi.ThreadReference; import java.util.List; import java.util.Stack; import java.util.ArrayList; @@ -70,10 +69,12 @@ } } + @Override public boolean hasNext() { return !stack.isEmpty(); } + @Override public ThreadGroupReference next() { return nextThreadGroup(); } @@ -84,6 +85,7 @@ return tg; } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Sat May 14 11:52:15 2011 -0700 @@ -32,8 +32,6 @@ import java.util.List; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; -import java.io.*; class ThreadInfo { // This is a list of all known ThreadInfo objects. It survives diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Sat May 14 11:52:15 2011 -0700 @@ -46,6 +46,7 @@ tgi = new ThreadGroupIterator(); } + @Override public boolean hasNext() { while (it == null || !it.hasNext()) { if (!tgi.hasNext()) { @@ -56,6 +57,7 @@ return true; } + @Override public ThreadReference next() { return it.next(); } @@ -64,6 +66,7 @@ return next(); } + @Override public void remove() { throw new UnsupportedOperationException(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Sat May 14 11:52:15 2011 -0700 @@ -28,7 +28,6 @@ import com.sun.jdi.*; import com.sun.jdi.connect.*; import com.sun.jdi.request.EventRequestManager; -import com.sun.jdi.request.ExceptionRequest; import com.sun.jdi.request.ThreadStartRequest; import com.sun.jdi.request.ThreadDeathRequest; @@ -292,6 +291,7 @@ */ private void displayRemoteOutput(final InputStream stream) { Thread thr = new Thread("output reader") { + @Override public void run() { try { dumpStream(stream); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java Sat May 14 11:52:15 2011 -0700 @@ -27,6 +27,8 @@ public class VMNotConnectedException extends RuntimeException { + private static final long serialVersionUID = -7433430494903950165L; + public VMNotConnectedException() { super(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java Sat May 14 11:52:15 2011 -0700 @@ -25,8 +25,6 @@ package com.sun.tools.example.debug.tty; -import com.sun.jdi.*; - abstract class WatchpointSpec extends EventRequestSpec { final String fieldId; @@ -39,11 +37,13 @@ } } + @Override public int hashCode() { return refSpec.hashCode() + fieldId.hashCode() + getClass().hashCode(); } + @Override public boolean equals(Object obj) { if (obj instanceof WatchpointSpec) { WatchpointSpec watchpoint = (WatchpointSpec)obj; @@ -56,6 +56,7 @@ } } + @Override String errorMessageFor(Exception e) { if (e instanceof NoSuchFieldException) { return (MessageOutput.format("No field in", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java --- a/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java Sat May 14 11:52:15 2011 -0700 @@ -49,7 +49,8 @@ private boolean vmDied = true; // VMDeath occurred // Maps ThreadReference to ThreadTrace instances - private Map traceMap = new HashMap(); + private Map<ThreadReference, ThreadTrace> traceMap = + new HashMap<>(); EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); @@ -63,6 +64,7 @@ * As long as we are connected, get event sets off * the queue and dispatch the events within them. */ + @Override public void run() { EventQueue queue = vm.eventQueue(); while (connected) { @@ -208,7 +210,7 @@ * creating one if needed. */ ThreadTrace threadTrace(ThreadReference thread) { - ThreadTrace trace = (ThreadTrace)traceMap.get(thread); + ThreadTrace trace = traceMap.get(thread); if (trace == null) { trace = new ThreadTrace(thread); traceMap.put(thread, trace); @@ -297,7 +299,7 @@ } void threadDeathEvent(ThreadDeathEvent event) { - ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread()); + ThreadTrace trace = traceMap.get(event.thread()); if (trace != null) { // only want threads we care about trace.threadDeathEvent(event); // Forward event } @@ -309,9 +311,8 @@ */ private void classPrepareEvent(ClassPrepareEvent event) { EventRequestManager mgr = vm.eventRequestManager(); - List fields = event.referenceType().visibleFields(); - for (Iterator it = fields.iterator(); it.hasNext(); ) { - Field field = (Field)it.next(); + List<Field> fields = event.referenceType().visibleFields(); + for (Field field : fields) { ModificationWatchpointRequest req = mgr.createModificationWatchpointRequest(field); for (int i=0; i<excludes.length; ++i) { @@ -323,7 +324,7 @@ } private void exceptionEvent(ExceptionEvent event) { - ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread()); + ThreadTrace trace = traceMap.get(event.thread()); if (trace != null) { // only want threads we care about trace.exceptionEvent(event); // Forward event } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java --- a/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java Sat May 14 11:52:15 2011 -0700 @@ -56,6 +56,7 @@ /** * Copy. */ + @Override public void run() { try { char[] cbuf = new char[BUFFER_SIZE]; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/com/sun/tools/example/trace/Trace.java --- a/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Sat May 14 11:52:15 2011 -0700 @@ -31,7 +31,6 @@ import java.util.Map; import java.util.List; -import java.util.Iterator; import java.io.PrintWriter; import java.io.FileWriter; @@ -155,7 +154,8 @@ */ VirtualMachine launchTarget(String mainArgs) { LaunchingConnector connector = findLaunchingConnector(); - Map arguments = connectorArguments(connector, mainArgs); + Map<String, Connector.Argument> arguments = + connectorArguments(connector, mainArgs); try { return connector.launch(arguments); } catch (IOException exc) { @@ -186,10 +186,8 @@ * Find a com.sun.jdi.CommandLineLaunch connector */ LaunchingConnector findLaunchingConnector() { - List connectors = Bootstrap.virtualMachineManager().allConnectors(); - Iterator iter = connectors.iterator(); - while (iter.hasNext()) { - Connector connector = (Connector)iter.next(); + List<Connector> connectors = Bootstrap.virtualMachineManager().allConnectors(); + for (Connector connector : connectors) { if (connector.name().equals("com.sun.jdi.CommandLineLaunch")) { return (LaunchingConnector)connector; } @@ -200,8 +198,8 @@ /** * Return the launching connector's arguments. */ - Map connectorArguments(LaunchingConnector connector, String mainArgs) { - Map arguments = connector.defaultArguments(); + Map<String, Connector.Argument> connectorArguments(LaunchingConnector connector, String mainArgs) { + Map<String, Connector.Argument> arguments = connector.defaultArguments(); Connector.Argument mainArg = (Connector.Argument)arguments.get("main"); if (mainArg == null) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/awt/Component.java --- a/jdk/src/share/classes/java/awt/Component.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/awt/Component.java Sat May 14 11:52:15 2011 -0700 @@ -2945,6 +2945,46 @@ } /** + * Revalidates the component hierarchy up to the nearest validate root. + * + * This method first invalidates the component hierarchy starting from this + * component up to the nearest validate root. Afterwards, the component + * hierarchy is validated starting from the nearest validate root. + * + * This is a convenience method supposed to help application developers + * avoid looking for validate roots manually. Basically, it's equivalent to + * first calling the {@link #invalidate()} method on this component, and + * then calling the {@link #validate()} method on the nearest validate + * root. + * + * @see Container#isValidateRoot + * @since 1.7 + */ + public void revalidate() { + synchronized (getTreeLock()) { + invalidate(); + + Container root = getContainer(); + if (root == null) { + // There's no parents. Just validate itself. + validate(); + } else { + while (!root.isValidateRoot()) { + if (root.getContainer() == null) { + // If there's no validate roots, we'll validate the + // topmost container + break; + } + + root = root.getContainer(); + } + + root.validate(); + } + } + } + + /** * Creates a graphics context for this component. This method will * return <code>null</code> if this component is currently not * displayable. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/awt/GraphicsDevice.java --- a/jdk/src/share/classes/java/awt/GraphicsDevice.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java Sat May 14 11:52:15 2011 -0700 @@ -257,6 +257,11 @@ * 1.0f, and the background color alpha is set to 255 (completely opaque). * These values are not restored when returning to windowed mode. * + * It is unspecified and platform-dependent how decorated windows operate + * in full-screen mode. For this reason, it is recommended to turn off + * the decorations in a {@code Frame} or {@code Dialog} object by using the + * {@code setUndecorated} method. + * * When returning to windowed mode from an exclusive full-screen window, * any display changes made by calling {@code setDisplayMode} are * automatically restored to their original state. @@ -272,6 +277,8 @@ * @see #setDisplayMode * @see Component#enableInputMethods * @see Component#setVisible + * @see Frame#setUndecorated + * @see Dialog#setUndecorated * * @since 1.4 */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/awt/Toolkit.java --- a/jdk/src/share/classes/java/awt/Toolkit.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/awt/Toolkit.java Sat May 14 11:52:15 2011 -0700 @@ -1870,11 +1870,15 @@ /** * Adds the specified property change listener for the named desktop - * property. - * If pcl is null, no exception is thrown and no action is performed. + * property. When a {@link PropertyChangeListenerProxy} object is added, + * its property name is ignored, and the wrapped listener is added. + * If {@code name} is {@code null} or {@code pcl} is {@code null}, + * no exception is thrown and no action is performed. * * @param name The name of the property to listen for * @param pcl The property change listener + * @see PropertyChangeSupport#addPropertyChangeListener(String, + PropertyChangeListener) * @since 1.2 */ public void addPropertyChangeListener(String name, PropertyChangeListener pcl) { @@ -1883,11 +1887,16 @@ /** * Removes the specified property change listener for the named - * desktop property. - * If pcl is null, no exception is thrown and no action is performed. + * desktop property. When a {@link PropertyChangeListenerProxy} object + * is removed, its property name is ignored, and + * the wrapped listener is removed. + * If {@code name} is {@code null} or {@code pcl} is {@code null}, + * no exception is thrown and no action is performed. * * @param name The name of the property to remove * @param pcl The property change listener + * @see PropertyChangeSupport#removePropertyChangeListener(String, + PropertyChangeListener) * @since 1.2 */ public void removePropertyChangeListener(String name, PropertyChangeListener pcl) { @@ -1896,12 +1905,15 @@ /** * Returns an array of all the property change listeners - * registered on this toolkit. + * registered on this toolkit. The returned array + * contains {@code PropertyChangeListenerProxy} objects + * that associate listeners with the names of desktop properties. * - * @return all of this toolkit's <code>PropertyChangeListener</code>s - * or an empty array if no property change - * listeners are currently registered + * @return all of this toolkit's {@ code PropertyChangeListener} + * objects wrapped in {@code PropertyChangeListenerProxy} objects + * or an empty array if no listeners are added * + * @see PropertyChangeSupport#getPropertyChangeListeners() * @since 1.4 */ public PropertyChangeListener[] getPropertyChangeListeners() { @@ -1909,13 +1921,15 @@ } /** - * Returns an array of all the <code>PropertyChangeListener</code>s - * associated with the named property. + * Returns an array of all property change listeners + * associated with the specified name of a desktop property. * * @param propertyName the named property - * @return all of the <code>PropertyChangeListener</code>s associated with - * the named property or an empty array if no such listeners have - * been added + * @return all of the {@code PropertyChangeListener} objects + * associated with the specified name of a desktop property + * or an empty array if no such listeners are added + * + * @see PropertyChangeSupport#getPropertyChangeListeners(String) * @since 1.4 */ public PropertyChangeListener[] getPropertyChangeListeners(String propertyName) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java --- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,7 @@ import java.util.*; import java.lang.reflect.*; +import java.util.Objects; import sun.reflect.misc.*; @@ -181,10 +182,6 @@ return method; } - private static boolean equals(Object o1, Object o2) { - return (o1 == null) ? (o2 == null) : o1.equals(o2); - } - private void doProperty(Class type, PropertyDescriptor pd, Object oldInstance, Object newInstance, Encoder out) throws Exception { Method getter = pd.getReadMethod(); Method setter = pd.getWriteMethod(); @@ -195,7 +192,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { // Search for a static constant with this value; Object e = (Object[])pd.getValue("enumerationValues"); if (e instanceof Object[] && Array.getLength(e) % 3 == 0) { @@ -233,7 +230,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { out.writeStatement(new Statement(field, "set", new Object[] { oldInstance, oldValue })); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/beans/MetaData.java --- a/jdk/src/share/classes/java/beans/MetaData.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/beans/MetaData.java Sat May 14 11:52:15 2011 -0700 @@ -56,6 +56,8 @@ import sun.swing.PrintColorUIResource; +import java.util.Objects; + /* * Like the <code>Intropector</code>, the <code>MetaData</code> class * contains meta objects that describe the way @@ -134,7 +136,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!MetaData.equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { // System.out.println("Not equal: " + newGetExp + " != " + actualGetExp); // invokeStatement(Array.class, "set", new Object[]{oldInstance, index, oldValue}, out); DefaultPersistenceDelegate.invokeStatement(oldInstance, "set", new Object[]{index, oldValue}, out); @@ -635,7 +637,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!MetaData.equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { invokeStatement(oldInstance, "set", new Object[]{index, oldValue}, out); } } @@ -675,7 +677,7 @@ Object oldValue = oldGetExp.getValue(); Object newValue = newGetExp.getValue(); out.writeExpression(oldGetExp); - if (!MetaData.equals(newValue, out.get(oldValue))) { + if (!Objects.equals(newValue, out.get(oldValue))) { invokeStatement(oldInstance, "put", new Object[]{oldKey, oldValue}, out); } else if ((newValue == null) && !newMap.containsKey(oldKey)) { // put oldValue(=null?) if oldKey is absent in newMap @@ -899,17 +901,17 @@ if (!(oldInstance instanceof java.awt.Window)) { Object oldBackground = c.isBackgroundSet() ? c.getBackground() : null; Object newBackground = c2.isBackgroundSet() ? c2.getBackground() : null; - if (!MetaData.equals(oldBackground, newBackground)) { + if (!Objects.equals(oldBackground, newBackground)) { invokeStatement(oldInstance, "setBackground", new Object[] { oldBackground }, out); } Object oldForeground = c.isForegroundSet() ? c.getForeground() : null; Object newForeground = c2.isForegroundSet() ? c2.getForeground() : null; - if (!MetaData.equals(oldForeground, newForeground)) { + if (!Objects.equals(oldForeground, newForeground)) { invokeStatement(oldInstance, "setForeground", new Object[] { oldForeground }, out); } Object oldFont = c.isFontSet() ? c.getFont() : null; Object newFont = c2.isFontSet() ? c2.getFont() : null; - if (!MetaData.equals(oldFont, newFont)) { + if (!Objects.equals(oldFont, newFont)) { invokeStatement(oldInstance, "setFont", new Object[] { oldFont }, out); } } @@ -1306,10 +1308,6 @@ internalPersistenceDelegates.put("java.util.RegularEnumSet", new java_util_EnumSet_PersistenceDelegate()); } - /*pp*/ static boolean equals(Object o1, Object o2) { - return (o1 == null) ? (o2 == null) : o1.equals(o2); - } - public synchronized static PersistenceDelegate getPersistenceDelegate(Class type) { if (type == null) { return nullPersistenceDelegate; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/io/File.java --- a/jdk/src/share/classes/java/io/File.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/io/File.java Sat May 14 11:52:15 2011 -0700 @@ -25,7 +25,6 @@ package java.io; -import java.beans.ConstructorProperties; import java.net.URI; import java.net.URL; import java.net.MalformedURLException; @@ -247,7 +246,6 @@ * @throws NullPointerException * If the <code>pathname</code> argument is <code>null</code> */ - @ConstructorProperties("path") public File(String pathname) { if (pathname == null) { throw new NullPointerException(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/ArithmeticException.java --- a/jdk/src/share/classes/java/lang/ArithmeticException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/ArithmeticException.java Sat May 14 11:52:15 2011 -0700 @@ -32,7 +32,8 @@ * * {@code ArithmeticException} objects may be constructed by the * virtual machine as if {@linkplain Throwable#Throwable(String, - * Throwable, boolean) suppression were disabled}. + * Throwable, boolean, boolean) suppression were disabled and/or the + * stack trace was not writable}. * * @author unascribed * @since JDK1.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Character.java --- a/jdk/src/share/classes/java/lang/Character.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Character.java Sat May 14 11:52:15 2011 -0700 @@ -59,14 +59,14 @@ * The {@code char} data type (and therefore the value that a * {@code Character} object encapsulates) are based on the * original Unicode specification, which defined characters as - * fixed-width 16-bit entities. The Unicode standard has since been + * fixed-width 16-bit entities. The Unicode Standard has since been * changed to allow for characters whose representation requires more * than 16 bits. The range of legal code points is now * U+0000 to U+10FFFF, known as Unicode scalar value. * (Refer to the <a * href="http://www.unicode.org/reports/tr27/#notation"> * definition</a> of the U+n notation in the Unicode - * standard.) + * Standard.) * * <a name="BMP">The set of characters from U+0000 to U+FFFF is * sometimes referred to as the Basic Multilingual Plane (BMP). @@ -5200,7 +5200,8 @@ * * A character is lowercase if its general category type, provided * by {@code Character.getType(ch)}, is - * {@code LOWERCASE_LETTER}. + * {@code LOWERCASE_LETTER}, or it has contributory property + * Other_Lowercase as defined by the Unicode Standard. * * The following are examples of lowercase characters: * <blockquote><pre> @@ -5235,7 +5236,8 @@ * * A character is lowercase if its general category type, provided * by {@link Character#getType getType(codePoint)}, is - * {@code LOWERCASE_LETTER}. + * {@code LOWERCASE_LETTER}, or it has contributory property + * Other_Lowercase as defined by the Unicode Standard. * * The following are examples of lowercase characters: * <blockquote><pre> @@ -5257,7 +5259,8 @@ * @since 1.5 */ public static boolean isLowerCase(int codePoint) { - return getType(codePoint) == Character.LOWERCASE_LETTER; + return getType(codePoint) == Character.LOWERCASE_LETTER || + CharacterData.of(codePoint).isOtherLowercase(codePoint); } /** @@ -5265,6 +5268,7 @@ * * A character is uppercase if its general category type, provided by * {@code Character.getType(ch)}, is {@code UPPERCASE_LETTER}. + * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * * The following are examples of uppercase characters: * <blockquote><pre> @@ -5298,7 +5302,8 @@ * Determines if the specified character (Unicode code point) is an uppercase character. * * A character is uppercase if its general category type, provided by - * {@link Character#getType(int) getType(codePoint)}, is {@code UPPERCASE_LETTER}. + * {@link Character#getType(int) getType(codePoint)}, is {@code UPPERCASE_LETTER}, + * or it has contributory property Other_Uppercase as defined by the Unicode Standard. * * The following are examples of uppercase characters: * <blockquote><pre> @@ -5320,7 +5325,8 @@ * @since 1.5 */ public static boolean isUpperCase(int codePoint) { - return getType(codePoint) == Character.UPPERCASE_LETTER; + return getType(codePoint) == Character.UPPERCASE_LETTER || + CharacterData.of(codePoint).isOtherUppercase(codePoint); } /** @@ -5725,6 +5731,52 @@ } /** + * Determines if the specified character (Unicode code point) is an alphabet. + * + * A character is considered to be alphabetic if its general category type, + * provided by {@link Character#getType(int) getType(codePoint)}, is any of + * the following: + * <ul> + * <li> <code>UPPERCASE_LETTER</code> + * <li> <code>LOWERCASE_LETTER</code> + * <li> <code>TITLECASE_LETTER</code> + * <li> <code>MODIFIER_LETTER</code> + * <li> <code>OTHER_LETTER</code> + * <li> <code>LETTER_NUMBER</code> + * </ul> + * or it has contributory property Other_Alphabetic as defined by the + * Unicode Standard. + * + * @param codePoint the character (Unicode code point) to be tested. + * @return <code>true</code> if the character is a Unicode alphabet + * character, <code>false</code> otherwise. + * @since 1.7 + */ + public static boolean isAlphabetic(int codePoint) { + return (((((1 << Character.UPPERCASE_LETTER) | + (1 << Character.LOWERCASE_LETTER) | + (1 << Character.TITLECASE_LETTER) | + (1 << Character.MODIFIER_LETTER) | + (1 << Character.OTHER_LETTER) | + (1 << Character.LETTER_NUMBER)) >> getType(codePoint)) & 1) != 0) || + CharacterData.of(codePoint).isOtherAlphabetic(codePoint); + } + + /** + * Determines if the specified character (Unicode code point) is a CJKV + * (Chinese, Japanese, Korean and Vietnamese) ideograph, as defined by + * the Unicode Standard. + * + * @param codePoint the character (Unicode code point) to be tested. + * @return <code>true</code> if the character is a Unicode ideograph + * character, <code>false</code> otherwise. + * @since 1.7 + */ + public static boolean isIdeographic(int codePoint) { + return CharacterData.of(codePoint).isIdeographic(codePoint); + } + + /** * Determines if the specified character is * permissible as the first character in a Java identifier. * @@ -6430,7 +6482,7 @@ /** * Determines if the specified character is a Unicode space character. * A character is considered to be a space character if and only if - * it is specified to be a space character by the Unicode standard. This + * it is specified to be a space character by the Unicode Standard. This * method returns true if the character's general category type is any of * the following: * <ul> @@ -6458,7 +6510,7 @@ * Determines if the specified character (Unicode code point) is a * Unicode space character. A character is considered to be a * space character if and only if it is specified to be a space - * character by the Unicode standard. This method returns true if + * character by the Unicode Standard. This method returns true if * the character's general category type is any of the following: * * <ul> @@ -6908,7 +6960,7 @@ * @since 1.4 */ static char[] toUpperCaseCharArray(int codePoint) { - // As of Unicode 4.0, 1:M uppercasings only happen in the BMP. + // As of Unicode 6.0, 1:M uppercasings only happen in the BMP. assert isBmpCodePoint(codePoint); return CharacterData.of(codePoint).toUpperCaseCharArray(codePoint); } @@ -6941,7 +6993,7 @@ * Note: if the specified character is not assigned a name by * the UnicodeData file (part of the Unicode Character * Database maintained by the Unicode Consortium), the returned - * name is the same as the result of expression + * name is the same as the result of expression. * * <blockquote>{@code * Character.UnicodeBlock.of(codePoint).toString().replace('_', ' ') diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/CharacterData.java --- a/jdk/src/share/classes/java/lang/CharacterData.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/CharacterData.java Sat May 14 11:52:15 2011 -0700 @@ -46,10 +46,27 @@ int toUpperCaseEx(int ch) { return toUpperCase(ch); } + char[] toUpperCaseCharArray(int ch) { return null; } + boolean isOtherLowercase(int ch) { + return false; + } + + boolean isOtherUppercase(int ch) { + return false; + } + + boolean isOtherAlphabetic(int ch) { + return false; + } + + boolean isIdeographic(int ch) { + return false; + } + // Character <= 0xff (basic latin) is handled by internal fast-path // to avoid initializing large tables. // Note: performance of this "fast-path" code may be sub-optimal diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Error.java --- a/jdk/src/share/classes/java/lang/Error.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Error.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2011, 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 @@ -79,7 +79,7 @@ * @param message the detail message (which is saved for later retrieval * by the {@link #getMessage()} method). * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A <tt>null</tt> value is + * {@link #getCause()} method). (A {@code null} value is * permitted, and indicates that the cause is nonexistent or * unknown.) * @since 1.4 @@ -90,13 +90,13 @@ /** * Constructs a new error with the specified cause and a detail - * message of <tt>(cause==null ? null : cause.toString())</tt> (which - * typically contains the class and detail message of <tt>cause</tt>). + * message of {@code (cause==null ? null : cause.toString())} (which + * typically contains the class and detail message of {@code cause}). * This constructor is useful for errors that are little more than * wrappers for other throwables. * * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A <tt>null</tt> value is + * {@link #getCause()} method). (A {@code null} value is * permitted, and indicates that the cause is nonexistent or * unknown.) * @since 1.4 @@ -104,4 +104,25 @@ public Error(Throwable cause) { super(cause); } + + /** + * Constructs a new error with the specified detail message, + * cause, suppression enabled or disabled, and writable stack + * trace enabled or disabled. + * + * @param message the detail message. + * @param cause the cause. (A {@code null} value is permitted, + * and indicates that the cause is nonexistent or unknown.) + * @param enableSuppression whether or not suppression is enabled + * or disabled + * @param writableStackTrace whether or not the stack trace should + * be writable + * + * @since 1.7 + */ + protected Error(String message, Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Exception.java --- a/jdk/src/share/classes/java/lang/Exception.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Exception.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2011, 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 @@ -101,4 +101,24 @@ public Exception(Throwable cause) { super(cause); } + + /** + * Constructs a new exception with the specified detail message, + * cause, suppression enabled or disabled, and writable stack + * trace enabled or disabled. + * + * @param message the detail message. + * @param cause the cause. (A {@code null} value is permitted, + * and indicates that the cause is nonexistent or unknown.) + * @param enableSuppression whether or not suppression is enabled + * or disabled + * @param writableStackTrace whether or not the stack trace should + * be writable + * @since 1.7 + */ + protected Exception(String message, Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/NullPointerException.java --- a/jdk/src/share/classes/java/lang/NullPointerException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/NullPointerException.java Sat May 14 11:52:15 2011 -0700 @@ -43,7 +43,8 @@ * * {@code NullPointerException} objects may be constructed by the * virtual machine as if {@linkplain Throwable#Throwable(String, - * Throwable, boolean) suppression were disabled}. + * Throwable, boolean, boolean) suppression were disabled and/or the + * stack trace was not writable}. * * @author unascribed * @since JDK1.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/OutOfMemoryError.java --- a/jdk/src/share/classes/java/lang/OutOfMemoryError.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/OutOfMemoryError.java Sat May 14 11:52:15 2011 -0700 @@ -32,7 +32,8 @@ * * {@code OutOfMemoryError} objects may be constructed by the virtual * machine as if {@linkplain Throwable#Throwable(String, Throwable, - * boolean) suppression were disabled}. + * boolean, boolean) suppression were disabled and/or the stack trace was not + * writable}. * * @author unascribed * @since JDK1.0 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/ProcessBuilder.java --- a/jdk/src/share/classes/java/lang/ProcessBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/ProcessBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -938,6 +938,11 @@ * but at the very least the command must be a non-empty list of * non-null strings. * + * A minimal set of system dependent environment variables may + * be required to start a process on some operating systems. + * As a result, the subprocess may inherit additional environment variable + * settings beyond those in the process builder's {@link #environment()}. + * * If there is a security manager, its * {@link SecurityManager#checkExec checkExec} * method is called with the first component of this object's diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Runtime.java --- a/jdk/src/share/classes/java/lang/Runtime.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Runtime.java Sat May 14 11:52:15 2011 -0700 @@ -544,6 +544,11 @@ * If <tt>envp</tt> is <tt>null</tt>, the subprocess inherits the * environment settings of the current process. * + * A minimal set of system dependent environment variables may + * be required to start a process on some operating systems. + * As a result, the subprocess may inherit additional environment variable + * settings beyond those in the specified environment. + * * {@link ProcessBuilder#start()} is now the preferred way to * start a process with a modified environment. * diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/RuntimeException.java --- a/jdk/src/share/classes/java/lang/RuntimeException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/RuntimeException.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,4 +95,25 @@ public RuntimeException(Throwable cause) { super(cause); } + + /** + * Constructs a new runtime exception with the specified detail + * message, cause, suppression enabled or disabled, and writable + * stack trace enabled or disabled. + * + * @param message the detail message. + * @param cause the cause. (A {@code null} value is permitted, + * and indicates that the cause is nonexistent or unknown.) + * @param enableSuppression whether or not suppression is enabled + * or disabled + * @param writableStackTrace whether or not the stack trace should + * be writable + * + * @since 1.7 + */ + protected RuntimeException(String message, Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/StringCoding.java --- a/jdk/src/share/classes/java/lang/StringCoding.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/StringCoding.java Sat May 14 11:52:15 2011 -0700 @@ -222,13 +222,13 @@ off = 0; } } + cd.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); if (cd instanceof ArrayDecoder) { int clen = ((ArrayDecoder)cd).decode(ba, off, len, ca); return safeTrim(ca, clen, cs, isTrusted); } else { - cd.onMalformedInput(CodingErrorAction.REPLACE) - .onUnmappableCharacter(CodingErrorAction.REPLACE) - .reset(); ByteBuffer bb = ByteBuffer.wrap(ba, off, len); CharBuffer cb = CharBuffer.wrap(ca); try { @@ -356,13 +356,13 @@ off = 0; } } + ce.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); if (ce instanceof ArrayEncoder) { int blen = ((ArrayEncoder)ce).encode(ca, off, len, ba); return safeTrim(ba, blen, cs, isTrusted); } else { - ce.onMalformedInput(CodingErrorAction.REPLACE) - .onUnmappableCharacter(CodingErrorAction.REPLACE) - .reset(); ByteBuffer bb = ByteBuffer.wrap(ba); CharBuffer cb = CharBuffer.wrap(ca, off, len); try { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/lang/Throwable.java --- a/jdk/src/share/classes/java/lang/Throwable.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/lang/Throwable.java Sat May 14 11:52:15 2011 -0700 @@ -129,16 +129,41 @@ */ private String detailMessage; + + /** + * Holder class to defer initializing sentinel objects only used + * for serialization. + */ + private static class SentinelHolder { + /** + * {@linkplain #setStackTrace(StackTraceElement[]) Setting the + * stack trace} to a one-element array containing this sentinel + * value indicates future attempts to set the stack trace will be + * ignored. The sentinal is equal to the result of calling: + * {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)} + */ + public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL = + new StackTraceElement("", "", null, Integer.MIN_VALUE); + + /** + * Sentinel value used in the serial form to indicate an immutable + * stack trace. + */ + public static final StackTraceElement[] STACK_TRACE_SENTINEL = + new StackTraceElement[] {STACK_TRACE_ELEMENT_SENTINEL}; + } + /** * A shared value for an empty stack. */ - private static final StackTraceElement[] EMPTY_STACK = new StackTraceElement[0]; + private static final StackTraceElement[] UNASSIGNED_STACK = new StackTraceElement[0]; /* * To allow Throwable objects to be made immutable and safely * reused by the JVM, such as OutOfMemoryErrors, fields of - * Throwable that are writable in response to user actions, cause - * and suppressedExceptions obey the following protocol: + * Throwable that are writable in response to user actions, cause, + * stackTrace, and suppressedExceptions obey the following + * protocol: * * 1) The fields are initialized to a non-null sentinel value * which indicates the value has logically not been set. @@ -174,10 +199,15 @@ /** * The stack trace, as returned by {@link #getStackTrace()}. * + * The field is initialized to a zero-length array. A {@code + * null} value of this field indicates subsequent calls to {@link + * #setStackTrace(StackTraceElement[])} and {@link + * #fillInStackTrace()} will be be no-ops. + * * @serial * @since 1.4 */ - private StackTraceElement[] stackTrace; + private StackTraceElement[] stackTrace = UNASSIGNED_STACK; // Setting this static field introduces an acceptable // initialization dependency on a few java.util classes. @@ -284,24 +314,36 @@ /** * Constructs a new throwable with the specified detail message, - * cause, and {@linkplain #addSuppressed suppression} enabled or - * disabled. If suppression is disabled, {@link #getSuppressed} - * for this object will return a zero-length array and calls to - * {@link #addSuppressed} that would otherwise append an exception - * to the suppressed list will have no effect. + * cause, {@linkplain #addSuppressed suppression} enabled or + * disabled, and writable stack trace enabled or disabled. If + * suppression is disabled, {@link #getSuppressed} for this object + * will return a zero-length array and calls to {@link + * #addSuppressed} that would otherwise append an exception to the + * suppressed list will have no effect. If the writable stack + * trace is false, this constructor will not call {@link + * #fillInStackTrace()}, a {@code null} will be written to the + * {@code stackTrace} field, and subsequent calls to {@code + * fillInStackTrace} and {@link + * #setStackTrace(StackTraceElement[])} will not set the stack + * trace. If the writable stack trace is false, {@link + * #getStackTrace} will return a zero length array. * * Note that the other constructors of {@code Throwable} treat - * suppression as being enabled. Subclasses of {@code Throwable} - * should document any conditions under which suppression is - * disabled. Disabling of suppression should only occur in - * exceptional circumstances where special requirements exist, - * such as a virtual machine reusing exception objects under - * low-memory situations. + * suppression as being enabled and the stack trace as being + * writable. Subclasses of {@code Throwable} should document any + * conditions under which suppression is disabled and document + * conditions under which the stack trace is not writable. + * Disabling of suppression should only occur in exceptional + * circumstances where special requirements exist, such as a + * virtual machine reusing exception objects under low-memory + * situations. * * @param message the detail message. * @param cause the cause. (A {@code null} value is permitted, * and indicates that the cause is nonexistent or unknown.) * @param enableSuppression whether or not suppression is enabled or disabled + * @param writableStackTrace whether or not the stack trace should be + * writable * * @see OutOfMemoryError * @see NullPointerException @@ -309,8 +351,13 @@ * @since 1.7 */ protected Throwable(String message, Throwable cause, - boolean enableSuppression) { - fillInStackTrace(); + boolean enableSuppression, + boolean writableStackTrace) { + if (writableStackTrace) { + fillInStackTrace(); + } else { + stackTrace = null; + } detailMessage = message; this.cause = cause; if (!enableSuppression) @@ -707,10 +754,22 @@ * {@code Throwable} object information about the current state of * the stack frames for the current thread. * + * If the stack trace of this {@code Throwable} {@linkplain + * Throwable#Throwable(String, Throwable, boolean, boolean) is not + * writable}, calling this method has no effect. + * * @return a reference to this {@code Throwable} instance. * @see java.lang.Throwable#printStackTrace() */ - public synchronized native Throwable fillInStackTrace(); + public synchronized Throwable fillInStackTrace() { + if (stackTrace != null) { + fillInStackTrace(0); + stackTrace = UNASSIGNED_STACK; + } + return this; + } + + private native Throwable fillInStackTrace(int dummy); /** * Provides programmatic access to the stack trace information printed by @@ -740,12 +799,15 @@ } private synchronized StackTraceElement[] getOurStackTrace() { - // Initialize stack trace if this is the first call to this method - if (stackTrace == null) { + // Initialize stack trace field with information from + // backtrace if this is the first call to this method + if (stackTrace == UNASSIGNED_STACK) { int depth = getStackTraceDepth(); stackTrace = new StackTraceElement[depth]; for (int i=0; i < depth; i++) stackTrace[i] = getStackTraceElement(i); + } else if (stackTrace == null) { + return UNASSIGNED_STACK; } return stackTrace; } @@ -761,6 +823,11 @@ * when a throwable is constructed or deserialized when a throwable is * read from a serialization stream. * + * If the stack trace of this {@code Throwable} {@linkplain + * Throwable#Throwable(String, Throwable, boolean, boolean) is not + * writable}, calling this method has no effect other than + * validating its argument. + * * @param stackTrace the stack trace elements to be associated with * this {@code Throwable}. The specified array is copied by this * call; changes in the specified array after the method invocation @@ -768,18 +835,22 @@ * trace. * * @throws NullPointerException if {@code stackTrace} is - * {@code null}, or if any of the elements of + * {@code null} or if any of the elements of * {@code stackTrace} are {@code null} * * @since 1.4 */ public void setStackTrace(StackTraceElement[] stackTrace) { + // Validate argument StackTraceElement[] defensiveCopy = stackTrace.clone(); - for (int i = 0; i < defensiveCopy.length; i++) + for (int i = 0; i < defensiveCopy.length; i++) { if (defensiveCopy[i] == null) throw new NullPointerException("stackTrace[" + i + "]"); + } synchronized (this) { + if (this.stackTrace == null) // Immutable stack + return; this.stackTrace = defensiveCopy; } } @@ -808,7 +879,11 @@ * well-formedness constraints on fields. Null entries and * self-pointers are not allowed in the list of {@code * suppressedExceptions}. Null entries are not allowed for stack - * trace elements. + * trace elements. A null stack trace in the serial form results + * in a zero-length stack element array. A single-element stack + * trace whose entry is equal to {@code new StackTraceElement("", + * "", null, Integer.MIN_VALUE)} results in a {@code null} {@code + * stackTrace} field. * * Note that there are no constraints on the value the {@code * cause} field can hold; both {@code null} and {@code this} are @@ -837,26 +912,60 @@ suppressedExceptions = suppressed; } // else a null suppressedExceptions field remains null + /* + * For zero-length stack traces, use a clone of + * UNASSIGNED_STACK rather than UNASSIGNED_STACK itself to + * allow identity comparison against UNASSIGNED_STACK in + * getOurStackTrace. The identity of UNASSIGNED_STACK in + * stackTrace indicates to the getOurStackTrace method that + * the stackTrace needs to be constructed from the information + * in backtrace. + */ if (stackTrace != null) { - for (StackTraceElement ste : stackTrace) { - if (ste == null) - throw new NullPointerException("null StackTraceElement in serial stream. "); + if (stackTrace.length == 0) { + stackTrace = UNASSIGNED_STACK.clone(); + } else if (stackTrace.length == 1 && + // Check for the marker of an immutable stack trace + SentinelHolder.STACK_TRACE_ELEMENT_SENTINEL.equals(stackTrace[0])) { + stackTrace = null; + } else { // Verify stack trace elements are non-null. + for(StackTraceElement ste : stackTrace) { + if (ste == null) + throw new NullPointerException("null StackTraceElement in serial stream. "); + } } } else { - // A null stackTrace field in the serial form can result from - // an exception serialized without that field in older JDK releases. - stackTrace = EMPTY_STACK; + // A null stackTrace field in the serial form can result + // from an exception serialized without that field in + // older JDK releases; treat such exceptions as having + // empty stack traces. + stackTrace = UNASSIGNED_STACK.clone(); } - } /** * Write a {@code Throwable} object to a stream. + * + * A {@code null} stack trace field is represented in the serial + * form as a one-element array whose element is equal to {@code + * new StackTraceElement("", "", null, Integer.MIN_VALUE)}. */ private synchronized void writeObject(ObjectOutputStream s) throws IOException { - getOurStackTrace(); // Ensure that stackTrace field is initialized. - s.defaultWriteObject(); + // Ensure that the stackTrace field is initialized to a + // non-null value, if appropriate. As of JDK 7, a null stack + // trace field is a valid value indicating the stack trace + // should not be set. + getOurStackTrace(); + + StackTraceElement[] oldStackTrace = stackTrace; + try { + if (stackTrace == null) + stackTrace = SentinelHolder.STACK_TRACE_SENTINEL; + s.defaultWriteObject(); + } finally { + stackTrace = oldStackTrace; + } } /** @@ -866,8 +975,8 @@ * try}-with-resources statement. * * The suppression behavior is enabled unless disabled - * {@linkplain #Throwable(String, Throwable, boolean) via a - * constructor}. When suppression is disabled, this method does + * {@linkplain #Throwable(String, Throwable, boolean, boolean) via + * a constructor}. When suppression is disabled, this method does * nothing other than to validate its argument. * * Note that when one exception {@linkplain @@ -933,8 +1042,8 @@ * statement, in order to deliver this exception. * * If no exceptions were suppressed or {@linkplain - * Throwable(String, Throwable, boolean) suppression is disabled}, - * an empty array is returned. + * #Throwable(String, Throwable, boolean, boolean) suppression is + * disabled}, an empty array is returned. * * @return an array containing all of the exceptions that were * suppressed to deliver this exception. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/HttpCookie.java --- a/jdk/src/share/classes/java/net/HttpCookie.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/net/HttpCookie.java Sat May 14 11:52:15 2011 -0700 @@ -34,6 +34,7 @@ import java.lang.NullPointerException; // for javadoc import java.util.Locale; +import java.util.Objects; /** * An HttpCookie object represents an http cookie, which carries state @@ -817,7 +818,7 @@ // 3. and have same path (case-sensitive). return equalsIgnoreCase(getName(), other.getName()) && equalsIgnoreCase(getDomain(), other.getDomain()) && - equals(getPath(), other.getPath()); + Objects.equals(getPath(), other.getPath()); } @@ -1162,14 +1163,6 @@ return false; } - private static boolean equals(String s, String t) { - if (s == t) return true; - if ((s != null) && (t != null)) { - return s.equals(t); - } - return false; - } - private static boolean startsWithIgnoreCase(String s, String start) { if (s == null || start == null) return false; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/InetAddress.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/Socket.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/net/SocketPermission.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/charset/Charset.java --- a/jdk/src/share/classes/java/nio/charset/Charset.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/nio/charset/Charset.java Sat May 14 11:52:15 2011 -0700 @@ -143,6 +143,8 @@ * * <h4>Standard charsets</h4> * + * <a name="standard"> + * * Every implementation of the Java platform is required to support the * following standard charsets. Consult the release documentation for your * implementation to see if any other charsets are supported. The behavior @@ -213,6 +215,8 @@ * determined during virtual-machine startup and typically depends upon the * locale and charset being used by the underlying operating system. * + * The {@link StandardCharset} class defines constants for each of the + * standard charsets. * * <h4>Terminology</h4> * diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/charset/StandardCharset.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/java/nio/charset/StandardCharset.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.nio.charset; + +/** + * Constant definitions for the standard {@link Charset Charsets}. These + * charsets are guaranteed to be available on every implementation of the Java + * platform. + * + * @see <a href="Charset#standard">Standard Charsets</a> + * @since 1.7 + */ +public final class StandardCharset { + + private StandardCharset() { + throw new AssertionError("No java.nio.charset.StandardCharset instances for you!"); + } + /** + * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the + * Unicode character set + */ + public static final Charset US_ASCII = Charset.forName("US-ASCII"); + /** + * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1 + */ + public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1"); + /** + * Eight-bit UCS Transformation Format + */ + public static final Charset UTF_8 = Charset.forName("UTF-8"); + /** + * Sixteen-bit UCS Transformation Format, big-endian byte order + */ + public static final Charset UTF_16BE = Charset.forName("UTF-16BE"); + /** + * Sixteen-bit UCS Transformation Format, little-endian byte order + */ + public static final Charset UTF_16LE = Charset.forName("UTF-16LE"); + /** + * Sixteen-bit UCS Transformation Format, byte order identified by an + * optional byte-order mark + */ + public static final Charset UTF_16 = Charset.forName("UTF-16"); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/file/FileSystem.java --- a/jdk/src/share/classes/java/nio/file/FileSystem.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/nio/file/FileSystem.java Sat May 14 11:52:15 2011 -0700 @@ -391,6 +391,13 @@ * character is used to separate the subpatterns. Groups cannot be nested. * </li> * + * <li> Leading period<tt>/</tt>dot characters in file name are + * treated as regular characters in match operations. For example, + * the {@code "*"} glob pattern matches file name {@code ".login"}. + * The {@link Files#isHidden} method may be used to test whether a file + * is considered hidden. + * </li> + * * <li> All other characters match themselves in an implementation * dependent manner. This includes characters representing any {@link * FileSystem#getSeparator name-separators}. </li> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/nio/file/Path.java --- a/jdk/src/share/classes/java/nio/file/Path.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/nio/file/Path.java Sat May 14 11:52:15 2011 -0700 @@ -72,7 +72,7 @@ * directory and is UTF-8 encoded. * <pre> * Path path = FileSystems.getDefault().getPath("logs", "access.log"); - * BufferReader reader = Files.newBufferedReader(path, Charset.forName("UTF-8")); + * BufferReader reader = Files.newBufferedReader(path, StandardCharset.UTF_8); * </pre> * * <a name="interop"><h4>Interoperability</h4></a> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/security/spec/EllipticCurve.java --- a/jdk/src/share/classes/java/security/spec/EllipticCurve.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/security/spec/EllipticCurve.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -165,8 +165,7 @@ * specified object. * @param obj the object to be compared. * @return true if <code>obj</code> is an instance of - * EllipticCurve and the field, A, B, and seeding bytes - * match, false otherwise. + * EllipticCurve and the field, A, and B match, false otherwise. */ public boolean equals(Object obj) { if (this == obj) return true; @@ -174,9 +173,8 @@ EllipticCurve curve = (EllipticCurve) obj; if ((field.equals(curve.field)) && (a.equals(curve.a)) && - (b.equals(curve.b)) && - (Arrays.equals(seed, curve.seed))) { - return true; + (b.equals(curve.b))) { + return true; } } return false; @@ -184,12 +182,15 @@ /** * Returns a hash code value for this elliptic curve. - * @return a hash code value. + * @return a hash code value computed from the hash codes of the field, A, + * and B, as follows: + * <code> + * (field.hashCode() << 6) + (a.hashCode() << 4) + (b.hashCode() << 2) + * </code> */ public int hashCode() { return (field.hashCode() << 6 + (a.hashCode() << 4) + - (b.hashCode() << 2) + - (seed==null? 0:seed.length)); + (b.hashCode() << 2)); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/sql/BatchUpdateException.java --- a/jdk/src/share/classes/java/sql/BatchUpdateException.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/sql/BatchUpdateException.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -25,6 +25,8 @@ package java.sql; +import java.util.Arrays; + /** * The subclass of {@link SQLException} thrown when an error * occurs during a batch update operation. In addition to the @@ -77,8 +79,7 @@ */ public BatchUpdateException( String reason, String SQLState, int vendorCode, int[] updateCounts ) { - super(reason, SQLState, vendorCode); - this.updateCounts = updateCounts; + this(reason, SQLState, vendorCode, updateCounts, null); } /** @@ -105,8 +106,7 @@ */ public BatchUpdateException(String reason, String SQLState, int[] updateCounts) { - super(reason, SQLState); - this.updateCounts = updateCounts; + this(reason, SQLState, 0, updateCounts, null); } /** @@ -132,8 +132,7 @@ * @since 1.2 */ public BatchUpdateException(String reason, int[] updateCounts) { - super(reason); - this.updateCounts = updateCounts; + this(reason, null, 0, updateCounts, null); } /** @@ -156,8 +155,7 @@ * @since 1.2 */ public BatchUpdateException(int[] updateCounts) { - super(); - this.updateCounts = updateCounts; + this(null, null, 0, updateCounts, null); } /** @@ -172,8 +170,7 @@ * @since 1.2 */ public BatchUpdateException() { - super(); - this.updateCounts = null; + this(null, null, 0, null, null); } /** @@ -191,8 +188,7 @@ * @since 1.6 */ public BatchUpdateException(Throwable cause) { - super(cause); - this.updateCounts = null; + this(null, null, 0, null, cause); } /** @@ -218,8 +214,7 @@ * @since 1.6 */ public BatchUpdateException(int []updateCounts , Throwable cause) { - super(cause); - this.updateCounts = updateCounts; + this(null, null, 0, updateCounts, cause); } /** @@ -243,8 +238,7 @@ * @since 1.6 */ public BatchUpdateException(String reason, int []updateCounts, Throwable cause) { - super(reason,cause); - this.updateCounts = updateCounts; + this(reason, null, 0, updateCounts, cause); } /** @@ -269,8 +263,7 @@ */ public BatchUpdateException(String reason, String SQLState, int []updateCounts, Throwable cause) { - super(reason,SQLState,cause); - this.updateCounts = updateCounts; + this(reason, SQLState, 0, updateCounts, cause); } /** @@ -297,8 +290,8 @@ */ public BatchUpdateException(String reason, String SQLState, int vendorCode, int []updateCounts,Throwable cause) { - super(reason,SQLState,vendorCode,cause); - this.updateCounts = updateCounts; + super(reason, SQLState, vendorCode, cause); + this.updateCounts = (updateCounts == null) ? null : Arrays.copyOf(updateCounts, updateCounts.length); } /** @@ -332,7 +325,7 @@ * @since 1.3 */ public int[] getUpdateCounts() { - return updateCounts; + return (updateCounts == null) ? null : Arrays.copyOf(updateCounts, updateCounts.length); } /** @@ -340,7 +333,7 @@ * @serial * @since 1.2 */ - private int[] updateCounts; + private final int[] updateCounts; private static final long serialVersionUID = 5977529877145521757L; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/AbstractSet.java --- a/jdk/src/share/classes/java/util/AbstractSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/AbstractSet.java Sat May 14 11:52:15 2011 -0700 @@ -156,9 +156,11 @@ * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation * is not supported by this set * @throws ClassCastException if the class of an element of this set - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this set contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/ArrayList.java --- a/jdk/src/share/classes/java/util/ArrayList.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/ArrayList.java Sat May 14 11:52:15 2011 -0700 @@ -628,9 +628,11 @@ * @param c collection containing elements to be removed from this list * @return {@code true} if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see Collection#contains(Object) */ @@ -646,9 +648,11 @@ * @param c collection containing elements to be retained in this list * @return {@code true} if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see Collection#contains(Object) */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Collection.java --- a/jdk/src/share/classes/java/util/Collection.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Collection.java Sat May 14 11:52:15 2011 -0700 @@ -60,7 +60,8 @@ * but is not required to, throw the exception if the collection to be added * is empty. * - * Some collection implementations have restrictions on the elements that + * <a name="optional-restrictions"/> + * Some collection implementations have restrictions on the elements that * they may contain. For example, some implementations prohibit null elements, * and some have restrictions on the types of their elements. Attempting to * add an ineligible element throws an unchecked exception, typically @@ -152,9 +153,11 @@ * @return <tt>true</tt> if this collection contains the specified * element * @throws ClassCastException if the type of the specified element - * is incompatible with this collection (optional) + * is incompatible with this collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * collection does not permit null elements (optional) + * collection does not permit null elements + * (<a href="#optional-restrictions">optional</a>) */ boolean contains(Object o); @@ -279,9 +282,11 @@ * @param o element to be removed from this collection, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the type of the specified element - * is incompatible with this collection (optional) + * is incompatible with this collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * collection does not permit null elements (optional) + * collection does not permit null elements + * (<a href="#optional-restrictions">optional</a>) * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this collection */ @@ -299,10 +304,13 @@ * in the specified collection * @throws ClassCastException if the types of one or more elements * in the specified collection are incompatible with this - * collection (optional) + * collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if the specified collection contains one * or more null elements and this collection does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="#optional-restrictions">optional</a>), + * or if the specified collection is null. * @see #contains(Object) */ boolean containsAll(Collection<?> c); @@ -346,10 +354,13 @@ * is not supported by this collection * @throws ClassCastException if the types of one or more elements * in this collection are incompatible with the specified - * collection (optional) + * collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if this collection contains one or more * null elements and the specified collection does not support - * null elements (optional), or if the specified collection is null + * null elements + * (<a href="#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) */ @@ -367,10 +378,13 @@ * is not supported by this collection * @throws ClassCastException if the types of one or more elements * in this collection are incompatible with the specified - * collection (optional) + * collection + * (<a href="#optional-restrictions">optional</a>) * @throws NullPointerException if this collection contains one or more * null elements and the specified collection does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Collections.java --- a/jdk/src/share/classes/java/util/Collections.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Collections.java Sat May 14 11:52:15 2011 -0700 @@ -3746,9 +3746,10 @@ * @throws NullPointerException if either collection is {@code null}. * @throws NullPointerException if one collection contains a {@code null} * element and {@code null} is not an eligible element for the other collection. - * (optional) + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws ClassCastException if one collection contains an element that is - * of a type which is ineligible for the other collection. (optional) + * of a type which is ineligible for the other collection. + * (<a href="Collection.html#optional-restrictions">optional</a>) * @since 1.5 */ public static boolean disjoint(Collection<?> c1, Collection<?> c2) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Deque.java --- a/jdk/src/share/classes/java/util/Deque.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Deque.java Sat May 14 11:52:15 2011 -0700 @@ -351,9 +351,11 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean removeFirstOccurrence(Object o); @@ -369,9 +371,11 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean removeLastOccurrence(Object o); @@ -527,9 +531,11 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object o); @@ -542,9 +548,11 @@ * @param o element whose presence in this deque is to be tested * @return <tt>true</tt> if this deque contains the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this deque (optional) + * is incompatible with this deque + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * deque does not permit null elements (optional) + * deque does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean contains(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/List.java --- a/jdk/src/share/classes/java/util/List.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/List.java Sat May 14 11:52:15 2011 -0700 @@ -134,9 +134,11 @@ * @param o element whose presence in this list is to be tested * @return <tt>true</tt> if this list contains the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean contains(Object o); @@ -245,9 +247,11 @@ * @param o element to be removed from this list, if present * @return <tt>true</tt> if this list contained the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this list */ @@ -265,10 +269,13 @@ * specified collection * @throws ClassCastException if the types of one or more elements * in the specified collection are incompatible with this - * list (optional) + * list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified collection contains one * or more null elements and this list does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #contains(Object) */ boolean containsAll(Collection<?> c); @@ -334,9 +341,11 @@ * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation * is not supported by this list * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) @@ -354,9 +363,11 @@ * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation * is not supported by this list * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) @@ -493,9 +504,11 @@ * @return the index of the first occurrence of the specified element in * this list, or -1 if this list does not contain the element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ int indexOf(Object o); @@ -510,9 +523,11 @@ * @return the index of the last occurrence of the specified element in * this list, or -1 if this list does not contain the element * @throws ClassCastException if the type of the specified element - * is incompatible with this list (optional) + * is incompatible with this list + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * list does not permit null elements (optional) + * list does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ int lastIndexOf(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/ListIterator.java --- a/jdk/src/share/classes/java/util/ListIterator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/ListIterator.java Sat May 14 11:52:15 2011 -0700 @@ -173,9 +173,9 @@ /** * Inserts the specified element into the list (optional operation). - * The element is inserted immediately before the next element that - * would be returned by {@link #next}, if any, and after the next - * element that would be returned by {@link #previous}, if any. (If the + * The element is inserted immediately before the element that + * would be returned by {@link #next}, if any, and after the element + * that would be returned by {@link #previous}, if any. (If the * list contains no elements, the new element becomes the sole element * on the list.) The new element is inserted before the implicit * cursor: a subsequent call to {@code next} would be unaffected, and a diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Map.java --- a/jdk/src/share/classes/java/util/Map.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Map.java Sat May 14 11:52:15 2011 -0700 @@ -144,9 +144,11 @@ * @return <tt>true</tt> if this map contains a mapping for the specified * key * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key is null and this map - * does not permit null keys (optional) + * does not permit null keys + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean containsKey(Object key); @@ -162,9 +164,11 @@ * @return <tt>true</tt> if this map maps one or more keys to the * specified value * @throws ClassCastException if the value is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified value is null and this - * map does not permit null values (optional) + * map does not permit null values + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean containsValue(Object value); @@ -187,9 +191,11 @@ * @return the value to which the specified key is mapped, or * {@code null} if this map contains no mapping for the key * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key is null and this map - * does not permit null keys (optional) + * does not permit null keys + * (<a href="Collection.html#optional-restrictions">optional</a>) */ V get(Object key); @@ -245,9 +251,11 @@ * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this map * @throws ClassCastException if the key is of an inappropriate type for - * this map (optional) + * this map + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key is null and this - * map does not permit null keys (optional) + * map does not permit null keys + * (<a href="Collection.html#optional-restrictions">optional</a>) */ V remove(Object key); @@ -466,4 +474,5 @@ * @see #equals(Object) */ int hashCode(); + } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Set.java --- a/jdk/src/share/classes/java/util/Set.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Set.java Sat May 14 11:52:15 2011 -0700 @@ -110,9 +110,11 @@ * @param o element whose presence in this set is to be tested * @return <tt>true</tt> if this set contains the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this set (optional) + * is incompatible with this set + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * set does not permit null elements (optional) + * set does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) */ boolean contains(Object o); @@ -236,9 +238,11 @@ * @param o object to be removed from this set, if present * @return <tt>true</tt> if this set contained the specified element * @throws ClassCastException if the type of the specified element - * is incompatible with this set (optional) + * is incompatible with this set + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified element is null and this - * set does not permit null elements (optional) + * set does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this set */ @@ -257,10 +261,13 @@ * specified collection * @throws ClassCastException if the types of one or more elements * in the specified collection are incompatible with this - * set (optional) + * set + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified collection contains one * or more null elements and this set does not permit null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @see #contains(Object) */ boolean containsAll(Collection<?> c); @@ -302,9 +309,11 @@ * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation * is not supported by this set * @throws ClassCastException if the class of an element of this set - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this set contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) */ @@ -322,9 +331,11 @@ * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation * is not supported by this set * @throws ClassCastException if the class of an element of this set - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this set contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) * @see #contains(Object) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/Vector.java --- a/jdk/src/share/classes/java/util/Vector.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/Vector.java Sat May 14 11:52:15 2011 -0700 @@ -893,10 +893,13 @@ * @return true if this Vector changed as a result of the call * @throws ClassCastException if the types of one or more elements * in this vector are incompatible with the specified - * collection (optional) + * collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this vector contains one or more null * elements and the specified collection does not support null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @since 1.2 */ public synchronized boolean removeAll(Collection<?> c) { @@ -913,10 +916,13 @@ * @return true if this Vector changed as a result of the call * @throws ClassCastException if the types of one or more elements * in this vector are incompatible with the specified - * collection (optional) + * collection + * (<a href="Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this vector contains one or more null * elements and the specified collection does not support null - * elements (optional), or if the specified collection is null + * elements + * (<a href="Collection.html#optional-restrictions">optional</a>), + * or if the specified collection is null * @since 1.2 */ public synchronized boolean retainAll(Collection<?> c) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/BlockingDeque.java --- a/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java Sat May 14 11:52:15 2011 -0700 @@ -400,8 +400,10 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean removeFirstOccurrence(Object o); @@ -416,8 +418,10 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if an element was removed as a result of this call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean removeLastOccurrence(Object o); @@ -591,8 +595,10 @@ * @param o element to be removed from this deque, if present * @return <tt>true</tt> if this deque changed as a result of the call * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object o); @@ -604,8 +610,10 @@ * @param o object to be checked for containment in this deque * @return <tt>true</tt> if this deque contains the specified element * @throws ClassCastException if the class of the specified element - * is incompatible with this deque (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this deque + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ public boolean contains(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/BlockingQueue.java --- a/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java Sat May 14 11:52:15 2011 -0700 @@ -303,8 +303,10 @@ * @param o element to be removed from this queue, if present * @return <tt>true</tt> if this queue changed as a result of the call * @throws ClassCastException if the class of the specified element - * is incompatible with this queue (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this queue + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object o); @@ -316,8 +318,10 @@ * @param o object to be checked for containment in this queue * @return <tt>true</tt> if this queue contains the specified element * @throws ClassCastException if the class of the specified element - * is incompatible with this queue (optional) - * @throws NullPointerException if the specified element is null (optional) + * is incompatible with this queue + * (<a href="../Collection.html#optional-restrictions">optional</a>) + * @throws NullPointerException if the specified element is null + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ public boolean contains(Object o); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java Sat May 14 11:52:15 2011 -0700 @@ -239,7 +239,8 @@ /** * Gets the ith element of given table (if nonnull) with volatile - * read semantics. + * read semantics. Note: This is manually integrated into a few + * performance-sensitive methods to reduce call overhead. */ @SuppressWarnings("unchecked") static final <K,V> HashEntry<K,V> entryAt(HashEntry<K,V>[] tab, int i) { @@ -389,8 +390,7 @@ else node = new HashEntry<K,V>(hash, key, value, first); int c = count + 1; - if (c > threshold && first != null && - tab.length < MAXIMUM_CAPACITY) + if (c > threshold && tab.length < MAXIMUM_CAPACITY) rehash(node); else setEntryAt(tab, index, node); @@ -647,7 +647,11 @@ /** * Gets the jth element of given segment array (if nonnull) with - * volatile element access semantics via Unsafe. + * volatile element access semantics via Unsafe. (The null check + * can trigger harmlessly only during deserialization.) Note: + * because each element of segments array is set only once (using + * fully ordered writes), some performance-sensitive methods rely + * on this method only as a recheck upon null reads. */ @SuppressWarnings("unchecked") static final <K,V> Segment<K,V> segmentAt(Segment<K,V>[] ss, int j) { @@ -913,12 +917,19 @@ * @throws NullPointerException if the specified key is null */ public V get(Object key) { - int hash = hash(key.hashCode()); - for (HashEntry<K,V> e = entryForHash(segmentForHash(hash), hash); - e != null; e = e.next) { - K k; - if ((k = e.key) == key || (e.hash == hash && key.equals(k))) - return e.value; + Segment<K,V> s; // manually integrate access methods to reduce overhead + HashEntry<K,V>[] tab; + int h = hash(key.hashCode()); + long u = (((h >>> segmentShift) & segmentMask) << SSHIFT) + SBASE; + if ((s = (Segment<K,V>)UNSAFE.getObjectVolatile(segments, u)) != null && + (tab = s.table) != null) { + for (HashEntry<K,V> e = (HashEntry<K,V>) UNSAFE.getObjectVolatile + (tab, ((long)(((tab.length - 1) & h)) << TSHIFT) + TBASE); + e != null; e = e.next) { + K k; + if ((k = e.key) == key || (e.hash == h && key.equals(k))) + return e.value; + } } return null; } @@ -932,13 +943,21 @@ * <tt>equals</tt> method; <tt>false</tt> otherwise. * @throws NullPointerException if the specified key is null */ + @SuppressWarnings("unchecked") public boolean containsKey(Object key) { - int hash = hash(key.hashCode()); - for (HashEntry<K,V> e = entryForHash(segmentForHash(hash), hash); - e != null; e = e.next) { - K k; - if ((k = e.key) == key || (e.hash == hash && key.equals(k))) - return true; + Segment<K,V> s; // same as get() except no need for volatile value read + HashEntry<K,V>[] tab; + int h = hash(key.hashCode()); + long u = (((h >>> segmentShift) & segmentMask) << SSHIFT) + SBASE; + if ((s = (Segment<K,V>)UNSAFE.getObjectVolatile(segments, u)) != null && + (tab = s.table) != null) { + for (HashEntry<K,V> e = (HashEntry<K,V>) UNSAFE.getObjectVolatile + (tab, ((long)(((tab.length - 1) & h)) << TSHIFT) + TBASE); + e != null; e = e.next) { + K k; + if ((k = e.key) == key || (e.hash == h && key.equals(k))) + return true; + } } return false; } @@ -1032,13 +1051,15 @@ * <tt>null</tt> if there was no mapping for <tt>key</tt> * @throws NullPointerException if the specified key or value is null */ + @SuppressWarnings("unchecked") public V put(K key, V value) { + Segment<K,V> s; if (value == null) throw new NullPointerException(); int hash = hash(key.hashCode()); int j = (hash >>> segmentShift) & segmentMask; - Segment<K,V> s = segmentAt(segments, j); - if (s == null) + if ((s = (Segment<K,V>)UNSAFE.getObject // nonvolatile; recheck + (segments, (j << SSHIFT) + SBASE)) == null) // in ensureSegment s = ensureSegment(j); return s.put(key, hash, value, false); } @@ -1050,13 +1071,15 @@ * or <tt>null</tt> if there was no mapping for the key * @throws NullPointerException if the specified key or value is null */ + @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) { + Segment<K,V> s; if (value == null) throw new NullPointerException(); int hash = hash(key.hashCode()); int j = (hash >>> segmentShift) & segmentMask; - Segment<K,V> s = segmentAt(segments, j); - if (s == null) + if ((s = (Segment<K,V>)UNSAFE.getObject + (segments, (j << SSHIFT) + SBASE)) == null) s = ensureSegment(j); return s.put(key, hash, value, true); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Sat May 14 11:52:15 2011 -0700 @@ -59,10 +59,17 @@ * ConcurrentModificationException}, and may proceed concurrently with * other operations. * - * Beware that, unlike in most collections, the {@code size} - * method is NOT a constant-time operation. Because of the + * Beware that, unlike in most collections, the {@code size} method + * is NOT a constant-time operation. Because of the * asynchronous nature of these deques, determining the current number - * of elements requires a traversal of the elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations {@code addAll}, + * {@code removeAll}, {@code retainAll}, {@code containsAll}, + * {@code equals}, and {@code toArray} are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an {@code addAll} operation might view only some + * of the added elements. * * This class and its iterator implement all of the optional * methods of the {@link Deque} and {@link Iterator} interfaces. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Sat May 14 11:52:15 2011 -0700 @@ -72,7 +72,14 @@ * Beware that, unlike in most collections, the {@code size} method * is NOT a constant-time operation. Because of the * asynchronous nature of these queues, determining the current number - * of elements requires a traversal of the elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations {@code addAll}, + * {@code removeAll}, {@code retainAll}, {@code containsAll}, + * {@code equals}, and {@code toArray} are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an {@code addAll} operation might view only some + * of the added elements. * * This class and its iterator implement all of the optional * methods of the {@link Queue} and {@link Iterator} interfaces. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java Sat May 14 11:52:15 2011 -0700 @@ -103,9 +103,11 @@ * @throws UnsupportedOperationException if the <tt>remove</tt> operation * is not supported by this map * @throws ClassCastException if the key or value is of an inappropriate - * type for this map (optional) + * type for this map + * (<a href="../Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if the specified key or value is null, - * and this map does not permit null keys or values (optional) + * and this map does not permit null keys or values + * (<a href="../Collection.html#optional-restrictions">optional</a>) */ boolean remove(Object key, Object value); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Sat May 14 11:52:15 2011 -0700 @@ -66,12 +66,13 @@ * Beware that, unlike in most collections, the <tt>size</tt> * method is not a constant-time operation. Because of the * asynchronous nature of these maps, determining the current number - * of elements requires a traversal of the elements. Additionally, - * the bulk operations <tt>putAll</tt>, <tt>equals</tt>, and - * <tt>clear</tt> are not guaranteed to be performed - * atomically. For example, an iterator operating concurrently with a - * <tt>putAll</tt> operation might view only some of the added - * elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations <tt>putAll</tt>, <tt>equals</tt>, + * <tt>toArray</tt>, <tt>containsValue</tt>, and <tt>clear</tt> are + * not guaranteed to be performed atomically. For example, an + * iterator operating concurrently with a <tt>putAll</tt> operation + * might view only some of the added elements. * * This class and its views and iterators implement all of the * optional methods of the {@link Map} and {@link Iterator} @@ -1661,7 +1662,9 @@ /** * Returns <tt>true</tt> if this map maps one or more keys to the * specified value. This operation requires time linear in the - * map size. + * map size. Additionally, it is possible for the map to change + * during execution of this method, in which case the returned + * result may be inaccurate. * * @param value value whose presence in this map is to be tested * @return <tt>true</tt> if a mapping to <tt>value</tt> exists; @@ -1751,7 +1754,7 @@ * * @return a navigable set view of the keys in this map */ - public NavigableSet<K> keySet() { + public NavigableSet<K> keySet() { KeySet ks = keySet; return (ks != null) ? ks : (keySet = new KeySet(this)); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Sat May 14 11:52:15 2011 -0700 @@ -58,12 +58,14 @@ * Beware that, unlike in most collections, the <tt>size</tt> * method is not a constant-time operation. Because of the * asynchronous nature of these sets, determining the current number - * of elements requires a traversal of the elements. Additionally, the - * bulk operations <tt>addAll</tt>, <tt>removeAll</tt>, - * <tt>retainAll</tt>, and <tt>containsAll</tt> are not - * guaranteed to be performed atomically. For example, an iterator - * operating concurrently with an <tt>addAll</tt> operation might view - * only some of the added elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations <tt>addAll</tt>, + * <tt>removeAll</tt>, <tt>retainAll</tt>, <tt>containsAll</tt>, + * <tt>equals</tt>, and <tt>toArray</tt> are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an <tt>addAll</tt> operation might view only some + * of the added elements. * * This class and its iterators implement all of the * optional methods of the {@link Set} and {@link Iterator} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java --- a/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Sat May 14 11:52:15 2011 -0700 @@ -631,9 +631,11 @@ * @param c collection containing elements to be removed from this list * @return <tt>true</tt> if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="../Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="../Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) */ @@ -671,9 +673,11 @@ * @param c collection containing elements to be retained in this list * @return <tt>true</tt> if this list changed as a result of the call * @throws ClassCastException if the class of an element of this list - * is incompatible with the specified collection (optional) + * is incompatible with the specified collection + * (<a href="../Collection.html#optional-restrictions">optional</a>) * @throws NullPointerException if this list contains a null element and the - * specified collection does not permit null elements (optional), + * specified collection does not permit null elements + * (<a href="../Collection.html#optional-restrictions">optional</a>), * or if the specified collection is null * @see #remove(Object) */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java --- a/jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java Sat May 14 11:52:15 2011 -0700 @@ -51,10 +51,17 @@ * producer. The tail of the queue is that element that has * been on the queue the shortest time for some producer. * - * Beware that, unlike in most collections, the {@code size} - * method is NOT a constant-time operation. Because of the + * Beware that, unlike in most collections, the {@code size} method + * is NOT a constant-time operation. Because of the * asynchronous nature of these queues, determining the current number - * of elements requires a traversal of the elements. + * of elements requires a traversal of the elements, and so may report + * inaccurate results if this collection is modified during traversal. + * Additionally, the bulk operations {@code addAll}, + * {@code removeAll}, {@code retainAll}, {@code containsAll}, + * {@code equals}, and {@code toArray} are not guaranteed + * to be performed atomically. For example, an iterator operating + * concurrently with an {@code addAll} operation might view only some + * of the added elements. * * This class and its iterator implement all of the * optional methods of the {@link Collection} and {@link diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/jar/JarFile.java --- a/jdk/src/share/classes/java/util/jar/JarFile.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/jar/JarFile.java Sat May 14 11:52:15 2011 -0700 @@ -37,7 +37,6 @@ import sun.security.action.GetPropertyAction; import sun.security.util.ManifestEntryVerifier; import sun.misc.SharedSecrets; -import sun.security.util.SignatureFileVerifier; /** * The <code>JarFile</code> class is used to read the contents of a jar file @@ -179,7 +178,7 @@ byte[] b = getBytes(manEntry); man = new Manifest(new ByteArrayInputStream(b)); if (!jvInitialized) { - jv = new JarVerifier(b, man); + jv = new JarVerifier(b); } } else { man = new Manifest(super.getInputStream(manEntry)); @@ -298,7 +297,10 @@ if (names != null) { for (int i = 0; i < names.length; i++) { String name = names[i].toUpperCase(Locale.ENGLISH); - if (SignatureFileVerifier.isBlockOrSF(name)) { + if (name.endsWith(".DSA") || + name.endsWith(".RSA") || + name.endsWith(".EC") || + name.endsWith(".SF")) { // Assume since we found a signature-related file // that the jar is signed and that we therefore // need a JarVerifier and Manifest @@ -327,17 +329,17 @@ if (names != null) { for (int i = 0; i < names.length; i++) { JarEntry e = getJarEntry(names[i]); - if (!e.isDirectory() && - SignatureFileVerifier.isBlock(names[i])) { + if (!e.isDirectory()) { if (mev == null) { mev = new ManifestEntryVerifier (getManifestFromReference()); } - String key = names[i].substring( - 0, names[i].lastIndexOf(".")); - jv.verifyBlock(names[i], - getBytes(e), - super.getInputStream(getJarEntry(key + ".SF"))); + byte[] b = getBytes(e); + if (b != null && b.length > 0) { + jv.beginEntry(e, mev); + jv.update(b.length, b, 0, b.length, mev); + jv.update(-1, null, 0, 0, mev); + } } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/jar/JarInputStream.java --- a/jdk/src/share/classes/java/util/jar/JarInputStream.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/jar/JarInputStream.java Sat May 14 11:52:15 2011 -0700 @@ -95,7 +95,7 @@ man.read(new ByteArrayInputStream(bytes)); closeEntry(); if (doVerify) { - jv = new JarVerifier(bytes, man); + jv = new JarVerifier(bytes); mev = new ManifestEntryVerifier(man); } return (JarEntry)super.getNextEntry(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/jar/JarVerifier.java --- a/jdk/src/share/classes/java/util/jar/JarVerifier.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/jar/JarVerifier.java Sat May 14 11:52:15 2011 -0700 @@ -48,18 +48,35 @@ /* a table mapping names to code signers, for jar entries that have had their actual hashes verified */ - private Map verifiedSigners; + private Hashtable verifiedSigners; /* a table mapping names to code signers, for jar entries that have passed the .SF/.DSA/.EC -> MANIFEST check */ - private Map sigFileSigners; + private Hashtable sigFileSigners; + + /* a hash table to hold .SF bytes */ + private Hashtable sigFileData; + + /** "queue" of pending PKCS7 blocks that we couldn't parse + * until we parsed the .SF file */ + private ArrayList pendingBlocks; /* cache of CodeSigner objects */ private ArrayList signerCache; + /* Are we parsing a block? */ + private boolean parsingBlockOrSF = false; + + /* Are we done parsing META-INF entries? */ + private boolean parsingMeta = true; + /* Are there are files to verify? */ private boolean anyToVerify = true; + /* The output stream to use when keeping track of files we are interested + in */ + private ByteArrayOutputStream baos; + /** The ManifestDigester object */ private volatile ManifestDigester manDig; @@ -75,20 +92,20 @@ /** collect -DIGEST-MANIFEST values for blacklist */ private List manifestDigests; - /** The manifest object */ - Manifest man = null; - - public JarVerifier(byte rawBytes[], Manifest man) { - this.man = man; + public JarVerifier(byte rawBytes[]) { manifestRawBytes = rawBytes; - sigFileSigners = new HashMap(); - verifiedSigners = new HashMap(); + sigFileSigners = new Hashtable(); + verifiedSigners = new Hashtable(); + sigFileData = new Hashtable(11); + pendingBlocks = new ArrayList(); + baos = new ByteArrayOutputStream(); manifestDigests = new ArrayList(); } /** - * This method scans to see which entry we're parsing and keeps - * various state information depending on the file being parsed. + * This method scans to see which entry we're parsing and + * keeps various state information depending on what type of + * file is being parsed. */ public void beginEntry(JarEntry je, ManifestEntryVerifier mev) throws IOException @@ -112,6 +129,30 @@ * b. digest mismatch between the actual jar entry and the manifest */ + if (parsingMeta) { + String uname = name.toUpperCase(Locale.ENGLISH); + if ((uname.startsWith("META-INF/") || + uname.startsWith("/META-INF/"))) { + + if (je.isDirectory()) { + mev.setEntry(null, je); + return; + } + + if (SignatureFileVerifier.isBlockOrSF(uname)) { + /* We parse only DSA, RSA or EC PKCS7 blocks. */ + parsingBlockOrSF = true; + baos.reset(); + mev.setEntry(null, je); + } + return; + } + } + + if (parsingMeta) { + doneWithMeta(); + } + if (je.isDirectory()) { mev.setEntry(null, je); return; @@ -147,7 +188,11 @@ throws IOException { if (b != -1) { - mev.update((byte)b); + if (parsingBlockOrSF) { + baos.write(b); + } else { + mev.update((byte)b); + } } else { processEntry(mev); } @@ -162,7 +207,11 @@ throws IOException { if (n != -1) { - mev.update(b, off, n); + if (parsingBlockOrSF) { + baos.write(b, off, n); + } else { + mev.update(b, off, n); + } } else { processEntry(mev); } @@ -174,10 +223,101 @@ private void processEntry(ManifestEntryVerifier mev) throws IOException { - JarEntry je = mev.getEntry(); - if ((je != null) && (je.signers == null)) { - je.signers = mev.verify(verifiedSigners, sigFileSigners); - je.certs = mapSignersToCertArray(je.signers); + if (!parsingBlockOrSF) { + JarEntry je = mev.getEntry(); + if ((je != null) && (je.signers == null)) { + je.signers = mev.verify(verifiedSigners, sigFileSigners); + je.certs = mapSignersToCertArray(je.signers); + } + } else { + + try { + parsingBlockOrSF = false; + + if (debug != null) { + debug.println("processEntry: processing block"); + } + + String uname = mev.getEntry().getName() + .toUpperCase(Locale.ENGLISH); + + if (uname.endsWith(".SF")) { + String key = uname.substring(0, uname.length()-3); + byte bytes[] = baos.toByteArray(); + // add to sigFileData in case future blocks need it + sigFileData.put(key, bytes); + // check pending blocks, we can now process + // anyone waiting for this .SF file + Iterator it = pendingBlocks.iterator(); + while (it.hasNext()) { + SignatureFileVerifier sfv = + (SignatureFileVerifier) it.next(); + if (sfv.needSignatureFile(key)) { + if (debug != null) { + debug.println( + "processEntry: processing pending block"); + } + + sfv.setSignatureFile(bytes); + sfv.process(sigFileSigners, manifestDigests); + } + } + return; + } + + // now we are parsing a signature block file + + String key = uname.substring(0, uname.lastIndexOf(".")); + + if (signerCache == null) + signerCache = new ArrayList(); + + if (manDig == null) { + synchronized(manifestRawBytes) { + if (manDig == null) { + manDig = new ManifestDigester(manifestRawBytes); + manifestRawBytes = null; + } + } + } + + SignatureFileVerifier sfv = + new SignatureFileVerifier(signerCache, + manDig, uname, baos.toByteArray()); + + if (sfv.needSignatureFileBytes()) { + // see if we have already parsed an external .SF file + byte[] bytes = (byte[]) sigFileData.get(key); + + if (bytes == null) { + // put this block on queue for later processing + // since we don't have the .SF bytes yet + // (uname, block); + if (debug != null) { + debug.println("adding pending block"); + } + pendingBlocks.add(sfv); + return; + } else { + sfv.setSignatureFile(bytes); + } + } + sfv.process(sigFileSigners, manifestDigests); + + } catch (IOException ioe) { + // e.g. sun.security.pkcs.ParsingException + if (debug != null) debug.println("processEntry caught: "+ioe); + // ignore and treat as unsigned + } catch (SignatureException se) { + if (debug != null) debug.println("processEntry caught: "+se); + // ignore and treat as unsigned + } catch (NoSuchAlgorithmException nsae) { + if (debug != null) debug.println("processEntry caught: "+nsae); + // ignore and treat as unsigned + } catch (CertificateException ce) { + if (debug != null) debug.println("processEntry caught: "+ce); + // ignore and treat as unsigned + } } } @@ -214,15 +354,15 @@ * Force a read of the entry data to generate the * verification hash. */ - try (InputStream s = jar.getInputStream(entry)) { + try { + InputStream s = jar.getInputStream(entry); byte[] buffer = new byte[1024]; int n = buffer.length; while (n != -1) { n = s.read(buffer, 0, buffer.length); } + s.close(); } catch (IOException e) { - // Ignore. When an exception is thrown, code signer - // will not be assigned. } } return getCodeSigners(name); @@ -268,7 +408,11 @@ */ void doneWithMeta() { + parsingMeta = false; anyToVerify = !sigFileSigners.isEmpty(); + baos = null; + sigFileData = null; + pendingBlocks = null; signerCache = null; manDig = null; // MANIFEST.MF is always treated as signed and verified, @@ -279,41 +423,6 @@ } } - /** - * Verifies a PKCS7 SignedData block - * @param key name of block - * @param block the pkcs7 file - * @param ins the clear data - */ - void verifyBlock(String key, byte[] block, InputStream ins) { - try { - if (signerCache == null) - signerCache = new ArrayList(); - - if (manDig == null) { - synchronized(manifestRawBytes) { - if (manDig == null) { - manDig = new ManifestDigester(manifestRawBytes); - manifestRawBytes = null; - } - } - } - SignatureFileVerifier sfv = - new SignatureFileVerifier(signerCache, man, - manDig, key, block); - - if (sfv.needSignatureFile()) { - // see if we have already parsed an external .SF file - sfv.setSignatureFile(ins); - } - sfv.process(sigFileSigners, manifestDigests); - } catch (Exception e) { - if (debug != null) { - e.printStackTrace(); - } - } - } - static class VerifierStream extends java.io.InputStream { private InputStream is; @@ -444,7 +553,10 @@ * but this handles a CodeSource of any type, just in case. */ CodeSource[] sources = mapSignersToCodeSources(cs.getLocation(), getJarCodeSigners(), true); - List sourceList = Arrays.asList(sources); + List sourceList = new ArrayList(); + for (int i = 0; i < sources.length; i++) { + sourceList.add(sources[i]); + } int j = sourceList.indexOf(cs); if (j != -1) { CodeSigner[] match; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/regex/Pattern.java --- a/jdk/src/share/classes/java/util/regex/Pattern.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/regex/Pattern.java Sat May 14 11:52:15 2011 -0700 @@ -206,13 +206,15 @@ * <td>Equivalent to java.lang.Character.isMirrored()</td></tr> * * <tr><th> </th></tr> - * <tr align="left"><th colspan="2" id="unicode">Classes for Unicode scripts, blocks and categories</th></tr> + * <tr align="left"><th colspan="2" id="unicode">Classes for Unicode scripts, blocks, categories and binary properties</th></tr> * * <tr><td valign="top" headers="construct unicode"><tt>\p{IsLatin}</tt></td> - * <td headers="matches">A Latin script character (simple <a href="#ubc">script</a>)</td></tr> + * <td headers="matches">A Latin script character (<a href="#usc">script</a>)</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\p{InGreek}</tt></td> - * <td headers="matches">A character in the Greek block (simple <a href="#ubc">block</a>)</td></tr> + * <td headers="matches">A character in the Greek block (<a href="#ubc">block</a>)</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\p{Lu}</tt></td> - * <td headers="matches">An uppercase letter (simple <a href="#ubc">category</a>)</td></tr> + * <td headers="matches">An uppercase letter (<a href="#ucc">category</a>)</td></tr> + * <tr><td valign="top" headers="construct unicode"><tt>\p{isAlphabetic}</tt></td> + * <td headers="matches">An alphabetic character (<a href="#ubpc">binary property</a>)</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\p{Sc}</tt></td> * <td headers="matches">A currency symbol</td></tr> * <tr><td valign="top" headers="construct unicode"><tt>\P{InGreek}</tt></td> @@ -328,10 +330,11 @@ * <td headers="matches">X, as a named-capturing group</td></tr> * <tr><td valign="top" headers="construct special"><tt>(?:</tt>X<tt>)</tt></td> * <td headers="matches">X, as a non-capturing group</td></tr> - * <tr><td valign="top" headers="construct special"><tt>(?idmsux-idmsux) </tt></td> + * <tr><td valign="top" headers="construct special"><tt>(?idmsuxU-idmsuxU) </tt></td> * <td headers="matches">Nothing, but turns match flags <a href="#CASE_INSENSITIVE">i</a> * <a href="#UNIX_LINES">d</a> <a href="#MULTILINE">m</a> <a href="#DOTALL">s</a> - * <a href="#UNICODE_CASE">u</a> <a href="#COMMENTS">x</a> on - off</td></tr> + * <a href="#UNICODE_CASE">u</a> <a href="#COMMENTS">x</a> <a href="#UNICODE_CHARACTER_CLASS">U</a> + * on - off</td></tr> * <tr><td valign="top" headers="construct special"><tt>(?idmsux-idmsux:</tt>X<tt>)</tt> </td> * <td headers="matches">X, as a <a href="#cg">non-capturing group</a> with the * given flags <a href="#CASE_INSENSITIVE">i</a> <a href="#UNIX_LINES">d</a> @@ -518,61 +521,140 @@ * * This class is in conformance with Level 1 of <a * href="http://www.unicode.org/reports/tr18/">Unicode Technical - * Standard #18: Unicode Regular Expression Guidelines</a>, plus RL2.1 + * Standard #18: Unicode Regular Expression</a>, plus RL2.1 * Canonical Equivalents. - * - * Unicode escape sequences such as <tt>\u2014</tt> in Java source code + * + * Unicode escape sequences such as <tt>\u2014</tt> in Java source code * are processed as described in section 3.3 of * <cite>The Java™ Language Specification</cite>. - * Such escape sequences are also - * implemented directly by the regular-expression parser so that Unicode - * escapes can be used in expressions that are read from files or from the - * keyboard. Thus the strings <tt>"\u2014"</tt> and <tt>"\\u2014"</tt>, - * while not equal, compile into the same pattern, which matches the character - * with hexadecimal value <tt>0x2014</tt>. - * - * A Unicode character can also be represented in a regular-expression by - * using its hexadecimal code point value directly as described in construct + * Such escape sequences are also implemented directly by the regular-expression + * parser so that Unicode escapes can be used in expressions that are read from + * files or from the keyboard. Thus the strings <tt>"\u2014"</tt> and + * <tt>"\\u2014"</tt>, while not equal, compile into the same pattern, which + * matches the character with hexadecimal value <tt>0x2014</tt>. + * + * A Unicode character can also be represented in a regular-expression by + * using its Hex notation(hexadecimal code point value) directly as described in construct * <tt>\x{...}</tt>, for example a supplementary character U+2011F * can be specified as <tt>\x{2011F}</tt>, instead of two consecutive * Unicode escape sequences of the surrogate pair * <tt>\uD840</tt><tt>\uDD1F</tt>. - * - * <a name="ubc"> - * Unicode scripts, blocks and categories are written with the <tt>\p</tt> and - * <tt>\P</tt> constructs as in Perl. <tt>\p{</tt>prop<tt>}</tt> matches if + * + * Unicode scripts, blocks, categories and binary properties are written with + * the <tt>\p</tt> and <tt>\P</tt> constructs as in Perl. + * <tt>\p{</tt>prop<tt>}</tt> matches if * the input has the property prop, while <tt>\P{</tt>prop<tt>}</tt> * does not match if the input has that property. * - * Scripts are specified either with the prefix {@code Is}, as in + * Scripts, blocks, categories and binary properties can be used both inside + * and outside of a character class. + * <a name="usc"> + * + * Scripts are specified either with the prefix {@code Is}, as in * {@code IsHiragana}, or by using the {@code script} keyword (or its short * form {@code sc})as in {@code script=Hiragana} or {@code sc=Hiragana}. * - * Blocks are specified with the prefix {@code In}, as in + * The script names supported by <code>Pattern</code> are the valid script names + * accepted and defined by + * {@link java.lang.Character.UnicodeScript#forName(String) UnicodeScript.forName}. + * <a name="ubc"> + * + * Blocks are specified with the prefix {@code In}, as in * {@code InMongolian}, or by using the keyword {@code block} (or its short * form {@code blk}) as in {@code block=Mongolian} or {@code blk=Mongolian}. * - * Categories may be specified with the optional prefix {@code Is}: + * The block names supported by <code>Pattern</code> are the valid block names + * accepted and defined by + * {@link java.lang.Character.UnicodeBlock#forName(String) UnicodeBlock.forName}. + * + * <a name="ucc"> + * Categories may be specified with the optional prefix {@code Is}: * Both {@code \p{L}} and {@code \p{IsL}} denote the category of Unicode * letters. Same as scripts and blocks, categories can also be specified * by using the keyword {@code general_category} (or its short form * {@code gc}) as in {@code general_category=Lu} or {@code gc=Lu}. * - * Scripts, blocks and categories can be used both inside and outside of a - * character class. - * The supported categories are those of + * The supported categories are those of * <a href="http://www.unicode.org/unicode/standard/standard.html"> * The Unicode Standard</a> in the version specified by the * {@link java.lang.Character Character} class. The category names are those * defined in the Standard, both normative and informative. - * The script names supported by <code>Pattern</code> are the valid script names - * accepted and defined by - * {@link java.lang.Character.UnicodeScript#forName(String) UnicodeScript.forName}. - * The block names supported by <code>Pattern</code> are the valid block names - * accepted and defined by - * {@link java.lang.Character.UnicodeBlock#forName(String) UnicodeBlock.forName}. + * + * <a name="ubpc"> + * Binary properties are specified with the prefix {@code Is}, as in + * {@code IsAlphabetic}. The supported binary properties by <code>Pattern</code> + * are + * <ul> + * <li> Alphabetic + * <li> Ideographic + * <li> Letter + * <li> Lowercase + * <li> Uppercase + * <li> Titlecase + * <li> Punctuation + * <Li> Control + * <li> White_Space + * <li> Digit + * <li> Hex_Digit + * <li> Noncharacter_Code_Point + * <li> Assigned + * </ul> + + + * + * Predefined Character classes and POSIX character classes are in + * conformance with the recommendation of Annex C: Compatibility Properties + * of <a href="http://www.unicode.org/reports/tr18/">Unicode Regular Expression + * </a>, when {@link #UNICODE_CHARACTER_CLASS} flag is specified. * - * <a name="jcc"> Categories that behave like the java.lang.Character + * <table border="0" cellpadding="1" cellspacing="0" + * summary="predefined and posix character classes in Unicode mode"> + * <tr align="left"> + * <th bgcolor="#CCCCFF" align="left" id="classes">Classes</th> + * <th bgcolor="#CCCCFF" align="left" id="matches">Matches</th> + *</tr> + * <tr><td><tt>\p{Lower}</tt></td> + * <td>A lowercase character:<tt>\p{IsLowercase}</tt></td></tr> + * <tr><td><tt>\p{Upper}</tt></td> + * <td>An uppercase character:<tt>\p{IsUppercase}</tt></td></tr> + * <tr><td><tt>\p{ASCII}</tt></td> + * <td>All ASCII:<tt>[\x00-\x7F]</tt></td></tr> + * <tr><td><tt>\p{Alpha}</tt></td> + * <td>An alphabetic character:<tt>\p{IsAlphabetic}</tt></td></tr> + * <tr><td><tt>\p{Digit}</tt></td> + * <td>A decimal digit character:<tt>p{IsDigit}</tt></td></tr> + * <tr><td><tt>\p{Alnum}</tt></td> + * <td>An alphanumeric character:<tt>[\p{IsAlphabetic}\p{IsDigit}]</tt></td></tr> + * <tr><td><tt>\p{Punct}</tt></td> + * <td>A punctuation character:<tt>p{IsPunctuation}</tt></td></tr> + * <tr><td><tt>\p{Graph}</tt></td> + * <td>A visible character: <tt>[^\p{IsWhite_Space}\p{gc=Cc}\p{gc=Cs}\p{gc=Cn}]</tt></td></tr> + * <tr><td><tt>\p{Print}</tt></td> + * <td>A printable character: <tt>[\p{Graph}\p{Blank}&&[^\p{Cntrl}]]</tt></td></tr> + * <tr><td><tt>\p{Blank}</tt></td> + * <td>A space or a tab: <tt>[\p{IsWhite_Space}&&[^\p{gc=Zl}\p{gc=Zp}\x0a\x0b\x0c\x0d\x85]]</tt></td></tr> + * <tr><td><tt>\p{Cntrl}</tt></td> + * <td>A control character: <tt>\p{gc=Cc}</tt></td></tr> + * <tr><td><tt>\p{XDigit}</tt></td> + * <td>A hexadecimal digit: <tt>[\p{gc=Nd}\p{IsHex_Digit}]</tt></td></tr> + * <tr><td><tt>\p{Space}</tt></td> + * <td>A whitespace character:<tt>\p{IsWhite_Space}</tt></td></tr> + * <tr><td><tt>\d</tt></td> + * <td>A digit: <tt>\p{IsDigit}</tt></td></tr> + * <tr><td><tt>\D</tt></td> + * <td>A non-digit: <tt>[^\d]</tt></td></tr> + * <tr><td><tt>\s</tt></td> + * <td>A whitespace character: <tt>\p{IsWhite_Space}</tt></td></tr> + * <tr><td><tt>\S</tt></td> + * <td>A non-whitespace character: <tt>[^\s]</tt></td></tr> + * <tr><td><tt>\w</tt></td> + * <td>A word character: <tt>[\p{Alpha}\p{gc=Mn}\p{gc=Me}\p{gc=Mc}\p{Digit}\p{gc=Pc}]</tt></td></tr> + * <tr><td><tt>\W</tt></td> + * <td>A non-word character: <tt>[^\w]</tt></td></tr> + * </table> + * + * <a name="jcc"> + * Categories that behave like the java.lang.Character * boolean ismethodname methods (except for the deprecated ones) are * available through the same <tt>\p{</tt>prop<tt>}</tt> syntax where * the specified property has the name <tt>javamethodname</tt>. @@ -585,8 +667,30 @@ * Perl constructs not supported by this class: * * <ul> + * <li> Predefined character classes (Unicode character) + * <tt>\h </tt>A horizontal whitespace + * <tt>\H </tt>A non horizontal whitespace + * <tt>\v </tt>A vertical whitespace + * <tt>\V </tt>A non vertical whitespace + * <tt>\R </tt>Any Unicode linebreak sequence + * <tt>\u005cu000D\u005cu000A|[\u005cu000A\u005cu000B\u005cu000C\u005cu000D\u005cu0085\u005cu2028\u005cu2029]</tt> + * <tt>\X </tt>Match Unicode + * <a href="http://www.unicode.org/reports/tr18/#Default_Grapheme_Clusters"> + * extended grapheme cluster</a> + * </li> * - * <li> The conditional constructs <tt>(?{</tt>X<tt>})</tt> and + * <li> The backreference constructs, <tt>\g{</tt>n<tt>}</tt> for + * the nth<a href="#cg">capturing group</a> and + * <tt>\g{</tt>name<tt>}</tt> for + * <a href="#groupname">named-capturing group</a>. + * </li> + * + * <li> The named character construct, <tt>\N{</tt>name<tt>}</tt> + * for a Unicode character by its name. + * </li> + * + * <li> The conditional constructs + * <tt>(?(</tt>condition<tt>)</tt>X<tt>)</tt> and * <tt>(?(</tt>condition<tt>)</tt>X<tt>|</tt>Y<tt>)</tt>, * </li> * @@ -604,10 +708,6 @@ * * <ul> * - * <li> Possessive quantifiers, which greedily match as much as they can - * and do not back off, even when doing so would allow the overall match to - * succeed. </li> - * * <li> Character-class union and intersection as described * <a href="#cc">above</a>.</li> * @@ -641,13 +741,6 @@ * within a group; in the latter case, flags are restored at the end of the * group just as in Perl. </li> * - * <li> Perl is forgiving about malformed matching constructs, as in the - * expression <tt>*a</tt>, as well as dangling brackets, as in the - * expression <tt>abc]</tt>, and treats them as literals. This - * class also accepts dangling brackets but is strict about dangling - * metacharacters like +, ? and *, and will throw a - * {@link PatternSyntaxException} if it encounters them. </li> - * * </ul> * * @@ -796,6 +889,28 @@ */ public static final int CANON_EQ = 0x80; + /** + * Enables the Unicode version of Predefined character classes and + * POSIX character classes. + * + * When this flag is specified then the (US-ASCII only) + * Predefined character classes and POSIX character classes + * are in conformance with + * <a href="http://www.unicode.org/reports/tr18/">Unicode Technical + * Standard #18: Unicode Regular Expression</a> + * Annex C: Compatibility Properties. + * + * The UNICODE_CHARACTER_CLASS mode can also be enabled via the embedded + * flag expression <tt>(?U)</tt>. + * + * The flag implies UNICODE_CASE, that is, it enables Unicode-aware case + * folding. + * + * Specifying this flag may impose a performance penalty. + * @since 1.7 + */ + public static final int UNICODE_CHARACTER_CLASS = 0x100; + /* Pattern has only two serialized components: The pattern string * and the flags, which are all that is needed to recompile the pattern * when it is deserialized. @@ -918,7 +1033,8 @@ * Match flags, a bit mask that may include * {@link #CASE_INSENSITIVE}, {@link #MULTILINE}, {@link #DOTALL}, * {@link #UNICODE_CASE}, {@link #CANON_EQ}, {@link #UNIX_LINES}, - * {@link #LITERAL} and {@link #COMMENTS} + * {@link #LITERAL}, {@link #UNICODE_CHARACTER_CLASS} + * and {@link #COMMENTS} * * @throws IllegalArgumentException * If bit values other than those corresponding to the defined @@ -1209,6 +1325,10 @@ pattern = p; flags = f; + // to use UNICODE_CASE if UNICODE_CHARACTER_CLASS present + if ((flags & UNICODE_CHARACTER_CLASS) != 0) + flags |= UNICODE_CASE; + // Reset group index count capturingGroupCount = 1; localCount = 0; @@ -2164,12 +2284,14 @@ return -1; case 'B': if (inclass) break; - if (create) root = new Bound(Bound.NONE); + if (create) root = new Bound(Bound.NONE, has(UNICODE_CHARACTER_CLASS)); return -1; case 'C': break; case 'D': - if (create) root = new Ctype(ASCII.DIGIT).complement(); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.DIGIT).complement() + : new Ctype(ASCII.DIGIT).complement(); return -1; case 'E': case 'F': @@ -2191,14 +2313,18 @@ case 'R': break; case 'S': - if (create) root = new Ctype(ASCII.SPACE).complement(); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WHITE_SPACE).complement() + : new Ctype(ASCII.SPACE).complement(); return -1; case 'T': case 'U': case 'V': break; case 'W': - if (create) root = new Ctype(ASCII.WORD).complement(); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WORD).complement() + : new Ctype(ASCII.WORD).complement(); return -1; case 'X': case 'Y': @@ -2216,12 +2342,14 @@ return '\007'; case 'b': if (inclass) break; - if (create) root = new Bound(Bound.BOTH); + if (create) root = new Bound(Bound.BOTH, has(UNICODE_CHARACTER_CLASS)); return -1; case 'c': return c(); case 'd': - if (create) root = new Ctype(ASCII.DIGIT); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.DIGIT) + : new Ctype(ASCII.DIGIT); return -1; case 'e': return '\033'; @@ -2259,7 +2387,9 @@ case 'r': return '\r'; case 's': - if (create) root = new Ctype(ASCII.SPACE); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WHITE_SPACE) + : new Ctype(ASCII.SPACE); return -1; case 't': return '\t'; @@ -2268,7 +2398,9 @@ case 'v': return '\013'; case 'w': - if (create) root = new Ctype(ASCII.WORD); + if (create) root = has(UNICODE_CHARACTER_CLASS) + ? new Utype(UnicodeProp.WORD) + : new Ctype(ASCII.WORD); return -1; case 'x': return x(); @@ -2490,7 +2622,7 @@ { next(); String name; - CharProperty node; + CharProperty node = null; if (singleLetter) { int c = temp[cursor]; @@ -2536,11 +2668,21 @@ } else if (name.startsWith("Is")) { // \p{isGeneralCategory} and \p{isScriptName} name = name.substring(2); - node = CharPropertyNames.charPropertyFor(name); + UnicodeProp uprop = UnicodeProp.forName(name); + if (uprop != null) + node = new Utype(uprop); + if (node == null) + node = CharPropertyNames.charPropertyFor(name); if (node == null) node = unicodeScriptPropertyFor(name); } else { - node = charPropertyNodeFor(name); + if (has(UNICODE_CHARACTER_CLASS)) { + UnicodeProp uprop = UnicodeProp.forPOSIXName(name); + if (uprop != null) + node = new Utype(uprop); + } + if (node == null) + node = charPropertyNodeFor(name); } } if (maybeComplement) { @@ -2822,6 +2964,9 @@ case 'x': flags |= COMMENTS; break; + case 'U': + flags |= (UNICODE_CHARACTER_CLASS | UNICODE_CASE); + break; case '-': // subFlag then fall through ch = next(); subFlag(); @@ -2861,6 +3006,8 @@ case 'x': flags &= ~COMMENTS; break; + case 'U': + flags &= ~(UNICODE_CHARACTER_CLASS | UNICODE_CASE); default: return; } @@ -3664,6 +3811,18 @@ } /** + * Node class that matches a Unicode "type" + */ + static final class Utype extends CharProperty { + final UnicodeProp uprop; + Utype(UnicodeProp uprop) { this.uprop = uprop; } + boolean isSatisfiedBy(int ch) { + return uprop.is(ch); + } + } + + + /** * Node class that matches a POSIX type. */ static final class Ctype extends BmpCharProperty { @@ -5025,9 +5184,17 @@ static int BOTH = 0x3; static int NONE = 0x4; int type; - Bound(int n) { + boolean useUWORD; + Bound(int n, boolean useUWORD) { type = n; - } + this.useUWORD = useUWORD; + } + + boolean isWord(int ch) { + return useUWORD ? UnicodeProp.WORD.is(ch) + : (ch == '_' || Character.isLetterOrDigit(ch)); + } + int check(Matcher matcher, int i, CharSequence seq) { int ch; boolean left = false; @@ -5039,14 +5206,14 @@ } if (i > startIndex) { ch = Character.codePointBefore(seq, i); - left = (ch == '_' || Character.isLetterOrDigit(ch) || + left = (isWord(ch) || ((Character.getType(ch) == Character.NON_SPACING_MARK) && hasBaseCharacter(matcher, i-1, seq))); } boolean right = false; if (i < endIndex) { ch = Character.codePointAt(seq, i); - right = (ch == '_' || Character.isLetterOrDigit(ch) || + right = (isWord(ch) || ((Character.getType(ch) == Character.NON_SPACING_MARK) && hasBaseCharacter(matcher, i, seq))); } else { @@ -5428,6 +5595,12 @@ defClone("javaUpperCase", new CloneableProperty() { boolean isSatisfiedBy(int ch) { return Character.isUpperCase(ch);}}); + defClone("javaAlphabetic", new CloneableProperty() { + boolean isSatisfiedBy(int ch) { + return Character.isAlphabetic(ch);}}); + defClone("javaIdeographic", new CloneableProperty() { + boolean isSatisfiedBy(int ch) { + return Character.isIdeographic(ch);}}); defClone("javaTitleCase", new CloneableProperty() { boolean isSatisfiedBy(int ch) { return Character.isTitleCase(ch);}}); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/regex/UnicodeProp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/java/util/regex/UnicodeProp.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,236 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package java.util.regex; + +import java.util.HashMap; +import java.util.Locale; + +enum UnicodeProp { + + ALPHABETIC { + public boolean is(int ch) { + return Character.isAlphabetic(ch); + } + }, + + LETTER { + public boolean is(int ch) { + return Character.isLetter(ch); + } + }, + + IDEOGRAPHIC { + public boolean is(int ch) { + return Character.isIdeographic(ch); + } + }, + + LOWERCASE { + public boolean is(int ch) { + return Character.isLowerCase(ch); + } + }, + + UPPERCASE { + public boolean is(int ch) { + return Character.isUpperCase(ch); + } + }, + + TITLECASE { + public boolean is(int ch) { + return Character.isTitleCase(ch); + } + }, + + WHITE_SPACE { + // \p{Whitespace} + public boolean is(int ch) { + return ((((1 << Character.SPACE_SEPARATOR) | + (1 << Character.LINE_SEPARATOR) | + (1 << Character.PARAGRAPH_SEPARATOR)) >> Character.getType(ch)) & 1) + != 0 || (ch >= 0x9 && ch <= 0xd) || (ch == 0x85); + } + }, + + CONTROL { + // \p{gc=Control} + public boolean is(int ch) { + return Character.getType(ch) == Character.CONTROL; + } + }, + + PUNCTUATION { + // \p{gc=Punctuation} + public boolean is(int ch) { + return ((((1 << Character.CONNECTOR_PUNCTUATION) | + (1 << Character.DASH_PUNCTUATION) | + (1 << Character.START_PUNCTUATION) | + (1 << Character.END_PUNCTUATION) | + (1 << Character.OTHER_PUNCTUATION) | + (1 << Character.INITIAL_QUOTE_PUNCTUATION) | + (1 << Character.FINAL_QUOTE_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0; + } + }, + + HEX_DIGIT { + // \p{gc=Decimal_Number} + // \p{Hex_Digit} -> PropList.txt: Hex_Digit + public boolean is(int ch) { + return DIGIT.is(ch) || + (ch >= 0x0030 && ch <= 0x0039) || + (ch >= 0x0041 && ch <= 0x0046) || + (ch >= 0x0061 && ch <= 0x0066) || + (ch >= 0xFF10 && ch <= 0xFF19) || + (ch >= 0xFF21 && ch <= 0xFF26) || + (ch >= 0xFF41 && ch <= 0xFF46); + } + }, + + ASSIGNED { + public boolean is(int ch) { + return Character.getType(ch) != Character.UNASSIGNED; + } + }, + + NONCHARACTER_CODE_POINT { + // PropList.txt:Noncharacter_Code_Point + public boolean is(int ch) { + return (ch & 0xfffe) == 0xfffe || (ch >= 0xfdd0 && ch <= 0xfdef); + } + }, + + DIGIT { + // \p{gc=Decimal_Number} + public boolean is(int ch) { + return Character.isDigit(ch); + } + }, + + ALNUM { + // \p{alpha} + // \p{digit} + public boolean is(int ch) { + return ALPHABETIC.is(ch) || DIGIT.is(ch); + } + }, + + BLANK { + // \p{Whitespace} -- + // [\N{LF} \N{VT} \N{FF} \N{CR} \N{NEL} -> 0xa, 0xb, 0xc, 0xd, 0x85 + // \p{gc=Line_Separator} + // \p{gc=Paragraph_Separator}] + public boolean is(int ch) { + return Character.getType(ch) == Character.SPACE_SEPARATOR || + ch == 0x9; // \N{HT} + } + }, + + GRAPH { + // [^ + // \p{space} + // \p{gc=Control} + // \p{gc=Surrogate} + // \p{gc=Unassigned}] + public boolean is(int ch) { + return ((((1 << Character.SPACE_SEPARATOR) | + (1 << Character.LINE_SEPARATOR) | + (1 << Character.PARAGRAPH_SEPARATOR) | + (1 << Character.CONTROL) | + (1 << Character.SURROGATE) | + (1 << Character.UNASSIGNED)) >> Character.getType(ch)) & 1) + == 0; + } + }, + + PRINT { + // \p{graph} + // \p{blank} + // -- \p{cntrl} + public boolean is(int ch) { + return (GRAPH.is(ch) || BLANK.is(ch)) && !CONTROL.is(ch); + } + }, + + WORD { + // \p{alpha} + // \p{gc=Mark} + // \p{digit} + // \p{gc=Connector_Punctuation} + + public boolean is(int ch) { + return ALPHABETIC.is(ch) || + ((((1 << Character.NON_SPACING_MARK) | + (1 << Character.ENCLOSING_MARK) | + (1 << Character.COMBINING_SPACING_MARK) | + (1 << Character.DECIMAL_DIGIT_NUMBER) | + (1 << Character.CONNECTOR_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0; + } + }; + + private final static HashMap<String, String> posix = new HashMap<>(); + private final static HashMap<String, String> aliases = new HashMap<>(); + static { + posix.put("ALPHA", "ALPHABETIC"); + posix.put("LOWER", "LOWERCASE"); + posix.put("UPPER", "UPPERCASE"); + posix.put("SPACE", "WHITE_SPACE"); + posix.put("PUNCT", "PUNCTUATION"); + posix.put("XDIGIT","HEX_DIGIT"); + posix.put("ALNUM", "ALNUM"); + posix.put("CNTRL", "CONTROL"); + posix.put("DIGIT", "DIGIT"); + posix.put("BLANK", "BLANK"); + posix.put("GRAPH", "GRAPH"); + posix.put("PRINT", "PRINT"); + + aliases.put("WHITESPACE", "WHITE_SPACE"); + aliases.put("HEXDIGIT","HEX_DIGIT"); + aliases.put("NONCHARACTERCODEPOINT", "NONCHARACTER_CODE_POINT"); + } + + public static UnicodeProp forName(String propName) { + propName = propName.toUpperCase(Locale.ENGLISH); + String alias = aliases.get(propName); + if (alias != null) + propName = alias; + try { + return valueOf (propName); + } catch (IllegalArgumentException x) {} + return null; + } + + public static UnicodeProp forPOSIXName(String propName) { + propName = posix.get(propName.toUpperCase(Locale.ENGLISH)); + if (propName == null) + return null; + return valueOf (propName); + } + + public abstract boolean is(int ch); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipCoder.java --- a/jdk/src/share/classes/java/util/zip/ZipCoder.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipCoder.java Sat May 14 11:52:15 2011 -0700 @@ -28,11 +28,14 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; import java.nio.charset.CodingErrorAction; import java.util.Arrays; +import sun.nio.cs.ArrayDecoder; +import sun.nio.cs.ArrayEncoder; /** * Utility class for zipfile name and comment decoding and encoding @@ -46,6 +49,15 @@ char[] ca = new char[len]; if (len == 0) return new String(ca); + // UTF-8 only for now. Other ArrayDeocder only handles + // CodingErrorAction.REPLACE mode. ZipCoder uses + // REPORT mode. + if (isUTF8 && cd instanceof ArrayDecoder) { + int clen = ((ArrayDecoder)cd).decode(ba, 0, length, ca); + if (clen == -1) // malformed + throw new IllegalArgumentException("MALFORMED"); + return new String(ca, 0, clen); + } ByteBuffer bb = ByteBuffer.wrap(ba, 0, length); CharBuffer cb = CharBuffer.wrap(ca); CoderResult cr = cd.decode(bb, cb, true); @@ -68,6 +80,14 @@ byte[] ba = new byte[len]; if (len == 0) return ba; + // UTF-8 only for now. Other ArrayDeocder only handles + // CodingErrorAction.REPLACE mode. + if (isUTF8 && ce instanceof ArrayEncoder) { + int blen = ((ArrayEncoder)ce).encode(ca, 0, ca.length, ba); + if (blen == -1) // malformed + throw new IllegalArgumentException("MALFORMED"); + return Arrays.copyOf(ba, blen); + } ByteBuffer bb = ByteBuffer.wrap(ba); CharBuffer cb = CharBuffer.wrap(ca); CoderResult cr = ce.encode(cb, bb, true); @@ -84,35 +104,35 @@ // assume invoked only if "this" is not utf8 byte[] getBytesUTF8(String s) { - if (isutf8) + if (isUTF8) return getBytes(s); if (utf8 == null) - utf8 = new ZipCoder(Charset.forName("UTF-8")); + utf8 = new ZipCoder(StandardCharset.UTF_8); return utf8.getBytes(s); } String toStringUTF8(byte[] ba, int len) { - if (isutf8) + if (isUTF8) return toString(ba, len); if (utf8 == null) - utf8 = new ZipCoder(Charset.forName("UTF-8")); + utf8 = new ZipCoder(StandardCharset.UTF_8); return utf8.toString(ba, len); } boolean isUTF8() { - return isutf8; + return isUTF8; } private Charset cs; private CharsetDecoder dec; private CharsetEncoder enc; - private boolean isutf8; + private boolean isUTF8; private ZipCoder utf8; private ZipCoder(Charset cs) { this.cs = cs; - this.isutf8 = cs.name().equals("UTF-8"); + this.isUTF8 = cs.name().equals(StandardCharset.UTF_8.name()); } static ZipCoder get(Charset charset) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipFile.java --- a/jdk/src/share/classes/java/util/zip/ZipFile.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipFile.java Sat May 14 11:52:15 2011 -0700 @@ -31,6 +31,7 @@ import java.io.EOFException; import java.io.File; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import java.util.ArrayDeque; import java.util.Deque; import java.util.Enumeration; @@ -140,7 +141,7 @@ * @since 1.3 */ public ZipFile(File file, int mode) throws IOException { - this(file, mode, Charset.forName("UTF-8")); + this(file, mode, StandardCharset.UTF_8); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipInputStream.java --- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,7 @@ import java.io.EOFException; import java.io.PushbackInputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import static java.util.zip.ZipConstants64.*; /** @@ -75,7 +76,7 @@ * @param in the actual input stream */ public ZipInputStream(InputStream in) { - this(in, Charset.forName("UTF-8")); + this(in, StandardCharset.UTF_8); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/java/util/zip/ZipOutputStream.java --- a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/java/util/zip/ZipOutputStream.java Sat May 14 11:52:15 2011 -0700 @@ -28,6 +28,7 @@ import java.io.OutputStream; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharset; import java.util.Vector; import java.util.HashSet; import static java.util.zip.ZipConstants64.*; @@ -100,7 +101,7 @@ * @param out the actual output stream */ public ZipOutputStream(OutputStream out) { - this(out, Charset.forName("UTF-8")); + this(out, StandardCharset.UTF_8); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.security.auth.kerberos; + +import sun.misc.JavaxSecurityAuthKerberosAccess; +import sun.security.krb5.EncryptionKey; +import sun.security.krb5.PrincipalName; + +class JavaxSecurityAuthKerberosAccessImpl + implements JavaxSecurityAuthKerberosAccess { + public EncryptionKey[] keyTabGetEncryptionKeys( + KeyTab ktab, PrincipalName principal) { + return ktab.getEncryptionKeys(principal); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java --- a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -35,14 +35,16 @@ * principal. * * All Kerberos JAAS login modules that obtain a principal's password and - * generate the secret key from it should use this class. Where available, - * the login module might even read this secret key directly from a - * Kerberos "keytab". Sometimes, such as when authenticating a server in + * generate the secret key from it should use this class. + * Sometimes, such as when authenticating a server in * the absence of user-to-user authentication, the login module will store * an instance of this class in the private credential set of a * {@link javax.security.auth.Subject Subject} during the commit phase of the * authentication process. * + * A Kerberos service using a keytab to read secret keys should use + * the {@link KeyTab} class, where latest keys can be read when needed. + * * It might be necessary for the application to be granted a * {@link javax.security.auth.PrivateCredentialPermission * PrivateCredentialPermission} if it needs to access the KerberosKey diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,230 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.security.auth.kerberos; + +import java.io.File; +import java.util.Objects; +import sun.misc.SharedSecrets; +import sun.security.krb5.EncryptionKey; +import sun.security.krb5.PrincipalName; +import sun.security.krb5.RealmException; + +/** + * This class encapsulates a keytab file. + * + * A Kerberos JAAS login module that obtains long term secret keys from a + * keytab file should use this class. The login module will store + * an instance of this class in the private credential set of a + * {@link javax.security.auth.Subject Subject} during the commit phase of the + * authentication process. + * + * It might be necessary for the application to be granted a + * {@link javax.security.auth.PrivateCredentialPermission + * PrivateCredentialPermission} if it needs to access the KeyTab + * instance from a Subject. This permission is not needed when the + * application depends on the default JGSS Kerberos mechanism to access the + * KeyTab. In that case, however, the application will need an appropriate + * {@link javax.security.auth.kerberos.ServicePermission ServicePermission}. + * + * The keytab file format is described at + * <a href="http://www.ioplex.com/utilities/keytab.txt"> + * http://www.ioplex.com/utilities/keytab.txt</a>. + * + * @since 1.7 + */ +public final class KeyTab { + + /* + * Impl notes: + * + * This class is only a name, a permanent link to the keytab source + * (can be missing). Itself has no content. In order to read content, + * take a snapshot and read from it. + * + * The snapshot is of type sun.security.krb5.internal.ktab.KeyTab, which + * contains the content of the keytab file when the snapshot is taken. + * Itself has no refresh function and mostly an immutable class (except + * for the create/add/save methods only used by the ktab command). + */ + + // Source, null if using the default one. Note that the default name + // is maintained in snapshot, this field is never "resolved". + private final File file; + + // Set up JavaxSecurityAuthKerberosAccess in SharedSecrets + static { + SharedSecrets.setJavaxSecurityAuthKerberosAccess( + new JavaxSecurityAuthKerberosAccessImpl()); + } + + private KeyTab(File file) { + this.file = file; + } + + /** + * Returns a {@code KeyTab} instance from a {@code File} object. + * + * The result of this method is never null. This method only associates + * the returned {@code KeyTab} object with the file and does not read it. + * @param file the keytab {@code File} object, must not be null + * @return the keytab instance + * @throws NullPointerException if the {@code file} argument is null + */ + public static KeyTab getInstance(File file) { + if (file == null) { + throw new NullPointerException("file must be non null"); + } + return new KeyTab(file); + } + + /** + * Returns the default {@code KeyTab} instance. + * + * The result of this method is never null. This method only associates + * the returned {@code KeyTab} object with the default keytab file and + * does not read it. + * @return the default keytab instance. + */ + public static KeyTab getInstance() { + return new KeyTab(null); + } + + //Takes a snapshot of the keytab content + private sun.security.krb5.internal.ktab.KeyTab takeSnapshot() { + return sun.security.krb5.internal.ktab.KeyTab.getInstance(file); + } + + /** + * Returns fresh keys for the given Kerberos principal. + * + * Implementation of this method should make sure the returned keys match + * the latest content of the keytab file. The result is a newly created + * copy that can be modified by the caller without modifying the keytab + * object. The caller should {@link KerberosKey#destroy() destroy} the + * result keys after they are used. + * + * Please note that the keytab file can be created after the + * {@code KeyTab} object is instantiated and its content may change over + * time. Therefore, an application should call this method only when it + * needs to use the keys. Any previous result from an earlier invocation + * could potentially be expired. + * + * If there is any error (say, I/O error or format error) + * during the reading process of the KeyTab file, a saved result should be + * returned. If there is no saved result (say, this is the first time this + * method is called, or, all previous read attempts failed), an empty array + * should be returned. This can make sure the result is not drastically + * changed during the (probably slow) update of the keytab file. + * + * Each time this method is called and the reading of the file succeeds + * with no exception (say, I/O error or file format error), + * the result should be saved for {@code principal}. The implementation can + * also save keys for other principals having keys in the same keytab object + * if convenient. + * + * Any unsupported key read from the keytab is ignored and not included + * in the result. + * + * @param principal the Kerberos principal, must not be null. + * @return the keys (never null, may be empty) + * @throws NullPointerException if the {@code principal} + * argument is null + * @throws SecurityException if a security manager exists and the read + * access to the keytab file is not permitted + */ + public KerberosKey[] getKeys(KerberosPrincipal principal) { + try { + EncryptionKey[] keys = takeSnapshot().readServiceKeys( + new PrincipalName(principal.getName())); + KerberosKey[] kks = new KerberosKey[keys.length]; + for (int i=0; i<kks.length; i++) { + Integer tmp = keys[i].getKeyVersionNumber(); + kks[i] = new KerberosKey( + principal, + keys[i].getBytes(), + keys[i].getEType(), + tmp == null ? 0 : tmp.intValue()); + keys[i].destroy(); + } + return kks; + } catch (RealmException re) { + return new KerberosKey[0]; + } + } + + EncryptionKey[] getEncryptionKeys(PrincipalName principal) { + return takeSnapshot().readServiceKeys(principal); + } + + /** + * Checks if the keytab file exists. Implementation of this method + * should make sure that the result matches the latest status of the + * keytab file. + * + * The caller can use the result to determine if it should fallback to + * another mechanism to read the keys. + * @return true if the keytab file exists; false otherwise. + * @throws SecurityException if a security manager exists and the read + * access to the keytab file is not permitted + */ + public boolean exists() { + return !takeSnapshot().isMissing(); + } + + public String toString() { + return file == null ? "Default keytab" : file.toString(); + } + + /** + * Returns a hashcode for this KeyTab. + * + * @return a hashCode() for the <code>KeyTab</code> + */ + public int hashCode() { + return Objects.hash(file); + } + + /** + * Compares the specified Object with this KeyTab for equality. + * Returns true if the given object is also a + * <code>KeyTab</code> and the two + * <code>KeyTab</code> instances are equivalent. + * + * @param other the Object to compare to + * @return true if the specified object is equal to this KeyTab + */ + public boolean equals(Object other) { + if (other == this) + return true; + + if (! (other instanceof KeyTab)) { + return false; + } + + KeyTab otherKtab = (KeyTab) other; + return Objects.equals(otherKtab.file, file); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/swing/JPopupMenu.java --- a/jdk/src/share/classes/javax/swing/JPopupMenu.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java Sat May 14 11:52:15 2011 -0700 @@ -342,8 +342,8 @@ // Calculate the screen size that popup should fit Dimension popupSize = JPopupMenu.this.getPreferredSize(); - int popupRightX = popupLocation.x + popupSize.width; - int popupBottomY = popupLocation.y + popupSize.height; + long popupRightX = (long)popupLocation.x + (long)popupSize.width; + long popupBottomY = (long)popupLocation.y + (long)popupSize.height; int scrWidth = scrBounds.width; int scrHeight = scrBounds.height; if (!canPopupOverlapTaskBar()) { @@ -358,13 +358,13 @@ int scrBottomY = scrBounds.y + scrHeight; // Ensure that popup menu fits the screen - if (popupRightX > scrRightX) { + if (popupRightX > (long)scrRightX) { popupLocation.x = scrRightX - popupSize.width; if( popupLocation.x < scrBounds.x ) { popupLocation.x = scrBounds.x ; } } - if (popupBottomY > scrBottomY) { + if (popupBottomY > (long)scrBottomY) { popupLocation.y = scrBottomY - popupSize.height; if( popupLocation.y < scrBounds.y ) { popupLocation.y = scrBounds.y; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/swing/JSplitPane.java --- a/jdk/src/share/classes/javax/swing/JSplitPane.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/JSplitPane.java Sat May 14 11:52:15 2011 -0700 @@ -671,7 +671,7 @@ * which must be <code>true</code> for the child components * to be continuously * redisplayed and laid out during user intervention. - * The default value of this property is <code>false</code>. + * The default value of this property is look and feel dependent. * Some look and feels might not support continuous layout; * they will ignore this property. * diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Sat May 14 11:52:15 2011 -0700 @@ -154,7 +154,7 @@ setBackground(UIManager.getColor("SplitPane.background")); } - private void revalidate() { + private void revalidateSplitPane() { invalidate(); if (splitPane != null) { splitPane.revalidate(); @@ -315,7 +315,7 @@ setCursor((orientation == JSplitPane.HORIZONTAL_SPLIT) ? Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR) : Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR)); - revalidate(); + revalidateSplitPane(); } else if (e.getPropertyName() == JSplitPane. ONE_TOUCH_EXPANDABLE_PROPERTY) { @@ -376,7 +376,7 @@ add(rightButton); } } - revalidate(); + revalidateSplitPane(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java --- a/jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java Sat May 14 11:52:15 2011 -0700 @@ -13,7 +13,7 @@ */ // Keycodes declared in KeyEvent.java with corresponding Unicode values. private final static HashMap<Integer, Integer> regularKeyCodesMap = - new HashMap<Integer,Integer>(83, 1.0f); + new HashMap<Integer,Integer>(98, 1.0f); // Keycodes derived from Unicode values. Here should be collected codes // for characters appearing on the primary layer of at least one @@ -108,6 +108,21 @@ regularKeyCodesMap.put(0x5E, KeyEvent.VK_CIRCUMFLEX); regularKeyCodesMap.put(0x5F, KeyEvent.VK_UNDERSCORE); regularKeyCodesMap.put(0x60, KeyEvent.VK_BACK_QUOTE); + regularKeyCodesMap.put(0x61, KeyEvent.VK_A); + regularKeyCodesMap.put(0x62, KeyEvent.VK_B); + regularKeyCodesMap.put(0x63, KeyEvent.VK_C); + regularKeyCodesMap.put(0x64, KeyEvent.VK_D); + regularKeyCodesMap.put(0x65, KeyEvent.VK_E); + regularKeyCodesMap.put(0x66, KeyEvent.VK_F); + regularKeyCodesMap.put(0x67, KeyEvent.VK_G); + regularKeyCodesMap.put(0x68, KeyEvent.VK_H); + regularKeyCodesMap.put(0x69, KeyEvent.VK_I); + regularKeyCodesMap.put(0x6A, KeyEvent.VK_J); + regularKeyCodesMap.put(0x6B, KeyEvent.VK_K); + regularKeyCodesMap.put(0x6C, KeyEvent.VK_L); + regularKeyCodesMap.put(0x6D, KeyEvent.VK_M); + regularKeyCodesMap.put(0x6E, KeyEvent.VK_N); + regularKeyCodesMap.put(0x6F, KeyEvent.VK_O); regularKeyCodesMap.put(0x70, KeyEvent.VK_P); regularKeyCodesMap.put(0x71, KeyEvent.VK_Q); regularKeyCodesMap.put(0x72, KeyEvent.VK_R); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/FontDescriptor.java --- a/jdk/src/share/classes/sun/awt/FontDescriptor.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/FontDescriptor.java Sat May 14 11:52:15 2011 -0700 @@ -26,6 +26,7 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharset; import sun.nio.cs.HistoricallyNamedCharset; public class FontDescriptor implements Cloneable { @@ -104,8 +105,8 @@ if (useUnicode && unicodeEncoder == null) { try { this.unicodeEncoder = isLE? - Charset.forName("UTF_16LE").newEncoder(): - Charset.forName("UTF_16BE").newEncoder(); + StandardCharset.UTF_16LE.newEncoder(): + StandardCharset.UTF_16BE.newEncoder(); } catch (IllegalArgumentException x) {} } return useUnicode; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Sat May 14 11:52:15 2011 -0700 @@ -29,12 +29,10 @@ import java.awt.EventQueue; import java.awt.Image; import java.awt.Graphics; -import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.FlavorMap; import java.awt.datatransfer.FlavorTable; -import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; @@ -66,8 +64,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.security.AccessControlContext; -import java.security.AccessControlException; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; @@ -171,7 +167,26 @@ */ public static final DataFlavor javaTextEncodingFlavor; - private static SortedSet standardEncodings; + /** + * Lazy initialization of Standard Encodings. + */ + private static class StandardEncodingsHolder { + private static final SortedSet standardEncodings = load(); + + private static SortedSet load() { + final Comparator comparator = + new CharsetComparator(IndexedComparator.SELECT_WORST); + final SortedSet tempSet = new TreeSet(comparator); + tempSet.add("US-ASCII"); + tempSet.add("ISO-8859-1"); + tempSet.add("UTF-8"); + tempSet.add("UTF-16BE"); + tempSet.add("UTF-16LE"); + tempSet.add("UTF-16"); + tempSet.add(getDefaultTextCharset()); + return Collections.unmodifiableSortedSet(tempSet); + } + } /** * Tracks whether a particular text/* MIME type supports the charset @@ -509,18 +524,7 @@ * non-standard, character sets are not included. */ public static Iterator standardEncodings() { - if (standardEncodings == null) { - TreeSet tempSet = new TreeSet(defaultCharsetComparator); - tempSet.add("US-ASCII"); - tempSet.add("ISO-8859-1"); - tempSet.add("UTF-8"); - tempSet.add("UTF-16BE"); - tempSet.add("UTF-16LE"); - tempSet.add("UTF-16"); - tempSet.add(getDefaultTextCharset()); - standardEncodings = Collections.unmodifiableSortedSet(tempSet); - } - return standardEncodings.iterator(); + return StandardEncodingsHolder.standardEncodings.iterator(); } /** @@ -2398,7 +2402,9 @@ public static DataFlavor[] setToSortedDataFlavorArray(Set flavorsSet) { DataFlavor[] flavors = new DataFlavor[flavorsSet.size()]; flavorsSet.toArray(flavors); - Arrays.sort(flavors, defaultFlavorComparator); + final Comparator comparator = + new DataFlavorComparator(IndexedComparator.SELECT_WORST); + Arrays.sort(flavors, comparator); return flavors; } @@ -2455,11 +2461,6 @@ return new ArrayList(); } - private static CharsetComparator defaultCharsetComparator = - new CharsetComparator(IndexedComparator.SELECT_WORST); - private static DataFlavorComparator defaultFlavorComparator = - new DataFlavorComparator(IndexedComparator.SELECT_WORST); - /** * A Comparator which includes a helper function for comparing two Objects * which are likely to be keys in the specified Map. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/awt/resources/awt_es.properties --- a/jdk/src/share/classes/sun/awt/resources/awt_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/awt/resources/awt_es.properties Sat May 14 11:52:15 2011 -0700 @@ -175,7 +175,7 @@ AWT.HostInputMethodDisplayName=M\u00E9todos de Entrada del Sistema AWT.InputMethodLanguage.ja=Japon\u00E9s AWT.InputMethodLanguage.ko=Coreano -AWT.InputMethodLanguage.zh=Chino +AWT.InputMethodLanguage.zh=chino AWT.InputMethodLanguage.zh_CN=Chino Simplificado AWT.InputMethodLanguage.zh_TW=Chino Tradicional AWT.InputMethodCreationFailed=No se ha podido crear {0}. Motivo: {1} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_de.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_es.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_it.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,20 +24,20 @@ # # Translators please note do not translate the options themselves -java.launcher.opt.header = Syntax: {0} [-options] class [args...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-options] -jar jarfile [args...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n +java.launcher.opt.header = Syntax: {0} [-alternativ] class [argument...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-alternativ] -jar jarfile [argument...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n java.launcher.opt.datamodel =\ -d{0}\t anv\u00E4nd en {0}-bitsdatamodell om det finns\n java.launcher.opt.vmselect =\ {0}\t f\u00F6r att v\u00E4lja "{1}" VM\n -java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [deprecated]\n +java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [inaktuell]\n java.launcher.ergo.message1 =\ Standard-VM \u00E4r {0} java.launcher.ergo.message2 =\ eftersom du k\u00F6r en serverklassmaskin.\n # Translators please note do not translate the options themselves -java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-separerad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<name>=<value>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<value>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<libname>[=<options>]\n\ ladda ursprungligt agentbibliotek <libname>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jarpath>[=<options>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<imagepath>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference. +java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-avgr\u00E4nsad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<namn>=<v\u00E4rde>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<v\u00E4rde>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<paket>...|:<klass>]\n\ -enableassertions[:<paket>...|:<klass>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<klass>]\n\ -disableassertions[:<paket>...|:<klass>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<bibliotek>[=<alternativ>]\n\ ladda ursprungligt agentbibliotek <bibliotek>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<s\u00F6kv\u00E4g>[=<alternativ>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jar-s\u00F6kv\u00E4g>[=<alternativ>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<bilds\u00F6kv\u00E4g>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference. # Translators please note do not translate the options themselves -java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer separeras med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<file> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<size> ange initial storlek f\u00F6r Java-heap\n\ -Xmx<size> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<size> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delad klassdata\n\ -Xshare:auto anv\u00E4nd delad klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delad klassdata anv\u00E4nds, annars slutf\u00F6rs inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n +java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<fil> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<storlek> ange ursprunglig storlek f\u00F6r Java-heap\n\ -Xmx<storlek> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<storlek> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delade klassdata\n\ -Xshare:auto anv\u00E4nd delade klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delade klassdata anv\u00E4nds, annars slutf\u00F6r inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n java.launcher.cls.error1=Fel: Hittar inte eller kan inte ladda huvudklassen {0} java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n\ public static void main(String[] args) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties --- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/FloatingDecimal.java --- a/jdk/src/share/classes/sun/misc/FloatingDecimal.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/misc/FloatingDecimal.java Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ import sun.misc.FloatConsts; import java.util.regex.*; -public strictfp class FloatingDecimal{ +public class FloatingDecimal{ boolean isExceptional; boolean isNegative; int decExponent; @@ -239,8 +239,7 @@ * More difficult if subtracting and the argument * is a normalized a power of 2, as the ULP changes at these points. */ - private static double - ulp( double dval, boolean subtracting ){ + private static double ulp( double dval, boolean subtracting ){ long lbits = Double.doubleToLongBits( dval ) & ~signMask; int binexp = (int)(lbits >>> expShift); double ulpval; @@ -1251,8 +1250,7 @@ * for a single-precision float. */ - public double - doubleValue(){ + public strictfp double doubleValue(){ int kDigits = Math.min( nDigits, maxDecimalDigits+1 ); long lValue; double dValue; @@ -1611,8 +1609,7 @@ * ( because of the preference to a zero low-order bit ). */ - public float - floatValue(){ + public strictfp float floatValue(){ int kDigits = Math.min( nDigits, singleMaxDecimalDigits+1 ); int iValue; float fValue; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java --- a/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java Sat May 14 11:52:15 2011 -0700 @@ -30,7 +30,7 @@ import sun.misc.FloatConsts; import java.util.regex.*; -public strictfp class FormattedFloatingDecimal{ +public class FormattedFloatingDecimal{ boolean isExceptional; boolean isNegative; int decExponent; // value set at construction, then immutable @@ -247,8 +247,7 @@ * More difficult if subtracting and the argument * is a normalized a power of 2, as the ULP changes at these points. */ - private static double - ulp( double dval, boolean subtracting ){ + private static double ulp( double dval, boolean subtracting ){ long lbits = Double.doubleToLongBits( dval ) & ~signMask; int binexp = (int)(lbits >>> expShift); double ulpval; @@ -1157,8 +1156,7 @@ * for a single-precision float. */ - public double - doubleValue(){ + public strictfp double doubleValue(){ int kDigits = Math.min( nDigits, maxDecimalDigits+1 ); long lValue; double dValue; @@ -1517,8 +1515,7 @@ * ( because of the preference to a zero low-order bit ). */ - public float - floatValue(){ + public strictfp float floatValue(){ int kDigits = Math.min( nDigits, singleMaxDecimalDigits+1 ); int iValue; float fValue; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.misc; + +import javax.security.auth.kerberos.KeyTab; +import sun.security.krb5.EncryptionKey; +import sun.security.krb5.PrincipalName; + +/** + * An unsafe tunnel to get non-public access to classes in the + * javax.security.auth.kerberos package. + */ +public interface JavaxSecurityAuthKerberosAccess { + /** + * Returns keys for a principal in a keytab. + * @return the keys, never null, can be empty. + */ + public EncryptionKey[] keyTabGetEncryptionKeys( + KeyTab ktab, PrincipalName principal); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/misc/SharedSecrets.java --- a/jdk/src/share/classes/sun/misc/SharedSecrets.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/misc/SharedSecrets.java Sat May 14 11:52:15 2011 -0700 @@ -29,6 +29,7 @@ import java.io.Console; import java.io.FileDescriptor; import java.security.ProtectionDomain; +import javax.security.auth.kerberos.KeyTab; import java.security.AccessController; @@ -51,6 +52,7 @@ private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess; private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess; private static JavaSecurityAccess javaSecurityAccess; + private static JavaxSecurityAuthKerberosAccess javaxSecurityAuthKerberosAccess; public static JavaUtilJarAccess javaUtilJarAccess() { if (javaUtilJarAccess == null) { @@ -139,4 +141,16 @@ } return javaSecurityAccess; } + + public static void setJavaxSecurityAuthKerberosAccess + (JavaxSecurityAuthKerberosAccess jsaka) { + javaxSecurityAuthKerberosAccess = jsaka; + } + + public static JavaxSecurityAuthKerberosAccess + getJavaxSecurityAuthKerberosAccess() { + if (javaxSecurityAuthKerberosAccess == null) + unsafe.ensureClassInitialized(KeyTab.class); + return javaxSecurityAuthKerberosAccess; + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/net/www/URLConnection.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/net/www/http/HttpClient.java diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/nio/cs/UTF_8.java --- a/jdk/src/share/classes/sun/nio/cs/UTF_8.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/nio/cs/UTF_8.java Sat May 14 11:52:15 2011 -0700 @@ -32,6 +32,7 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; +import java.nio.charset.CodingErrorAction; /* Legal UTF-8 Byte Sequences * @@ -77,7 +78,8 @@ dst.position(dp - dst.arrayOffset()); } - private static class Decoder extends CharsetDecoder { + private static class Decoder extends CharsetDecoder + implements ArrayDecoder { private Decoder(Charset cs) { super(cs, 1.0f, 1.0f); } @@ -353,9 +355,132 @@ else return decodeBufferLoop(src, dst); } + + private static ByteBuffer getByteBuffer(ByteBuffer bb, byte[] ba, int sp) + { + if (bb == null) + bb = ByteBuffer.wrap(ba); + bb.position(sp); + return bb; + } + + // returns -1 if there is malformed byte(s) and the + // "action" for malformed input is not REPLACE. + public int decode(byte[] sa, int sp, int len, char[] da) { + final int sl = sp + len; + int dp = 0; + int dlASCII = Math.min(len, da.length); + ByteBuffer bb = null; // only necessary if malformed + + // ASCII only optimized loop + while (dp < dlASCII && sa[sp] >= 0) + da[dp++] = (char) sa[sp++]; + + while (sp < sl) { + int b1 = sa[sp++]; + if (b1 >= 0) { + // 1 byte, 7 bits: 0xxxxxxx + da[dp++] = (char) b1; + } else if ((b1 >> 5) == -2) { + // 2 bytes, 11 bits: 110xxxxx 10xxxxxx + if (sp < sl) { + int b2 = sa[sp++]; + if (isMalformed2(b1, b2)) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp--; // malformedN(bb, 2) always returns 1 + } else { + da[dp++] = (char) (((b1 << 6) ^ b2)^ + (((byte) 0xC0 << 6) ^ + ((byte) 0x80 << 0))); + } + continue; + } + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + return dp; + } else if ((b1 >> 4) == -2) { + // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx + if (sp + 1 < sl) { + int b2 = sa[sp++]; + int b3 = sa[sp++]; + if (isMalformed3(b1, b2, b3)) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp -=3; + bb = getByteBuffer(bb, sa, sp); + sp += malformedN(bb, 3).length(); + } else { + da[dp++] = (char)((b1 << 12) ^ + (b2 << 6) ^ + (b3 ^ + (((byte) 0xE0 << 12) ^ + ((byte) 0x80 << 6) ^ + ((byte) 0x80 << 0)))); + } + continue; + } + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + return dp; + } else if ((b1 >> 3) == -2) { + // 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + if (sp + 2 < sl) { + int b2 = sa[sp++]; + int b3 = sa[sp++]; + int b4 = sa[sp++]; + int uc = ((b1 << 18) ^ + (b2 << 12) ^ + (b3 << 6) ^ + (b4 ^ + (((byte) 0xF0 << 18) ^ + ((byte) 0x80 << 12) ^ + ((byte) 0x80 << 6) ^ + ((byte) 0x80 << 0)))); + if (isMalformed4(b2, b3, b4) || + // shortest form check + !Character.isSupplementaryCodePoint(uc)) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp -= 4; + bb = getByteBuffer(bb, sa, sp); + sp += malformedN(bb, 4).length(); + } else { + da[dp++] = Character.highSurrogate(uc); + da[dp++] = Character.lowSurrogate(uc); + } + continue; + } + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + return dp; + } else { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement().charAt(0); + sp--; + bb = getByteBuffer(bb, sa, sp); + CoderResult cr = malformedN(bb, 1); + if (!cr.isError()) { + // leading byte for 5 or 6-byte, but don't have enough + // bytes in buffer to check. Consumed rest as malformed. + return dp; + } + sp += cr.length(); + } + } + return dp; + } } - private static class Encoder extends CharsetEncoder { + private static class Encoder extends CharsetEncoder + implements ArrayEncoder { private Encoder(Charset cs) { super(cs, 1.1f, 3.0f); @@ -495,5 +620,50 @@ else return encodeBufferLoop(src, dst); } + + // returns -1 if there is malformed char(s) and the + // "action" for malformed input is not REPLACE. + public int encode(char[] sa, int sp, int len, byte[] da) { + int sl = sp + len; + int dp = 0; + int dlASCII = dp + Math.min(len, da.length); + + // ASCII only optimized loop + while (dp < dlASCII && sa[sp] < '\u0080') + da[dp++] = (byte) sa[sp++]; + + while (sp < sl) { + char c = sa[sp++]; + if (c < 0x80) { + // Have at most seven bits + da[dp++] = (byte)c; + } else if (c < 0x800) { + // 2 bytes, 11 bits + da[dp++] = (byte)(0xc0 | (c >> 6)); + da[dp++] = (byte)(0x80 | (c & 0x3f)); + } else if (Character.isSurrogate(c)) { + if (sgp == null) + sgp = new Surrogate.Parser(); + int uc = sgp.parse(c, sa, sp - 1, sl); + if (uc < 0) { + if (malformedInputAction() != CodingErrorAction.REPLACE) + return -1; + da[dp++] = replacement()[0]; + } else { + da[dp++] = (byte)(0xf0 | ((uc >> 18))); + da[dp++] = (byte)(0x80 | ((uc >> 12) & 0x3f)); + da[dp++] = (byte)(0x80 | ((uc >> 6) & 0x3f)); + da[dp++] = (byte)(0x80 | (uc & 0x3f)); + sp++; // 2 chars + } + } else { + // 3 bytes, 16 bits + da[dp++] = (byte)(0xe0 | ((c >> 12))); + da[dp++] = (byte)(0x80 | ((c >> 6) & 0x3f)); + da[dp++] = (byte)(0x80 | (c & 0x3f)); + } + } + return dp; + } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_de.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Sat May 14 11:52:15 2011 -0700 @@ -18,11 +18,11 @@ button.properties.mnemonic=I # checkbox.collate=Sortieren -checkbox.collate.mnemonic=S +checkbox.collate.mnemonic=R checkbox.jobsheets=Bannerseite checkbox.jobsheets.mnemonic=B checkbox.printtofile=Ausgabe in Datei -checkbox.printtofile.mnemonic=D +checkbox.printtofile.mnemonic=U # dialog.printtitle=Drucken dialog.pstitle=Seite einrichten @@ -44,18 +44,18 @@ label.pstype=Typ: label.rangeto=Bis label.size=Gr\u00F6\u00DFe: -label.size.mnemonic=R +label.size.mnemonic=E label.source=Quelle: -label.source.mnemonic=Q +label.source.mnemonic=U label.status=Status: label.username=Benutzername: -label.username.mnemonic=B +label.username.mnemonic=U label.millimetres=(mm) label.inches=(Zoll) label.topmargin=oben label.topmargin.mnemonic=O label.bottommargin=unten -label.bottommargin.mnemonic=U +label.bottommargin.mnemonic=N label.leftmargin=links label.leftmargin.mnemonic=L label.rightmargin=rechts @@ -66,7 +66,7 @@ radiobutton.draftq=Entwurf radiobutton.draftq.mnemonic=W radiobutton.duplex=Duplex -radiobutton.duplex.mnemonic=D +radiobutton.duplex.mnemonic=P radiobutton.highq=Hoch radiobutton.highq.mnemonic=H radiobutton.landscape=Querformat @@ -78,15 +78,15 @@ radiobutton.oneside=Einseitig radiobutton.oneside.mnemonic=E radiobutton.portrait=Hochformat -radiobutton.portrait.mnemonic=M +radiobutton.portrait.mnemonic=H radiobutton.rangeall=Alle radiobutton.rangeall.mnemonic=L radiobutton.rangepages=Seiten radiobutton.rangepages.mnemonic=E radiobutton.revlandscape=Umgekehrtes Querformat -radiobutton.revlandscape.mnemonic=U +radiobutton.revlandscape.mnemonic=M radiobutton.revportrait=Umgekehrtes Hochformat -radiobutton.revportrait.mnemonic=H +radiobutton.revportrait.mnemonic=K radiobutton.tumble=Kalenderdruck radiobutton.tumble.mnemonic=K # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Allgemein tab.general.vkMnemonic=65 tab.pagesetup=Seite einrichten -tab.pagesetup.vkMnemonic=69 +tab.pagesetup.vkMnemonic=83 # error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10) error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_es.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Sat May 14 11:52:15 2011 -0700 @@ -20,7 +20,7 @@ checkbox.collate=Intercalar checkbox.collate.mnemonic=C checkbox.jobsheets=P\u00E1gina de R\u00F3tulo -checkbox.jobsheets.mnemonic=L +checkbox.jobsheets.mnemonic=E checkbox.printtofile=Imprimir en Archivo checkbox.printtofile.mnemonic=M # @@ -34,7 +34,7 @@ # label.info=Informaci\u00F3n: label.jobname=Nombre del Trabajo: -label.jobname.mnemonic=N +label.jobname.mnemonic=T label.numcopies=N\u00FAmero de Copias: label.numcopies.mnemonic=O label.priority=Prioridad: @@ -44,12 +44,12 @@ label.pstype=Tipo: label.rangeto=A label.size=Tama\u00F1o: -label.size.mnemonic=\ +label.size.mnemonic=T label.source=Origen: -label.source.mnemonic=G +label.source.mnemonic=O label.status=Estado: label.username=Usuario: -label.username.mnemonic=U +label.username.mnemonic=S label.millimetres=(mm) label.inches=(pulg.) label.topmargin=superior @@ -68,7 +68,7 @@ radiobutton.duplex=D\u00FAplex radiobutton.duplex.mnemonic=D radiobutton.highq=Alta -radiobutton.highq.mnemonic=A +radiobutton.highq.mnemonic=L radiobutton.landscape=Horizontal radiobutton.landscape.mnemonic=Z radiobutton.monochrome=Monocromo @@ -76,7 +76,7 @@ radiobutton.normalq=Normal radiobutton.normalq.mnemonic=N radiobutton.oneside=Una Cara -radiobutton.oneside.mnemonic=R +radiobutton.oneside.mnemonic=U radiobutton.portrait=Vertical radiobutton.portrait.mnemonic=V radiobutton.rangeall=Todo @@ -86,7 +86,7 @@ radiobutton.revlandscape=Horizontal Inverso radiobutton.revlandscape.mnemonic=H radiobutton.revportrait=Vertical Inverso -radiobutton.revportrait.mnemonic=S +radiobutton.revportrait.mnemonic=R radiobutton.tumble=Cambio de Cara radiobutton.tumble.mnemonic=B # The vkMnemonics correspond with the constants defined in KeyEvent, eg diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_fr.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -49,7 +49,7 @@ label.source.mnemonic=C label.status=Statut : label.username=Nom utilisateur : -label.username.mnemonic=U +label.username.mnemonic=O label.millimetres=(mm) label.inches=(po) label.topmargin=haut @@ -62,7 +62,7 @@ label.rightmargin.mnemonic=D # radiobutton.color=Couleur -radiobutton.color.mnemonic=U +radiobutton.color.mnemonic=C radiobutton.draftq=Brouillon radiobutton.draftq.mnemonic=L radiobutton.duplex=Duplex @@ -70,7 +70,7 @@ radiobutton.highq=Max. radiobutton.highq.mnemonic=X radiobutton.landscape=Paysage -radiobutton.landscape.mnemonic=S +radiobutton.landscape.mnemonic=Y radiobutton.monochrome=Monochrome radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normal diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_it.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Sat May 14 11:52:15 2011 -0700 @@ -20,7 +20,7 @@ checkbox.collate=Fascicola checkbox.collate.mnemonic=L checkbox.jobsheets=Pagina banner -checkbox.jobsheets.mnemonic=B +checkbox.jobsheets.mnemonic=P checkbox.printtofile=Stampa su file checkbox.printtofile.mnemonic=F # @@ -38,7 +38,7 @@ label.numcopies=Numero di copie: label.numcopies.mnemonic=O label.priority=Priorit\u00E0: -label.priority.mnemonic=R +label.priority.mnemonic=I label.psname=Nome: label.psname.mnemonic=N label.pstype=Tipo: @@ -72,7 +72,7 @@ radiobutton.landscape=Orizzontale radiobutton.landscape.mnemonic=L radiobutton.monochrome=Monocromatico -radiobutton.monochrome.mnemonic=A +radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normale radiobutton.normalq.mnemonic=N radiobutton.oneside=Un lato diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -15,10 +15,10 @@ button.ok=OK button.print=Imprimir button.properties=Propriedades... -button.properties.mnemonic=R +button.properties.mnemonic=D # checkbox.collate=Agrupar -checkbox.collate.mnemonic=A +checkbox.collate.mnemonic=R checkbox.jobsheets=P\u00E1gina com Banner checkbox.jobsheets.mnemonic=B checkbox.printtofile=Imprimir em Arquivo @@ -38,7 +38,7 @@ label.numcopies=N\u00FAmero de c\u00F3pias: label.numcopies.mnemonic=O label.priority=Prioridade: -label.priority.mnemonic=R +label.priority.mnemonic=P label.psname=Nome: label.psname.mnemonic=N label.pstype=Tipo: @@ -59,7 +59,7 @@ label.leftmargin=esquerda: label.leftmargin.mnemonic=Q label.rightmargin=direita -label.rightmargin.mnemonic=R +label.rightmargin.mnemonic=D # radiobutton.color=Cor radiobutton.color.mnemonic=O @@ -68,7 +68,7 @@ radiobutton.duplex=Duplex radiobutton.duplex.mnemonic=D radiobutton.highq=Alta -radiobutton.highq.mnemonic=A +radiobutton.highq.mnemonic=T radiobutton.landscape=Paisagem radiobutton.landscape.mnemonic=P radiobutton.monochrome=Monocrom\u00E1tico @@ -76,7 +76,7 @@ radiobutton.normalq=Normal radiobutton.normalq.mnemonic=N radiobutton.oneside=Um Lado -radiobutton.oneside.mnemonic=O +radiobutton.oneside.mnemonic=L radiobutton.portrait=Retrato radiobutton.portrait.mnemonic=R radiobutton.rangeall=Tudo @@ -86,7 +86,7 @@ radiobutton.revlandscape=Paisagem Invertida radiobutton.revlandscape.mnemonic=N radiobutton.revportrait=Retrato Invertido -radiobutton.revportrait.mnemonic=I +radiobutton.revportrait.mnemonic=E radiobutton.tumble=Virar radiobutton.tumble.mnemonic=V # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Geral tab.general.vkMnemonic=71 tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina -tab.pagesetup.vkMnemonic=80 +tab.pagesetup.vkMnemonic=67 # error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10) error.destination=Nome de arquivo inv\u00E1lido; tente novamente diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/print/resources/serviceui_sv.properties --- a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -15,14 +15,14 @@ button.ok=OK button.print=Skriv ut button.properties=Egenskaper... -button.properties.mnemonic=E +button.properties.mnemonic=R # checkbox.collate=Sortera -checkbox.collate.mnemonic=S +checkbox.collate.mnemonic=T checkbox.jobsheets=F\u00F6rs\u00E4ttsblad -checkbox.jobsheets.mnemonic=F +checkbox.jobsheets.mnemonic=R checkbox.printtofile=Skriv ut till fil -checkbox.printtofile.mnemonic=F +checkbox.printtofile.mnemonic=K # dialog.printtitle=Skriv ut dialog.pstitle=Utskriftsformat @@ -33,38 +33,38 @@ dialog.writeerror=Kan inte skriva till filen: # label.info=Information: -label.jobname=Jobbnamn -label.jobname.mnemonic=J -label.numcopies=Antal exemplar +label.jobname=Utskrift: +label.jobname.mnemonic=U +label.numcopies=Antal exemplar: label.numcopies.mnemonic=E -label.priority=Prioritet +label.priority=Prioritet: label.priority.mnemonic=R label.psname=Namn: label.psname.mnemonic=N label.pstype=Typ: label.rangeto=Till label.size=Storlek: -label.size.mnemonic=L -label.source=K\u00E4lla -label.source.mnemonic=L +label.size.mnemonic=O +label.source=K\u00E4lla: +label.source.mnemonic=K label.status=Status: label.username=Anv\u00E4ndarnamn: label.username.mnemonic=N label.millimetres=(mm) label.inches=(tum) label.topmargin=\u00F6verkant -label.topmargin.mnemonic=\ +label.topmargin.mnemonic=R label.bottommargin=nederkant label.bottommargin.mnemonic=N label.leftmargin=v\u00E4nster -label.leftmargin.mnemonic=\ +label.leftmargin.mnemonic=V label.rightmargin=h\u00F6ger label.rightmargin.mnemonic=H # radiobutton.color=F\u00E4rg -radiobutton.color.mnemonic=F +radiobutton.color.mnemonic=G radiobutton.draftq=Utkast -radiobutton.draftq.mnemonic=S +radiobutton.draftq.mnemonic=K radiobutton.duplex=Dubbelsidig radiobutton.duplex.mnemonic=D radiobutton.highq=H\u00F6g @@ -74,19 +74,19 @@ radiobutton.monochrome=Monokrom radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normal -radiobutton.normalq.mnemonic=N +radiobutton.normalq.mnemonic=O radiobutton.oneside=Ensidig radiobutton.oneside.mnemonic=E radiobutton.portrait=St\u00E5ende -radiobutton.portrait.mnemonic=S +radiobutton.portrait.mnemonic=D radiobutton.rangeall=Alla radiobutton.rangeall.mnemonic=L radiobutton.rangepages=Sidor -radiobutton.rangepages.mnemonic=O +radiobutton.rangepages.mnemonic=D radiobutton.revlandscape=Omv\u00E4nt liggande radiobutton.revlandscape.mnemonic=G radiobutton.revportrait=Omv\u00E4nt st\u00E5ende -radiobutton.revportrait.mnemonic=D +radiobutton.revportrait.mnemonic=M radiobutton.tumble=V\u00E4nd radiobutton.tumble.mnemonic=V # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Allm\u00E4nt tab.general.vkMnemonic=65 tab.pagesetup=Utskriftsformat -tab.pagesetup.vkMnemonic=70 +tab.pagesetup.vkMnemonic=83 # error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10) error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/rmi/log/ReliableLog.java --- a/jdk/src/share/classes/sun/rmi/log/ReliableLog.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/rmi/log/ReliableLog.java Sat May 14 11:52:15 2011 -0700 @@ -380,9 +380,7 @@ } catch (IOException e) { throw e; } catch (Exception e) { - throw new IOException("snapshot failed with exception of type: " + - e.getClass().getName() + - ", message was: " + e.getMessage()); + throw new IOException("snapshot failed", e); } lastSnapshot = System.currentTimeMillis(); } finally { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/rmi/server/Activation.java --- a/jdk/src/share/classes/sun/rmi/server/Activation.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/rmi/server/Activation.java Sat May 14 11:52:15 2011 -0700 @@ -30,6 +30,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; import java.io.OutputStream; import java.io.PrintStream; import java.io.PrintWriter; @@ -98,6 +99,7 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import sun.rmi.log.LogHandler; import sun.rmi.log.ReliableLog; import sun.rmi.registry.RegistryImpl; @@ -147,10 +149,10 @@ /** maps activation id to its respective group id */ private Map<ActivationID,ActivationGroupID> idTable = - new HashMap<ActivationID,ActivationGroupID>(); + new ConcurrentHashMap<>(); /** maps group id to its GroupEntry groups */ private Map<ActivationGroupID,GroupEntry> groupTable = - new HashMap<ActivationGroupID,GroupEntry>(); + new ConcurrentHashMap<>(); private byte majorVersion = MAJOR_VERSION; private byte minorVersion = MINOR_VERSION; @@ -236,9 +238,11 @@ groupSemaphore = getInt("sun.rmi.activation.groupThrottle", 3); groupCounter = 0; Runtime.getRuntime().addShutdownHook(shutdownHook); + + // Use array size of 0, since the value from calling size() + // may be out of date by the time toArray() is called. ActivationGroupID[] gids = - groupTable.keySet().toArray( - new ActivationGroupID[groupTable.size()]); + groupTable.keySet().toArray(new ActivationGroupID[0]); synchronized (startupLock = new Object()) { // all the remote methods briefly synchronize on startupLock @@ -274,6 +278,23 @@ } } + /** + * Previous versions used HashMap instead of ConcurrentHashMap. + * Replace any HashMaps found during deserialization with + * ConcurrentHashMaps. + */ + private void readObject(ObjectInputStream ois) + throws IOException, ClassNotFoundException + { + ois.defaultReadObject(); + if (! (groupTable instanceof ConcurrentHashMap)) { + groupTable = new ConcurrentHashMap<>(groupTable); + } + if (! (idTable instanceof ConcurrentHashMap)) { + idTable = new ConcurrentHashMap<>(idTable); + } + } + private static class SystemRegistryImpl extends RegistryImpl { private static final String NAME = ActivationSystem.class.getName(); @@ -488,9 +509,7 @@ ActivationGroupID id = new ActivationGroupID(systemStub); GroupEntry entry = new GroupEntry(id, desc); // table insertion must take place before log update - synchronized (groupTable) { - groupTable.put(id, entry); - } + groupTable.put(id, entry); addLogRecord(new LogRegisterGroup(id, desc)); return id; } @@ -515,11 +534,7 @@ // remove entry before unregister so state is updated before // logged - synchronized (groupTable) { - GroupEntry entry = getGroupEntry(id); - groupTable.remove(id); - entry.unregisterGroup(true); - } + removeGroupEntry(id).unregisterGroup(true); } public ActivationDesc setActivationDesc(ActivationID id, @@ -637,12 +652,7 @@ unexport(system); // destroy all child processes (groups) - GroupEntry[] groupEntries; - synchronized (groupTable) { - groupEntries = groupTable.values(). - toArray(new GroupEntry[groupTable.size()]); - } - for (GroupEntry groupEntry : groupEntries) { + for (GroupEntry groupEntry : groupTable.values()) { groupEntry.shutdown(); } @@ -693,10 +703,8 @@ } // destroy all child processes (groups) quickly - synchronized (groupTable) { - for (GroupEntry groupEntry : groupTable.values()) { - groupEntry.shutdownFast(); - } + for (GroupEntry groupEntry : groupTable.values()) { + groupEntry.shutdownFast(); } } } @@ -708,13 +716,32 @@ private ActivationGroupID getGroupID(ActivationID id) throws UnknownObjectException { - synchronized (idTable) { - ActivationGroupID groupID = idTable.get(id); - if (groupID != null) { - return groupID; + ActivationGroupID groupID = idTable.get(id); + if (groupID != null) { + return groupID; + } + throw new UnknownObjectException("unknown object: " + id); + } + + /** + * Returns the group entry for the group id, optionally removing it. + * Throws UnknownGroupException if the group is not registered. + */ + private GroupEntry getGroupEntry(ActivationGroupID id, boolean rm) + throws UnknownGroupException + { + if (id.getClass() == ActivationGroupID.class) { + GroupEntry entry; + if (rm) { + entry = groupTable.remove(id); + } else { + entry = groupTable.get(id); + } + if (entry != null && !entry.removed) { + return entry; } } - throw new UnknownObjectException("unknown object: " + id); + throw new UnknownGroupException("group unknown"); } /** @@ -724,15 +751,17 @@ private GroupEntry getGroupEntry(ActivationGroupID id) throws UnknownGroupException { - if (id.getClass() == ActivationGroupID.class) { - synchronized (groupTable) { - GroupEntry entry = groupTable.get(id); - if (entry != null && !entry.removed) { - return entry; - } - } - } - throw new UnknownGroupException("group unknown"); + return getGroupEntry(id, false); + } + + /** + * Removes and returns the group entry for the group id. Throws + * UnknownGroupException if the group is not registered. + */ + private GroupEntry removeGroupEntry(ActivationGroupID id) + throws UnknownGroupException + { + return getGroupEntry(id, true); } /** @@ -744,11 +773,9 @@ throws UnknownObjectException { ActivationGroupID gid = getGroupID(id); - synchronized (groupTable) { - GroupEntry entry = groupTable.get(gid); - if (entry != null) { - return entry; - } + GroupEntry entry = groupTable.get(gid); + if (entry != null && !entry.removed) { + return entry; } throw new UnknownObjectException("object's group removed"); } @@ -882,9 +909,7 @@ } // table insertion must take place before log update - synchronized (idTable) { - idTable.put(id, groupID); - } + idTable.put(id, groupID); if (addRecord) { addLogRecord(new LogRegisterObject(id, desc)); @@ -901,10 +926,8 @@ restartSet.remove(id); } - // table insertion must take place before log update - synchronized (idTable) { - idTable.remove(id); - } + // table removal must take place before log update + idTable.remove(id); if (addRecord) { addLogRecord(new LogUnregisterObject(id)); } @@ -919,9 +942,7 @@ objects.entrySet()) { ActivationID id = entry.getKey(); - synchronized (idTable) { - idTable.remove(id); - } + idTable.remove(id); ObjectEntry objEntry = entry.getValue(); objEntry.removed = true; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties --- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties Sat May 14 11:52:15 2011 -0700 @@ -93,4 +93,4 @@ rmid.log.snapshot.warning=\nrmid: (GRAVE) la instant\u00E1nea del log indica: # "rmid" should not be translated -rmid.log.recover.warning=\nrmid: (ADVERTENCIA) {0}: saltando el registro del log durante la recuperaci\u00F3n: +rmid.log.recover.warning=\nrmid: (ADVERTENCIA) {0}: se omitir\u00E1 el registro del log durante la recuperaci\u00F3n: diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java --- a/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, 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 @@ -121,15 +121,16 @@ } random.nextBytes(seed); - long[] handles = generateECKeyPair(keySize, encodedParams, seed); + try { - // The 'params' object supplied above is equivalent to the native one - // so there is no need to fetch it. + long[] handles = generateECKeyPair(keySize, encodedParams, seed); - // handles[0] points to the native private key - BigInteger s = new BigInteger(1, getEncodedBytes(handles[0])); + // The 'params' object supplied above is equivalent to the native + // one so there is no need to fetch it. - try { + // handles[0] points to the native private key + BigInteger s = new BigInteger(1, getEncodedBytes(handles[0])); + PrivateKey privateKey = new ECPrivateKeyImpl(s, (ECParameterSpec)params); @@ -163,7 +164,7 @@ * The first handle points to the private key, the second to the public key. */ private static native long[] generateECKeyPair(int keySize, - byte[] encodedParams, byte[] seed); + byte[] encodedParams, byte[] seed) throws GeneralSecurityException; /* * Extracts the encoded key data using the supplied handle. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java --- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,6 @@ import sun.security.jgss.GSSCaller; import sun.security.jgss.spi.*; import sun.security.krb5.*; -import javax.security.auth.kerberos.*; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.security.AccessController; @@ -43,40 +42,23 @@ * @since 1.4 */ public class Krb5AcceptCredential - extends KerberosKey implements Krb5CredElement { private static final long serialVersionUID = 7714332137352567952L; private Krb5NameElement name; - /** - * We cache an EncryptionKey representation of this key because many - * Krb5 operation require a key in that form. At some point we might do - * away with EncryptionKey altogether and use the base class - * KerberosKey everywhere. - */ - private EncryptionKey[] krb5EncryptionKeys; + private Krb5Util.ServiceCreds screds; - private Krb5AcceptCredential(Krb5NameElement name, KerberosKey[] keys) { + private Krb5AcceptCredential(Krb5NameElement name, Krb5Util.ServiceCreds creds) { /* * Initialize this instance with the data from the acquired * KerberosKey. This class needs to be a KerberosKey too * hence we can't just store a reference. */ - super(keys[0].getPrincipal(), - keys[0].getEncoded(), - keys[0].getKeyType(), - keys[0].getVersionNumber()); this.name = name; - // Cache this for later use by the sun.security.krb5 package. - krb5EncryptionKeys = new EncryptionKey[keys.length]; - for (int i = 0; i < keys.length; i++) { - krb5EncryptionKeys[i] = new EncryptionKey(keys[i].getEncoded(), - keys[i].getKeyType(), - new Integer(keys[i].getVersionNumber())); - } + this.screds = creds; } static Krb5AcceptCredential getInstance(final GSSCaller caller, Krb5NameElement name) @@ -86,12 +68,12 @@ name.getKrb5PrincipalName().getName()); final AccessControlContext acc = AccessController.getContext(); - KerberosKey[] keys; + Krb5Util.ServiceCreds creds = null; try { - keys = AccessController.doPrivileged( - new PrivilegedExceptionAction<KerberosKey[]>() { - public KerberosKey[] run() throws Exception { - return Krb5Util.getKeys( + creds = AccessController.doPrivileged( + new PrivilegedExceptionAction<Krb5Util.ServiceCreds>() { + public Krb5Util.ServiceCreds run() throws Exception { + return Krb5Util.getServiceCreds( caller == GSSCaller.CALLER_UNKNOWN ? GSSCaller.CALLER_ACCEPT: caller, serverPrinc, acc); }}); @@ -103,17 +85,17 @@ throw ge; } - if (keys == null || keys.length == 0) + if (creds == null) throw new GSSException(GSSException.NO_CRED, -1, - "Failed to find any Kerberos Key"); + "Failed to find any Kerberos credentails"); if (name == null) { - String fullName = keys[0].getPrincipal().getName(); + String fullName = creds.getName(); name = Krb5NameElement.getInstance(fullName, Krb5MechFactory.NT_GSS_KRB5_PRINCIPAL); } - return new Krb5AcceptCredential(name, keys); + return new Krb5AcceptCredential(name, creds); } /** @@ -171,7 +153,7 @@ } EncryptionKey[] getKrb5EncryptionKeys() { - return krb5EncryptionKeys; + return screds.getEKeys(); } /** @@ -193,13 +175,6 @@ * destroy in the base class. */ public void destroy() throws DestroyFailedException { - if (krb5EncryptionKeys != null) { - for (int i = 0; i < krb5EncryptionKeys.length; i++) { - krb5EncryptionKeys[i].destroy(); - } - krb5EncryptionKeys = null; - } - - super.destroy(); + screds.destroy(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java --- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ import javax.security.auth.kerberos.KerberosTicket; import javax.security.auth.kerberos.KerberosKey; import javax.security.auth.kerberos.KerberosPrincipal; +import javax.security.auth.kerberos.KeyTab; import javax.security.auth.Subject; import javax.security.auth.login.LoginException; import java.security.AccessControlContext; @@ -38,7 +39,13 @@ import sun.security.krb5.EncryptionKey; import sun.security.krb5.KrbException; import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.Objects; +import java.util.Set; +import sun.misc.SharedSecrets; +import sun.security.krb5.PrincipalName; /** * Utilities for obtaining and converting Kerberos tickets. * @@ -75,7 +82,7 @@ // 1. Try to find service ticket in acc subject Subject accSubj = Subject.getSubject(acc); - KerberosTicket ticket = (KerberosTicket) SubjectComber.find(accSubj, + KerberosTicket ticket = SubjectComber.find(accSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); if (ticket != null) { @@ -87,7 +94,7 @@ // 2. Try to get ticket from login try { loginSubj = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); - ticket = (KerberosTicket) SubjectComber.find(loginSubj, + ticket = SubjectComber.find(loginSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); if (ticket != null) { return ticket; // found it @@ -102,13 +109,13 @@ // Try to get TGT to acquire service ticket // 3. Try to get TGT from acc subject - KerberosTicket tgt = (KerberosTicket) SubjectComber.find(accSubj, + KerberosTicket tgt = SubjectComber.find(accSubj, tgsPrincipal, clientPrincipal, KerberosTicket.class); boolean fromAcc; if (tgt == null && loginSubj != null) { // 4. Try to get TGT from login subject - tgt = (KerberosTicket) SubjectComber.find(loginSubj, + tgt = SubjectComber.find(loginSubj, tgsPrincipal, clientPrincipal, KerberosTicket.class); fromAcc = false; } else { @@ -145,14 +152,14 @@ // Try to get ticket from acc's Subject Subject accSubj = Subject.getSubject(acc); - KerberosTicket ticket = (KerberosTicket) + KerberosTicket ticket = SubjectComber.find(accSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); // Try to get ticket from Subject obtained from GSSUtil if (ticket == null && !GSSUtil.useSubjectCredsOnly(caller)) { Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); - ticket = (KerberosTicket) SubjectComber.find(subject, + ticket = SubjectComber.find(subject, serverPrincipal, clientPrincipal, KerberosTicket.class); } return ticket; @@ -182,37 +189,152 @@ return subject; } + // A special KerberosKey, used as keys read from a KeyTab object. + // Each time new keys are read from KeyTab objects in the private + // credentials set, old ones are removed and new ones added. + public static class KeysFromKeyTab extends KerberosKey { + public KeysFromKeyTab(KerberosKey key) { + super(key.getPrincipal(), key.getEncoded(), + key.getKeyType(), key.getVersionNumber()); + } + } + /** - * Retrieves the keys for the specified server principal from - * the Subject in the specified AccessControlContext. - * If the ticket can not be found in the Subject, and if - * useSubjectCredsOnly is false, then obtain keys from - * a LoginContext. + * Credentials of a service, the private secret to authenticate its + * identity, which can be: + * 1. Some KerberosKeys (generated from password) + * 2. A KeyTab (for a typical service) + * 3. A TGT (for a user2user service. Not supported yet) * - * NOTE: This method is used by JSSE Kerberos Cipher Suites + * Note that some creds can coexist. For example, a user2user service + * can use its keytab (or keys) if the client can successfully obtain a + * normal service ticket, otherwise, it can uses the TGT (actually, the + * session key of the TGT) if the client can only acquire a service ticket + * of ENC-TKT-IN-SKEY style. */ - public static KerberosKey[] getKeys(GSSCaller caller, + public static class ServiceCreds { + private KerberosPrincipal kp; + private List<KeyTab> ktabs; + private List<KerberosKey> kk; + private Subject subj; + //private KerberosTicket tgt; // user2user, not supported yet + + private static ServiceCreds getInstance( + Subject subj, String serverPrincipal) { + + ServiceCreds sc = new ServiceCreds(); + sc.subj = subj; + + for (KerberosPrincipal p: subj.getPrincipals(KerberosPrincipal.class)) { + if (serverPrincipal == null || + p.getName().equals(serverPrincipal)) { + sc.kp = p; + serverPrincipal = p.getName(); + break; + } + } + if (sc.kp == null) { + // Compatibility with old behavior: even when there is no + // KerberosPrincipal, we can find one from KerberosKeys + List<KerberosKey> keys = SubjectComber.findMany( + subj, null, null, KerberosKey.class); + if (!keys.isEmpty()) { + sc.kp = keys.get(0).getPrincipal(); + serverPrincipal = sc.kp.getName(); + if (DEBUG) { + System.out.println(">>> ServiceCreds: no kp?" + + " find one from kk: " + serverPrincipal); + } + } else { + return null; + } + } + sc.ktabs = SubjectComber.findMany( + subj, null, null, KeyTab.class); + sc.kk = SubjectComber.findMany( + subj, serverPrincipal, null, KerberosKey.class); + if (sc.ktabs.isEmpty() && sc.kk.isEmpty()) { + return null; + } + return sc; + } + + public String getName() { + return kp.getName(); + } + + public KerberosKey[] getKKeys() { + if (ktabs.isEmpty()) { + return kk.toArray(new KerberosKey[kk.size()]); + } else { + List<KerberosKey> keys = new ArrayList<>(); + for (KeyTab ktab: ktabs) { + for (KerberosKey k: ktab.getKeys(kp)) { + keys.add(k); + } + } + // Compatibility: also add keys to privCredSet. Remove old + // ones first, only remove those from keytab. + if (!subj.isReadOnly()) { + Set<Object> pcs = subj.getPrivateCredentials(); + synchronized (pcs) { + Iterator<Object> iterator = pcs.iterator(); + while (iterator.hasNext()) { + Object obj = iterator.next(); + if (obj instanceof KeysFromKeyTab) { + KerberosKey key = (KerberosKey)obj; + if (Objects.equals(key.getPrincipal(), kp)) { + iterator.remove(); + } + } + } + } + for (KerberosKey key: keys) { + subj.getPrivateCredentials().add(new KeysFromKeyTab(key)); + } + } + return keys.toArray(new KerberosKey[keys.size()]); + } + } + + public EncryptionKey[] getEKeys() { + KerberosKey[] kkeys = getKKeys(); + EncryptionKey[] ekeys = new EncryptionKey[kkeys.length]; + for (int i=0; i<ekeys.length; i++) { + ekeys[i] = new EncryptionKey( + kkeys[i].getEncoded(), kkeys[i].getKeyType(), + new Integer(kkeys[i].getVersionNumber())); + } + return ekeys; + } + + public void destroy() { + kp = null; + ktabs = null; + kk = null; + } + } + /** + * Retrieves the ServiceCreds for the specified server principal from + * the Subject in the specified AccessControlContext. If not found, and if + * useSubjectCredsOnly is false, then obtain from a LoginContext. + * + * NOTE: This method is also used by JSSE Kerberos Cipher Suites + */ + public static ServiceCreds getServiceCreds(GSSCaller caller, String serverPrincipal, AccessControlContext acc) throws LoginException { Subject accSubj = Subject.getSubject(acc); - List<KerberosKey> kkeys = (List<KerberosKey>)SubjectComber.findMany( - accSubj, serverPrincipal, null, KerberosKey.class); - - if (kkeys == null && !GSSUtil.useSubjectCredsOnly(caller)) { - Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); - kkeys = (List<KerberosKey>) SubjectComber.findMany(subject, - serverPrincipal, null, KerberosKey.class); + ServiceCreds sc = null; + if (accSubj != null) { + sc = ServiceCreds.getInstance(accSubj, serverPrincipal); } - - int len; - if (kkeys != null && (len = kkeys.size()) > 0) { - KerberosKey[] keys = new KerberosKey[len]; - kkeys.toArray(keys); - return keys; - } else { - return null; + if (sc == null && !GSSUtil.useSubjectCredsOnly(caller)) { + Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); + sc = ServiceCreds.getInstance(subject, serverPrincipal); } + return sc; } public static KerberosTicket credsToTicket(Credentials serviceCreds) { @@ -247,4 +369,17 @@ kerbTicket.getRenewTill(), kerbTicket.getClientAddresses()); } + + /** + * A helper method to get EncryptionKeys from a javax..KeyTab + * @param ktab the javax..KeyTab class + * @param cname the PrincipalName + * @return the EKeys, never null, might be empty + */ + public static EncryptionKey[] keysFromJavaxKeyTab( + KeyTab ktab, PrincipalName cname) { + return SharedSecrets.getJavaxSecurityAuthKerberosAccess(). + keyTabGetEncryptionKeys(ktab, cname); + } + } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java --- a/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,10 +33,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.security.auth.kerberos.KeyTab; /** - * This utility looks through the current Subject and retrieves a ticket or key - * for the desired client/server principals. + * This utility looks through the current Subject and retrieves private + * credentials for the desired client/server principals. * * @author Ram Marti * @since 1.4.2 @@ -52,58 +53,70 @@ private SubjectComber() { // Cannot create one of these } - static Object find(Subject subject, String serverPrincipal, - String clientPrincipal, Class credClass) { + static <T> T find(Subject subject, String serverPrincipal, + String clientPrincipal, Class<T> credClass) { - return findAux(subject, serverPrincipal, clientPrincipal, credClass, + return (T)findAux(subject, serverPrincipal, clientPrincipal, credClass, true); } - static Object findMany(Subject subject, String serverPrincipal, - String clientPrincipal, Class credClass) { + static <T> List<T> findMany(Subject subject, String serverPrincipal, + String clientPrincipal, Class<T> credClass) { - return findAux(subject, serverPrincipal, clientPrincipal, credClass, + return (List<T>)findAux(subject, serverPrincipal, clientPrincipal, credClass, false); } /** - * Find the ticket or key for the specified client/server principals + * Find private credentials for the specified client/server principals * in the subject. Returns null if the subject is null. * - * @return the ticket or key + * @return the private credentials */ - private static Object findAux(Subject subject, String serverPrincipal, - String clientPrincipal, Class credClass, boolean oneOnly) { + private static <T> Object findAux(Subject subject, String serverPrincipal, + String clientPrincipal, Class<T> credClass, boolean oneOnly) { if (subject == null) { return null; } else { - List<Object> answer = (oneOnly ? null : new ArrayList<Object>()); + List<T> answer = (oneOnly ? null : new ArrayList<T>()); - if (credClass == KerberosKey.class) { - // We are looking for a KerberosKey credentials for the - // serverPrincipal - Iterator<KerberosKey> iterator = - subject.getPrivateCredentials(KerberosKey.class).iterator(); + if (credClass == KeyTab.class) { // Principal un-related + // We are looking for credentials unrelated to serverPrincipal + Iterator<T> iterator = + subject.getPrivateCredentials(credClass).iterator(); while (iterator.hasNext()) { - KerberosKey key = iterator.next(); - if (serverPrincipal == null || - serverPrincipal.equals(key.getPrincipal().getName())) { + T t = iterator.next(); + if (DEBUG) { + System.out.println("Found " + credClass.getSimpleName()); + } + if (oneOnly) { + return t; + } else { + answer.add(t); + } + } + } else if (credClass == KerberosKey.class) { + // We are looking for credentials for the serverPrincipal + Iterator<T> iterator = + subject.getPrivateCredentials(credClass).iterator(); + while (iterator.hasNext()) { + T t = iterator.next(); + String name = ((KerberosKey)t).getPrincipal().getName(); + if (serverPrincipal == null || serverPrincipal.equals(name)) { if (DEBUG) { - System.out.println("Found key for " - + key.getPrincipal() + "(" + - key.getKeyType() + ")"); + System.out.println("Found " + + credClass.getSimpleName() + " for " + name); } if (oneOnly) { - return key; + return t; } else { if (serverPrincipal == null) { // Record name so that keys returned will all // belong to the same principal - serverPrincipal = - key.getPrincipal().getName(); + serverPrincipal = name; } - answer.add(key); + answer.add(t); } } } @@ -167,7 +180,7 @@ serverPrincipal = ticket.getServer().getName(); } - answer.add(ticket); + answer.add((T)ticket); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java --- a/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -152,75 +152,50 @@ "did not have the Sequence tag"); } - // parse SEQUENCE of mechTypes, if present - if (tmp1.data.available() > 0) { + // parse various fields if present + int lastField = -1; + while (tmp1.data.available() > 0) { DerValue tmp2 = tmp1.data.getDerValue(); - if (!tmp2.isContextSpecific((byte)0x00)) { - throw new IOException("SPNEGO NegoTokenInit : " + - "did not have the right context tag for mechTypes"); - } - // get the DER-encoded sequence of mechTypes - DerInputStream mValue = tmp2.data; - mechTypes = mValue.toByteArray(); + if (tmp2.isContextSpecific((byte)0x00)) { + // get the DER-encoded sequence of mechTypes + lastField = checkNextField(lastField, 0); + DerInputStream mValue = tmp2.data; + mechTypes = mValue.toByteArray(); - // read all the mechTypes - DerValue[] mList = mValue.getSequence(0); - mechTypeList = new Oid[mList.length]; - ObjectIdentifier mech = null; - for (int i = 0; i < mList.length; i++) { - mech = mList[i].getOID(); + // read all the mechTypes + DerValue[] mList = mValue.getSequence(0); + mechTypeList = new Oid[mList.length]; + ObjectIdentifier mech = null; + for (int i = 0; i < mList.length; i++) { + mech = mList[i].getOID(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenInit: " + + "reading Mechanism Oid = " + mech); + } + mechTypeList[i] = new Oid(mech.toString()); + } + } else if (tmp2.isContextSpecific((byte)0x01)) { + lastField = checkNextField(lastField, 1); + // received reqFlags, skip it + } else if (tmp2.isContextSpecific((byte)0x02)) { + lastField = checkNextField(lastField, 2); if (DEBUG) { System.out.println("SpNegoToken NegTokenInit: " + - "reading Mechanism Oid = " + mech); + "reading Mech Token"); } - mechTypeList[i] = new Oid(mech.toString()); - } - } - - // parse mechToken, if present (skip reqFlags) - if (tmp1.data.available() > 0) { - DerValue tmp3 = tmp1.data.getDerValue(); - if (tmp3.isContextSpecific((byte)0x01)) { - // received reqFlags, skip it - // now parse next field mechToken - if (tmp1.data.available() > 0) { - tmp3 = tmp1.data.getDerValue(); + mechToken = tmp2.data.getOctetString(); + } else if (tmp2.isContextSpecific((byte)0x03)) { + lastField = checkNextField(lastField, 3); + if (!GSSUtil.useMSInterop()) { + mechListMIC = tmp2.data.getOctetString(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenInit: " + + "MechListMIC Token = " + + getHexBytes(mechListMIC)); + } } } - if (!tmp3.isContextSpecific((byte)0x02)) { - throw new IOException("SPNEGO NegoTokenInit : " + - "did not have the right context tag for mechToken"); - } - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit: " + - "reading Mech Token"); - } - mechToken = tmp3.data.getOctetString(); } - - // parse mechListMIC, if present and not in MS interop mode - if (!GSSUtil.useMSInterop() && (tmp1.data.available() > 0)) { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit: " + - "receiving MechListMIC"); - } - DerValue tmp6 = tmp1.data.getDerValue(); - if (!tmp6.isContextSpecific((byte)0x03)) { - throw new IOException("SPNEGO NegoTokenInit : " + - "did not have the right context tag for MICToken"); - } - mechListMIC = tmp6.data.getOctetString(); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit: " + - "MechListMIC Token = " + getHexBytes(mechListMIC)); - } - } else { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenInit : " + - "no MIC token included"); - } - } - } catch (IOException e) { throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1, "Invalid SPNEGO NegTokenInit token : " + e.getMessage()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java --- a/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -153,69 +153,40 @@ "did not have the Sequence tag"); } - // parse negResult, if present - if (tmp1.data.available() > 0) { + // parse various fields if present + int lastField = -1; + while (tmp1.data.available() > 0) { DerValue tmp2 = tmp1.data.getDerValue(); - if (!tmp2.isContextSpecific((byte)0x00)) { - throw new IOException("SPNEGO NegoTokenTarg : " + - "did not have the right context tag for negResult"); - } - negResult = tmp2.data.getEnumerated(); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: negotiated" + - " result = " + getNegoResultString(negResult)); - } - } - - // parse supportedMech, if present - if (tmp1.data.available() > 0) { - DerValue tmp3 = tmp1.data.getDerValue(); - if (!tmp3.isContextSpecific((byte)0x01)) { - throw new IOException("SPNEGO NegoTokenTarg : " + - "did not have the right context tag for supportedMech"); - } - ObjectIdentifier mech = tmp3.data.getOID(); - supportedMech = new Oid(mech.toString()); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: " + - "supported mechanism = " + supportedMech); + if (tmp2.isContextSpecific((byte)0x00)) { + lastField = checkNextField(lastField, 0); + negResult = tmp2.data.getEnumerated(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenTarg: negotiated" + + " result = " + getNegoResultString(negResult)); + } + } else if (tmp2.isContextSpecific((byte)0x01)) { + lastField = checkNextField(lastField, 1); + ObjectIdentifier mech = tmp2.data.getOID(); + supportedMech = new Oid(mech.toString()); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenTarg: " + + "supported mechanism = " + supportedMech); + } + } else if (tmp2.isContextSpecific((byte)0x02)) { + lastField = checkNextField(lastField, 2); + responseToken = tmp2.data.getOctetString(); + } else if (tmp2.isContextSpecific((byte)0x03)) { + lastField = checkNextField(lastField, 3); + if (!GSSUtil.useMSInterop()) { + mechListMIC = tmp2.data.getOctetString(); + if (DEBUG) { + System.out.println("SpNegoToken NegTokenTarg: " + + "MechListMIC Token = " + + getHexBytes(mechListMIC)); + } + } } } - - // parse ResponseToken, if present - if (tmp1.data.available() > 0) { - DerValue tmp4 = tmp1.data.getDerValue(); - if (!tmp4.isContextSpecific((byte)0x02)) { - throw new IOException("SPNEGO NegoTokenTarg : did not" + - " have the right context tag for response token"); - } - responseToken = tmp4.data.getOctetString(); - } - - // parse mechListMIC if present and not in MS interop - if (!GSSUtil.useMSInterop() && (tmp1.data.available() > 0)) { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: " + - "receiving MechListMIC"); - } - DerValue tmp5 = tmp1.data.getDerValue(); - if (!tmp5.isContextSpecific((byte)0x03)) { - throw new IOException("SPNEGO NegoTokenTarg : " + - "did not have the right context tag for mechListMIC"); - } - mechListMIC = tmp5.data.getOctetString(); - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg: " + - "MechListMIC Token = " + - getHexBytes(mechListMIC)); - } - } else { - if (DEBUG) { - System.out.println("SpNegoToken NegTokenTarg : " + - "no MIC token included"); - } - } - } catch (IOException e) { throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1, "Invalid SPNEGO NegTokenTarg token : " + e.getMessage()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java --- a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -187,4 +187,21 @@ return ("Unknown Negotiated Result: " + result); } } + + /** + * Checks if the context tag in a sequence is in correct order. The "last" + * value must be smaller than "current". + * @param last the last tag seen + * @param current the current tag + * @return the current tag, used as the next value for last + * @throws GSSException if there's a wrong order + */ + static int checkNextField(int last, int current) throws GSSException { + if (last < current) { + return current; + } else { + throw new GSSException(GSSException.DEFECTIVE_TOKEN, -1, + "Invalid SpNegoToken token : wrong order"); + } + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/Config.java --- a/jdk/src/share/classes/sun/security/krb5/Config.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/Config.java Sat May 14 11:52:15 2011 -0700 @@ -110,7 +110,6 @@ public static synchronized void refresh() throws KrbException { singleton = new Config(); - KeyTab.refresh(); KdcComm.initStatic(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/EncryptionKey.java --- a/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -138,8 +138,7 @@ * @returns an array of secret keys or null if none were found. */ public static EncryptionKey[] acquireSecretKeys(PrincipalName princ, - String keytab) - throws KrbException, IOException { + String keytab) { if (princ == null) throw new IllegalArgumentException( @@ -148,11 +147,6 @@ // KeyTab getInstance(keytab) will call KeyTab.getInstance() // if keytab is null KeyTab ktab = KeyTab.getInstance(keytab); - - if (ktab == null) { - return null; - } - return ktab.readServiceKeys(princ); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/KrbAsRep.java --- a/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java Sat May 14 11:52:15 2011 -0700 @@ -37,6 +37,8 @@ import sun.security.util.*; import java.io.IOException; import java.util.Objects; +import javax.security.auth.kerberos.KeyTab; +import sun.security.jgss.krb5.Krb5Util; /** * This class encapsulates a AS-REP message that the KDC sends to the @@ -90,29 +92,32 @@ } /** - * Called by KrbAsReqBuilder to resolve a AS-REP message using keys. - * @param keys user provided keys, not null + * Called by KrbAsReqBuilder to resolve a AS-REP message using a keytab. + * @param ktab the keytab, not null * @param asReq the original AS-REQ sent, used to validate AS-REP + * @param cname the user principal name, used to locate keys in ktab */ - void decryptUsingKeys(EncryptionKey[] keys, KrbAsReq asReq) + void decryptUsingKeyTab(KeyTab ktab, KrbAsReq asReq, PrincipalName cname) throws KrbException, Asn1Exception, IOException { EncryptionKey dkey = null; int encPartKeyType = rep.encPart.getEType(); Integer encPartKvno = rep.encPart.kvno; - try { - dkey = EncryptionKey.findKey(encPartKeyType, encPartKvno, keys); - } catch (KrbException ke) { - if (ke.returnCode() == Krb5.KRB_AP_ERR_BADKEYVER) { - // Fallback to no kvno. In some cases, keytab is generated - // not by sysadmin but Java's ktab command - dkey = EncryptionKey.findKey(encPartKeyType, keys); + try { + dkey = EncryptionKey.findKey(encPartKeyType, encPartKvno, + Krb5Util.keysFromJavaxKeyTab(ktab, cname)); + } catch (KrbException ke) { + if (ke.returnCode() == Krb5.KRB_AP_ERR_BADKEYVER) { + // Fallback to no kvno. In some cases, keytab is generated + // not by sysadmin but Java's ktab command + dkey = EncryptionKey.findKey(encPartKeyType, + Krb5Util.keysFromJavaxKeyTab(ktab, cname)); + } } - } - if (dkey == null) { - throw new KrbException(Krb5.API_INVALID_ARG, - "Cannot find key for type/kvno to decrypt AS REP - " + - EType.toString(encPartKeyType) + "/" + encPartKvno); - } + if (dkey == null) { + throw new KrbException(Krb5.API_INVALID_ARG, + "Cannot find key for type/kvno to decrypt AS REP - " + + EType.toString(encPartKeyType) + "/" + encPartKvno); + } decrypt(dkey, asReq); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java --- a/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ import java.io.IOException; import java.util.Arrays; +import javax.security.auth.kerberos.KeyTab; +import sun.security.jgss.krb5.Krb5Util; import sun.security.krb5.internal.HostAddresses; import sun.security.krb5.internal.KDCOptions; import sun.security.krb5.internal.KRBError; @@ -42,13 +44,16 @@ * 1. Gather information to create AS-REQ * 2. Create and send AS-REQ * 3. Receive AS-REP and KRB-ERROR (-KRB_ERR_RESPONSE_TOO_BIG) and parse them - * 4. Emit credentials and secret keys (for JAAS storeKey=true) + * 4. Emit credentials and secret keys (for JAAS storeKey=true with password) * * This class does not: * 1. Deal with real communications (KdcComm does it, and TGS-REQ) * a. Name of KDCs for a realm * b. Server availability, timeout, UDP or TCP * d. KRB_ERR_RESPONSE_TOO_BIG + * 2. Stores its own copy of password, this means: + * a. Do not change/wipe it before Builder finish + * b. Builder will not wipe it for you * * With this class: * 1. KrbAsReq has only one constructor @@ -70,19 +75,17 @@ private HostAddresses addresses; // Secret source: can't be changed once assigned, only one (of the two - // sources) can be set and should be non-null - private EncryptionKey[] keys; - private char[] password; + // sources) can be set to non-null + private final char[] password; + private final KeyTab ktab; // Used to create a ENC-TIMESTAMP in the 2nd AS-REQ - private EncryptionKey pakey; private PAData[] paList; // PA-DATA from both KRB-ERROR and AS-REP. // Used by getKeys() only. // Only AS-REP should be enough per RFC, // combined in case etypes are different. // The generated and received: - int[] eTypes; private KrbAsReq req; private KrbAsRep rep; @@ -94,7 +97,7 @@ private State state; // Called by other constructors - private KrbAsReqBuilder(PrincipalName cname) + private void init(PrincipalName cname) throws KrbException { if (cname.getRealm() == null) { cname.setRealm(Config.getInstance().getDefaultRealm()); @@ -114,14 +117,11 @@ * This argument will neither be modified nor stored by the method. * @throws KrbException */ - public KrbAsReqBuilder(PrincipalName cname, EncryptionKey[] keys) + public KrbAsReqBuilder(PrincipalName cname, KeyTab ktab) throws KrbException { - this(cname); - this.keys = new EncryptionKey[keys.length]; - for (int i=0; i<keys.length; i++) { - this.keys[i] = (EncryptionKey)keys[i].clone(); - } - eTypes = EType.getDefaults("default_tkt_enctypes", keys); + init(cname); + this.ktab = ktab; + this.password = null; } /** @@ -137,30 +137,24 @@ */ public KrbAsReqBuilder(PrincipalName cname, char[] pass) throws KrbException { - this(cname); + init(cname); this.password = pass.clone(); - eTypes = EType.getDefaults("default_tkt_enctypes"); + this.ktab = null; } /** - * Retrieves an array of secret keys for the client. This is useful if + * Retrieves an array of secret keys for the client. This is used when * the client supplies password but need keys to act as an acceptor * (in JAAS words, isInitiator=true and storeKey=true) - * @return original keys if initiated with keys, or generated keys if - * password. In latter case, PA-DATA from server might be used to - * generate keys. All "default_tkt_enctypes" keys will be generated, - * Never null. + * @return generated keys from password. PA-DATA from server might be used. + * All "default_tkt_enctypes" keys will be generated, Never null. + * @throws IllegalStateException if not constructed from a password * @throws KrbException */ public EncryptionKey[] getKeys() throws KrbException { checkState(State.REQ_OK, "Cannot get keys"); - if (keys != null) { - EncryptionKey[] result = new EncryptionKey[keys.length]; - for (int i=0; i<keys.length; i++) { - result[i] = (EncryptionKey)keys[i].clone(); - } - return result; - } else { + if (password != null) { + int[] eTypes = EType.getDefaults("default_tkt_enctypes"); EncryptionKey[] result = new EncryptionKey[eTypes.length]; /* @@ -205,6 +199,8 @@ } } return result; + } else { + throw new IllegalStateException("Required password not provided"); } } @@ -241,12 +237,22 @@ /** * Build a KrbAsReq object from all info fed above. Normally this method * will be called twice: initial AS-REQ and second with pakey + * @param key null (initial AS-REQ) or pakey (with preauth) * @return the KrbAsReq object * @throws KrbException * @throws IOException */ - private KrbAsReq build() throws KrbException, IOException { - return new KrbAsReq(pakey, + private KrbAsReq build(EncryptionKey key) throws KrbException, IOException { + int[] eTypes; + if (password != null) { + eTypes = EType.getDefaults("default_tkt_enctypes"); + } else { + EncryptionKey[] ks = Krb5Util.keysFromJavaxKeyTab(ktab, cname); + eTypes = EType.getDefaults("default_tkt_enctypes", + ks); + for (EncryptionKey k: ks) k.destroy(); + } + return new KrbAsReq(key, options, cname, sname, @@ -263,9 +269,10 @@ * @throws Asn1Exception * @throws IOException */ - private KrbAsReqBuilder resolve() throws KrbException, Asn1Exception, IOException { - if (keys != null) { - rep.decryptUsingKeys(keys, req); + private KrbAsReqBuilder resolve() + throws KrbException, Asn1Exception, IOException { + if (ktab != null) { + rep.decryptUsingKeyTab(ktab, req, cname); } else { rep.decryptUsingPassword(password, req, cname); } @@ -292,9 +299,10 @@ private KrbAsReqBuilder send() throws KrbException, IOException { boolean preAuthFailedOnce = false; KdcComm comm = new KdcComm(cname.getRealmAsString()); + EncryptionKey pakey = null; while (true) { try { - req = build(); + req = build(pakey); rep = new KrbAsRep(comm.send(req.encoding())); return this; } catch (KrbException ke) { @@ -308,7 +316,10 @@ preAuthFailedOnce = true; KRBError kerr = ke.getError(); if (password == null) { - pakey = EncryptionKey.findKey(kerr.getEType(), keys); + EncryptionKey[] ks = Krb5Util.keysFromJavaxKeyTab(ktab, cname); + pakey = EncryptionKey.findKey(kerr.getEType(), ks); + if (pakey != null) pakey = (EncryptionKey)pakey.clone(); + for (EncryptionKey k: ks) k.destroy(); } else { PAData.SaltAndParams snp = PAData.getSaltAndParams( kerr.getEType(), kerr.getPA()); @@ -317,7 +328,7 @@ // does not recommend this pakey = EncryptionKey.acquireSecretKey(password, snp.salt == null ? cname.getSalt() : snp.salt, - eTypes[0], + EType.getDefaults("default_tkt_enctypes")[0], null); } else { pakey = EncryptionKey.acquireSecretKey(password, @@ -369,15 +380,8 @@ */ public void destroy() { state = State.DESTROYED; - if (keys != null) { - for (EncryptionKey k: keys) { - k.destroy(); - } - keys = null; - } if (password != null) { Arrays.fill(password, (char)0); - password = null; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java --- a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java Sat May 14 11:52:15 2011 -0700 @@ -40,6 +40,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.File; +import java.io.FileNotFoundException; import java.util.Comparator; import java.util.HashMap; import java.util.Map; @@ -50,92 +51,138 @@ * This class represents key table. The key table functions deal with storing * and retrieving service keys for use in authentication exchanges. * + * A KeyTab object is always constructed, if the file specified does not + * exist, it's still valid but empty. If there is an I/O error or file format + * error, it's invalid. + * + * The class is immutable on the read side (the write side is only used by + * the ktab tool). + * * @author Yanni Zhang */ public class KeyTab implements KeyTabConstants { - int kt_vno; - private static KeyTab singleton = null; + private static final boolean DEBUG = Krb5.DEBUG; - private static String name; + private static String defaultTabName = null; + + // Attention: Currently there is no way to remove a keytab from this map, + // this might lead to a memory leak. + private static Map<String,KeyTab> map = new HashMap<>(); + + // KeyTab file does not exist. Note: a missing keytab is still valid + private boolean isMissing = false; + + // KeyTab file is invalid, possibly an I/O error or a file format error. + private boolean isValid = true; + + private final String tabName; + private long lastModified; + private int kt_vno; + private Vector<KeyTabEntry> entries = new Vector<>(); - private KeyTab(String filename) throws IOException, RealmException { - init(filename); - } - - public static KeyTab getInstance(String s) { - name = parse(s); - if (name == null) { - return getInstance(); + /** + * Constructs a KeyTab object. + * + * If there is any I/O error or format errot during the loading, the + * isValid flag is set to false, and all half-read entries are dismissed. + * @param filename path name for the keytab file, must not be null + */ + private KeyTab(String filename) { + tabName = filename; + try { + lastModified = new File(tabName).lastModified(); + try (KeyTabInputStream kis = + new KeyTabInputStream(new FileInputStream(filename))) { + load(kis); + } + } catch (FileNotFoundException e) { + entries.clear(); + isMissing = true; + } catch (Exception ioe) { + entries.clear(); + isValid = false; } - return getInstance(new File(name)); } /** - * Gets the single instance of KeyTab class. - * @param file the key tab file. - * @return single instance of KeyTab; - * return null if error occurs while reading data out of the file. + * Read a keytab file. Returns a new object and save it into cache when + * new content (modified since last read) is available. If keytab file is + * invalid, the old object will be returned. This is a safeguard for + * partial-written keytab files or non-stable network. Please note that + * a missing keytab is valid, which is equivalent to an empty keytab. + * + * @param s file name of keytab, must not be null + * @return the keytab object, can be invalid, but never null. */ - public static KeyTab getInstance(File file) { - try { - if (!(file.exists())) { - singleton = null; - } else { - String fname = file.getAbsolutePath(); - // Since this class deals with file I/O operations, - // we want only one class instance existing. - if (singleton != null) { - File kfile = new File(singleton.name); - String kname = kfile.getAbsolutePath(); - if (kname.equalsIgnoreCase(fname)) { - if (DEBUG) { - System.out.println("KeyTab instance already exists"); - } - } - } else { - singleton = new KeyTab(fname); - } - } - } catch (Exception e) { - singleton = null; - if (DEBUG) { - System.out.println("Could not obtain an instance of KeyTab" + - e.getMessage()); - } + private synchronized static KeyTab getInstance0(String s) { + long lm = new File(s).lastModified(); + KeyTab old = map.get(s); + if (old != null && old.isValid() && old.lastModified == lm) { + return old; } - return singleton; + KeyTab ktab = new KeyTab(s); + if (ktab.isValid()) { // A valid new keytab + map.put(s, ktab); + return ktab; + } else if (old != null) { // An existing old one + return old; + } else { + return ktab; // first read is invalid + } } /** - * Gets the single instance of KeyTab class. - * @return single instance of KeyTab; return null if default keytab file - * does not exist, or error occurs while reading data from the file. + * Gets a KeyTab object. + * @param s the key tab file name. + * @return the KeyTab object, never null. + */ + public static KeyTab getInstance(String s) { + if (s == null) { + return getInstance(); + } else { + return getInstance0(s); + } + } + + /** + * Gets a KeyTab object. + * @param file the key tab file. + * @return the KeyTab object, never null. + */ + public static KeyTab getInstance(File file) { + if (file == null) { + return getInstance(); + } else { + return getInstance0(file.getPath()); + } + } + + /** + * Gets the default KeyTab object. + * @return the KeyTab object, never null. */ public static KeyTab getInstance() { - try { - name = getDefaultKeyTab(); - if (name != null) { - singleton = getInstance(new File(name)); - } - } catch (Exception e) { - singleton = null; - if (DEBUG) { - System.out.println("Could not obtain an instance of KeyTab" + - e.getMessage()); - } - } - return singleton; + return getInstance(getDefaultTabName()); + } + + public boolean isMissing() { + return isMissing; + } + + public boolean isValid() { + return isValid; } /** * The location of keytab file will be read from the configuration file * If it is not specified, consider user.home as the keytab file's * default location. + * @return never null */ - private static String getDefaultKeyTab() { - if (name != null) { - return name; + private static String getDefaultTabName() { + if (defaultTabName != null) { + return defaultTabName; } else { String kname = null; try { @@ -145,7 +192,7 @@ StringTokenizer st = new StringTokenizer(keytab_names, " "); while (st.hasMoreTokens()) { kname = parse(st.nextToken()); - if (kname != null) { + if (new File(kname).exists()) { break; } } @@ -165,19 +212,20 @@ new sun.security.action.GetPropertyAction("user.dir")); } - if (user_home != null) { - kname = user_home + File.separator + "krb5.keytab"; - } + kname = user_home + File.separator + "krb5.keytab"; } + defaultTabName = kname; return kname; } } + /** + * Parses some common keytab name formats + * @param name never null + * @return never null + */ private static String parse(String name) { - String kname = null; - if (name == null) { - return null; - } + String kname; if ((name.length() >= 5) && (name.substring(0, 5).equalsIgnoreCase("FILE:"))) { kname = name.substring(5); @@ -194,18 +242,6 @@ return kname; } - private synchronized void init(String filename) - throws IOException, RealmException { - - if (filename != null) { - KeyTabInputStream kis = - new KeyTabInputStream(new FileInputStream(filename)); - load(kis); - kis.close(); - name = filename; - } - } - private void load(KeyTabInputStream kis) throws IOException, RealmException { @@ -234,14 +270,13 @@ * etypes that have been configured for use. If there are multiple * keys with same etype, the one with the highest kvno is returned. * @param service the PrincipalName of the requested service - * @return an array containing all the service keys + * @return an array containing all the service keys, never null */ public EncryptionKey[] readServiceKeys(PrincipalName service) { KeyTabEntry entry; EncryptionKey key; int size = entries.size(); ArrayList<EncryptionKey> keys = new ArrayList<>(size); - for (int i = size-1; i >= 0; i--) { entry = entries.elementAt(i); if (entry.service.match(service)) { @@ -260,10 +295,7 @@ } } } - size = keys.size(); - if (size == 0) - return null; EncryptionKey[] retVal = keys.toArray(new EncryptionKey[size]); // Sort keys according to default_tkt_enctypes @@ -328,10 +360,13 @@ return false; } - public static String tabName() { - return name; + public String tabName() { + return tabName; } + /////////////////// THE WRITE SIDE /////////////////////// + /////////////// only used by ktab tool ////////////////// + /** * Adds a new entry in the key table. * @param service the service which will have a new entry in the key table. @@ -394,7 +429,7 @@ */ public synchronized static KeyTab create() throws IOException, RealmException { - String dname = getDefaultKeyTab(); + String dname = getDefaultTabName(); return create(dname); } @@ -404,25 +439,24 @@ public synchronized static KeyTab create(String name) throws IOException, RealmException { - KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(name)); - kos.writeVersion(KRB5_KT_VNO); - kos.close(); - singleton = new KeyTab(name); - return singleton; + try (KeyTabOutputStream kos = + new KeyTabOutputStream(new FileOutputStream(name))) { + kos.writeVersion(KRB5_KT_VNO); + } + return new KeyTab(name); } /** * Saves the file at the directory. */ public synchronized void save() throws IOException { - KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(name)); - kos.writeVersion(kt_vno); - for (int i = 0; i < entries.size(); i++) { - kos.writeEntry(entries.elementAt(i)); + try (KeyTabOutputStream kos = + new KeyTabOutputStream(new FileOutputStream(tabName))) { + kos.writeVersion(kt_vno); + for (int i = 0; i < entries.size(); i++) { + kos.writeEntry(entries.elementAt(i)); + } } - kos.close(); } /** @@ -485,18 +519,9 @@ * @exception IOException. */ public synchronized void createVersion(File file) throws IOException { - KeyTabOutputStream kos = - new KeyTabOutputStream(new FileOutputStream(file)); - kos.write16(KRB5_KT_VNO); - kos.close(); - } - - public static void refresh() { - if (singleton != null) { - if (DEBUG) { - System.out.println("Refreshing Keytab"); - } - singleton = null; + try (KeyTabOutputStream kos = + new KeyTabOutputStream(new FileOutputStream(file))) { + kos.write16(KRB5_KT_VNO); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/pkcs/PKCS7.java --- a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/pkcs/PKCS7.java Sat May 14 11:52:15 2011 -0700 @@ -38,7 +38,6 @@ import sun.security.util.*; import sun.security.x509.AlgorithmId; import sun.security.x509.CertificateIssuerName; -import sun.security.x509.KeyUsageExtension; import sun.security.x509.X509CertImpl; import sun.security.x509.X509CertInfo; import sun.security.x509.X509CRLImpl; @@ -493,7 +492,7 @@ // CRLs (optional) if (crls != null && crls.length != 0) { // cast to X509CRLImpl[] since X509CRLImpl implements DerEncoder - Set<X509CRLImpl> implCRLs = new HashSet<>(crls.length); + Set<X509CRLImpl> implCRLs = new HashSet<X509CRLImpl>(crls.length); for (X509CRL crl: crls) { if (crl instanceof X509CRLImpl) implCRLs.add((X509CRLImpl) crl); @@ -531,168 +530,6 @@ } /** - * Verifying signed data using an external chunked data source. - */ - public static class PKCS7Verifier { - - private final SignerInfo si; // Signer to verify - private final MessageDigest md; // MessageDigest object for chunks - private final Signature sig; // Signature object for chunks - - private PKCS7Verifier(SignerInfo si, MessageDigest md, Signature sig) { - this.si = si; - this.md = md; - this.sig = sig; - } - - public static PKCS7Verifier from(PKCS7 block, SignerInfo si) throws - SignatureException, NoSuchAlgorithmException { - - try { - MessageDigest md = null; - Signature sig; - - ContentInfo content = block.getContentInfo(); - String digestAlgname = si.getDigestAlgorithmId().getName(); - - // if there are authenticate attributes, feed data chunks to - // the message digest. In this case, pv.md is not null - if (si.authenticatedAttributes != null) { - // first, check content type - ObjectIdentifier contentType = (ObjectIdentifier) - si.authenticatedAttributes.getAttributeValue( - PKCS9Attribute.CONTENT_TYPE_OID); - if (contentType == null || - !contentType.equals(content.contentType)) - return null; // contentType does not match, bad SignerInfo - - // now, check message digest - byte[] messageDigest = (byte[]) - si.authenticatedAttributes.getAttributeValue( - PKCS9Attribute.MESSAGE_DIGEST_OID); - - if (messageDigest == null) // fail if there is no message digest - return null; - - md = MessageDigest.getInstance(digestAlgname); - } - - // put together digest algorithm and encryption algorithm - // to form signing algorithm - String encryptionAlgname = - si.getDigestEncryptionAlgorithmId().getName(); - - // Workaround: sometimes the encryptionAlgname is actually - // a signature name - String tmp = AlgorithmId.getEncAlgFromSigAlg(encryptionAlgname); - if (tmp != null) encryptionAlgname = tmp; - String algname = AlgorithmId.makeSigAlg( - digestAlgname, encryptionAlgname); - - sig = Signature.getInstance(algname); - X509Certificate cert = si.getCertificate(block); - - if (cert == null) { - return null; - } - if (cert.hasUnsupportedCriticalExtension()) { - throw new SignatureException("Certificate has unsupported " - + "critical extension(s)"); - } - - // Make sure that if the usage of the key in the certificate is - // restricted, it can be used for digital signatures. - // XXX We may want to check for additional extensions in the - // future. - boolean[] keyUsageBits = cert.getKeyUsage(); - if (keyUsageBits != null) { - KeyUsageExtension keyUsage; - try { - // We don't care whether or not this extension was marked - // critical in the certificate. - // We're interested only in its value (i.e., the bits set) - // and treat the extension as critical. - keyUsage = new KeyUsageExtension(keyUsageBits); - } catch (IOException ioe) { - throw new SignatureException("Failed to parse keyUsage " - + "extension"); - } - - boolean digSigAllowed = ((Boolean)keyUsage.get( - KeyUsageExtension.DIGITAL_SIGNATURE)).booleanValue(); - - boolean nonRepuAllowed = ((Boolean)keyUsage.get( - KeyUsageExtension.NON_REPUDIATION)).booleanValue(); - - if (!digSigAllowed && !nonRepuAllowed) { - throw new SignatureException("Key usage restricted: " - + "cannot be used for " - + "digital signatures"); - } - } - - PublicKey key = cert.getPublicKey(); - sig.initVerify(key); - return new PKCS7Verifier(si, md, sig); - } catch (IOException e) { - throw new SignatureException("IO error verifying signature:\n" + - e.getMessage()); - - } catch (InvalidKeyException e) { - throw new SignatureException("InvalidKey: " + e.getMessage()); - - } - } - - public void update(byte[] data, int off, int end) - throws SignatureException { - if (md != null) { - md.update(data, off, end-off); - } else { - sig.update(data, off, end-off); - } - } - - public SignerInfo verify() throws SignatureException { - try { - // if there are authenticate attributes, get the message - // digest and compare it with the digest of data - if (md != null) { - // now, check message digest - byte[] messageDigest = (byte[]) - si.authenticatedAttributes.getAttributeValue( - PKCS9Attribute.MESSAGE_DIGEST_OID); - - byte[] computedMessageDigest = md.digest(); - - if (!MessageDigest.isEqual( - messageDigest, computedMessageDigest)) { - return null; - } - - // message digest attribute matched - // digest of original data - - // the data actually signed is the DER encoding of - // the authenticated attributes (tagged with - // the "SET OF" tag, not 0xA0). - byte[] dataSigned = si.authenticatedAttributes.getDerEncoding(); - sig.update(dataSigned); - } - - if (sig.verify(si.getEncryptedDigest())) { - return si; - } - - } catch (IOException e) { - throw new SignatureException("IO error verifying signature:\n" + - e.getMessage()); - } - return null; - } - } - - /** * This verifies a given SignerInfo. * * @param info the signer information. @@ -717,16 +554,19 @@ public SignerInfo[] verify(byte[] bytes) throws NoSuchAlgorithmException, SignatureException { - List<SignerInfo> intResult = new ArrayList<>(); + Vector<SignerInfo> intResult = new Vector<SignerInfo>(); for (int i = 0; i < signerInfos.length; i++) { SignerInfo signerInfo = verify(signerInfos[i], bytes); if (signerInfo != null) { - intResult.add(signerInfo); + intResult.addElement(signerInfo); } } - if (!intResult.isEmpty()) { - return intResult.toArray(new SignerInfo[intResult.size()]); + if (intResult.size() != 0) { + + SignerInfo[] result = new SignerInfo[intResult.size()]; + intResult.copyInto(result); + return result; } return null; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/pkcs/SignerInfo.java --- a/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Sat May 14 11:52:15 2011 -0700 @@ -230,7 +230,7 @@ if (userCert == null) return null; - ArrayList<X509Certificate> certList = new ArrayList<>(); + ArrayList<X509Certificate> certList = new ArrayList<X509Certificate>(); certList.add(userCert); X509Certificate[] pkcsCerts = block.getCertificates(); @@ -276,20 +276,132 @@ /* Returns null if verify fails, this signerInfo if verify succeeds. */ SignerInfo verify(PKCS7 block, byte[] data) - throws NoSuchAlgorithmException, SignatureException { + throws NoSuchAlgorithmException, SignatureException { + + try { + + ContentInfo content = block.getContentInfo(); + if (data == null) { + data = content.getContentBytes(); + } + + String digestAlgname = getDigestAlgorithmId().getName(); + + byte[] dataSigned; + + // if there are authenticate attributes, get the message + // digest and compare it with the digest of data + if (authenticatedAttributes == null) { + dataSigned = data; + } else { + + // first, check content type + ObjectIdentifier contentType = (ObjectIdentifier) + authenticatedAttributes.getAttributeValue( + PKCS9Attribute.CONTENT_TYPE_OID); + if (contentType == null || + !contentType.equals(content.contentType)) + return null; // contentType does not match, bad SignerInfo + + // now, check message digest + byte[] messageDigest = (byte[]) + authenticatedAttributes.getAttributeValue( + PKCS9Attribute.MESSAGE_DIGEST_OID); + + if (messageDigest == null) // fail if there is no message digest + return null; + + MessageDigest md = MessageDigest.getInstance(digestAlgname); + byte[] computedMessageDigest = md.digest(data); + + if (messageDigest.length != computedMessageDigest.length) + return null; + for (int i = 0; i < messageDigest.length; i++) { + if (messageDigest[i] != computedMessageDigest[i]) + return null; + } + + // message digest attribute matched + // digest of original data + + // the data actually signed is the DER encoding of + // the authenticated attributes (tagged with + // the "SET OF" tag, not 0xA0). + dataSigned = authenticatedAttributes.getDerEncoding(); + } + + // put together digest algorithm and encryption algorithm + // to form signing algorithm + String encryptionAlgname = + getDigestEncryptionAlgorithmId().getName(); - PKCS7.PKCS7Verifier p7v = PKCS7.PKCS7Verifier.from(block, this); - if (p7v == null) return null; - if (data == null) { - try { - data = block.getContentInfo().getContentBytes(); - } catch (IOException e) { - throw new SignatureException("IO error verifying signature:\n" + - e.getMessage()); + // Workaround: sometimes the encryptionAlgname is actually + // a signature name + String tmp = AlgorithmId.getEncAlgFromSigAlg(encryptionAlgname); + if (tmp != null) encryptionAlgname = tmp; + String algname = AlgorithmId.makeSigAlg( + digestAlgname, encryptionAlgname); + + Signature sig = Signature.getInstance(algname); + X509Certificate cert = getCertificate(block); + + if (cert == null) { + return null; + } + if (cert.hasUnsupportedCriticalExtension()) { + throw new SignatureException("Certificate has unsupported " + + "critical extension(s)"); } + + // Make sure that if the usage of the key in the certificate is + // restricted, it can be used for digital signatures. + // XXX We may want to check for additional extensions in the + // future. + boolean[] keyUsageBits = cert.getKeyUsage(); + if (keyUsageBits != null) { + KeyUsageExtension keyUsage; + try { + // We don't care whether or not this extension was marked + // critical in the certificate. + // We're interested only in its value (i.e., the bits set) + // and treat the extension as critical. + keyUsage = new KeyUsageExtension(keyUsageBits); + } catch (IOException ioe) { + throw new SignatureException("Failed to parse keyUsage " + + "extension"); + } + + boolean digSigAllowed = ((Boolean)keyUsage.get( + KeyUsageExtension.DIGITAL_SIGNATURE)).booleanValue(); + + boolean nonRepuAllowed = ((Boolean)keyUsage.get( + KeyUsageExtension.NON_REPUDIATION)).booleanValue(); + + if (!digSigAllowed && !nonRepuAllowed) { + throw new SignatureException("Key usage restricted: " + + "cannot be used for " + + "digital signatures"); + } + } + + PublicKey key = cert.getPublicKey(); + sig.initVerify(key); + + sig.update(dataSigned); + + if (sig.verify(encryptedDigest)) { + return this; + } + + } catch (IOException e) { + throw new SignatureException("IO error verifying signature:\n" + + e.getMessage()); + + } catch (InvalidKeyException e) { + throw new SignatureException("InvalidKey: " + e.getMessage()); + } - p7v.update(data, 0, data.length); - return p7v.verify(); + return null; } /* Verify the content of the pkcs7 block. */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java --- a/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java Sat May 14 11:52:15 2011 -0700 @@ -312,7 +312,8 @@ DistributionPointFetcher.getInstance(); // all CRLs returned by the DP Fetcher have also been verified mApprovedCRLs.addAll(store.getCRLs(sel, signFlag, prevKey, - mSigProvider, mStores, reasonsMask, trustAnchors)); + mSigProvider, mStores, reasonsMask, trustAnchors, + mParams.getDate())); } catch (Exception e) { if (debug != null) { debug.println("CrlRevocationChecker.verifyRevocationStatus() " @@ -769,7 +770,7 @@ for (X509CRL crl : crls) { if (dpf.verifyCRL(certImpl, point, crl, reasonsMask, signFlag, prevKey, mSigProvider, - trustAnchors, mStores)) { + trustAnchors, mStores, mParams.getDate())) { results.add(crl); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java --- a/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Sat May 14 11:52:15 2011 -0700 @@ -90,8 +90,8 @@ */ Collection<X509CRL> getCRLs(X509CRLSelector selector, boolean signFlag, PublicKey prevKey, String provider, List<CertStore> certStores, - boolean[] reasonsMask, - Set<TrustAnchor> trustAnchors) throws CertStoreException { + boolean[] reasonsMask, Set<TrustAnchor> trustAnchors, + Date validity) throws CertStoreException { if (USE_CRLDP == false) { return Collections.emptySet(); @@ -122,7 +122,7 @@ DistributionPoint point = t.next(); Collection<X509CRL> crls = getCRLs(selector, certImpl, point, reasonsMask, signFlag, prevKey, provider, - certStores, trustAnchors); + certStores, trustAnchors, validity); results.addAll(crls); } if (debug != null) { @@ -143,7 +143,8 @@ private Collection<X509CRL> getCRLs(X509CRLSelector selector, X509CertImpl certImpl, DistributionPoint point, boolean[] reasonsMask, boolean signFlag, PublicKey prevKey, String provider, - List<CertStore> certStores, Set<TrustAnchor> trustAnchors) { + List<CertStore> certStores, Set<TrustAnchor> trustAnchors, + Date validity) { // check for full name GeneralNames fullName = point.getFullName(); @@ -196,7 +197,7 @@ selector.setIssuerNames(null); if (selector.match(crl) && verifyCRL(certImpl, point, crl, reasonsMask, signFlag, prevKey, provider, trustAnchors, - certStores)) { + certStores, validity)) { crls.add(crl); } } catch (Exception e) { @@ -280,13 +281,15 @@ * @param trustAnchors a {@code Set} of {@code TrustAnchor}s * @param certStores a {@code List} of {@code CertStore}s to be used in * finding certificates and CRLs + * @param validity the time for which the validity of the CRL issuer's + * certification path should be determined * @return true if ok, false if not */ boolean verifyCRL(X509CertImpl certImpl, DistributionPoint point, X509CRL crl, boolean[] reasonsMask, boolean signFlag, PublicKey prevKey, String provider, - Set<TrustAnchor> trustAnchors, - List<CertStore> certStores) throws CRLException, IOException { + Set<TrustAnchor> trustAnchors, List<CertStore> certStores, + Date validity) throws CRLException, IOException { boolean indirectCRL = false; X509CRLImpl crlImpl = X509CRLImpl.toImpl(crl); @@ -605,6 +608,7 @@ } params.setCertStores(certStores); params.setSigProvider(provider); + params.setDate(validity); try { CertPathBuilder builder = CertPathBuilder.getInstance("PKIX"); PKIXCertPathBuilderResult result = diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java --- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1453,6 +1453,21 @@ } } + private void closeSocket(boolean selfInitiated) throws IOException { + if ((debug != null) && Debug.isOn("ssl")) { + System.out.println(threadName() + ", called closeSocket(selfInitiated)"); + } + if (self == this) { + super.close(); + } else if (autoClose) { + self.close(); + } else if (selfInitiated) { + // layered && non-autoclose + // read close_notify alert to clear input stream + waitForClose(false); + } + } + /* * Closing the connection is tricky ... we can't officially close the * connection until we know the other end is ready to go away too, @@ -1491,6 +1506,8 @@ } int state = getConnectionState(); + boolean closeSocketCalled = false; + Throwable cachedThrowable = null; try { switch (state) { /* @@ -1531,8 +1548,18 @@ return; // connection was closed while we waited } if (state != cs_SENT_CLOSE) { - warning(Alerts.alert_close_notify); - connectionState = cs_SENT_CLOSE; + try { + warning(Alerts.alert_close_notify); + connectionState = cs_SENT_CLOSE; + } catch (Throwable th) { + // we need to ensure socket is closed out + // if we encounter any errors. + connectionState = cs_ERROR; + // cache this for later use + cachedThrowable = th; + closeSocketCalled = true; + closeSocket(selfInitiated); + } } } // If state was cs_SENT_CLOSE before, we don't do the actual @@ -1569,22 +1596,11 @@ return; } - if (self == this) { - super.close(); - } else if (autoClose) { - self.close(); - } else if (selfInitiated) { - // layered && non-autoclose - // read close_notify alert to clear input stream - waitForClose(false); + if (!closeSocketCalled) { + closeSocketCalled = true; + closeSocket(selfInitiated); } - // See comment in changeReadCiphers() - readCipher.dispose(); - writeCipher.dispose(); - - // state will be set to cs_CLOSED in the finally block below - break; } } finally { @@ -1595,6 +1611,20 @@ // notify any threads waiting for the closing to finish this.notifyAll(); } + if (closeSocketCalled) { + // Dispose of ciphers since we've closed socket + disposeCiphers(); + } + if (cachedThrowable != null) { + /* + * Rethrow the error to the calling method + * The Throwable caught can only be an Error or RuntimeException + */ + if (cachedThrowable instanceof Error) + throw (Error) cachedThrowable; + if (cachedThrowable instanceof RuntimeException) + throw (RuntimeException) cachedThrowable; + } } } @@ -1641,6 +1671,24 @@ } } + /** + * Called by closeInternal() only. Be sure to consider the + * synchronization locks carefully before calling it elsewhere. + */ + private void disposeCiphers() { + // See comment in changeReadCiphers() + synchronized (readLock) { + readCipher.dispose(); + } + // See comment in changeReadCiphers() + writeLock.lock(); + try { + writeCipher.dispose(); + } finally { + writeLock.unlock(); + } + } + // // EXCEPTION AND ALERT HANDLING // @@ -1761,7 +1809,9 @@ } int oldState = connectionState; - connectionState = cs_ERROR; + if (connectionState < cs_ERROR) { + connectionState = cs_ERROR; + } /* * Has there been an error received yet? If not, remember it. @@ -1792,13 +1842,17 @@ * Clean up our side. */ closeSocket(); + // Another thread may have disposed the ciphers during closing + if (connectionState < cs_CLOSED) { + connectionState = (oldState == cs_APP_CLOSED) ? cs_APP_CLOSED + : cs_CLOSED; - // See comment in changeReadCiphers() - readCipher.dispose(); - writeCipher.dispose(); + // We should lock readLock and writeLock if no deadlock risks. + // See comment in changeReadCiphers() + readCipher.dispose(); + writeCipher.dispose(); + } - connectionState = (oldState == cs_APP_CLOSED) ? cs_APP_CLOSED - : cs_CLOSED; throw closeReason; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java --- a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2011, 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 @@ -1285,11 +1285,12 @@ // check permission to access and use the secret key of the // Kerberized "host" service - if (kerberosKeys != null) { - + if (kerberosKeys != null && kerberosKeys.length > 0) { if (debug != null && Debug.isOn("handshake")) { - System.out.println("Using Kerberos key: " + - kerberosKeys[0]); + for (SecretKey k: kerberosKeys) { + System.out.println("Using Kerberos key: " + + k); + } } String serverPrincipal = diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java --- a/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, 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 @@ -40,7 +40,7 @@ import sun.security.ssl.Krb5Proxy; /** - * An implementatin of Krb5Proxy that simply delegates to the appropriate + * An implementation of Krb5Proxy that simply delegates to the appropriate * Kerberos APIs. */ public class Krb5ProxyImpl implements Krb5Proxy { @@ -62,7 +62,7 @@ @Override public SecretKey[] getServerKeys(AccessControlContext acc) throws LoginException { - return Krb5Util.getKeys(GSSCaller.CALLER_SSL_SERVER, null, acc); + return Krb5Util.getServiceCreds(GSSCaller.CALLER_SSL_SERVER, null, acc).getKKeys(); } @Override diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java --- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -74,8 +74,6 @@ "[-digestalg <algorithm>] \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"}, {".sigalg.algorithm.name.of.signature.algorithm", "[-sigalg <algorithm>] \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"}, - {".crl.auto.file.include.CRL.in.signed.jar", - "[-crl[:auto| <file>] \u7F72\u540D\u4ED8\u304Djar\u306BCRL\u3092\u542B\u3081\u308B"}, {".verify.verify.a.signed.JAR.file", "[-verify] \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"}, {".verbose.suboptions.verbose.output.when.signing.verifying.", @@ -183,17 +181,13 @@ {"TSA.location.", "TSA\u306E\u5834\u6240: "}, {"TSA.certificate.", "TSA\u8A3C\u660E\u66F8: "}, {"no.response.from.the.Timestamping.Authority.", - "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002 "}, - {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.", - "\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 "}, - {"Supply.the.following.options.to.jarsigner.", - "jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044: "}, + "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u307E\u305F\u306FHTTPS\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044:"}, + {"or", "\u307E\u305F\u306F"}, {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the", "\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}\u3002{1}\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306EX.509\u516C\u958B\u9375\u8A3C\u660E\u66F8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u6709\u52B9\u306AKeyStore\u30A8\u30F3\u30C8\u30EA\u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"}, {"using.an.alternative.signing.mechanism", "\u4EE3\u66FF\u7F72\u540D\u30E1\u30AB\u30CB\u30BA\u30E0\u306E\u4F7F\u7528"}, {"entry.was.signed.on", "\u30A8\u30F3\u30C8\u30EA\u306F{0}\u306B\u7F72\u540D\u3055\u308C\u307E\u3057\u305F"}, - {"with.a.CRL.including.d.entries", "%d\u500B\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u542B\u3080CRL\u3092\u4F7F\u7528"}, {"Warning.", "\u8B66\u544A: "}, {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.", "\u3053\u306Ejar\u306B\u306F\u3001\u6574\u5408\u6027\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u3044\u306A\u3044\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java --- a/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -53,9 +53,9 @@ {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified", "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"}, {"Usage.jarsigner.options.jar.file.alias", - "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"}, + "\u7528\u6CD5: jarsigner [\u9009\u9879] jar\u6587\u4EF6 \u522B\u540D"}, {".jarsigner.verify.options.jar.file.alias.", - " jarsigner -verify [options] jar-file [alias...]"}, + " jarsigner -verify [\u9009\u9879] jar\u6587\u4EF6 [\u522B\u540D...]"}, {".keystore.url.keystore.location", "[-keystore <url>] \u5BC6\u94A5\u5E93\u4F4D\u7F6E"}, {".storepass.password.password.for.keystore.integrity", @@ -65,7 +65,7 @@ {".keypass.password.password.for.private.key.if.different.", "[-keypass <\u53E3\u4EE4>] \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"}, {".certchain.file.name.of.alternative.certchain.file", - "[-certchain <file>] \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"}, + "[-certchain <\u6587\u4EF6>] \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"}, {".sigfile.file.name.of.SF.DSA.file", "[-sigfile <\u6587\u4EF6>] .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"}, {".signedjar.file.name.of.signed.JAR.file", @@ -74,12 +74,10 @@ "[-digestalg <\u7B97\u6CD5>] \u6458\u8981\u7B97\u6CD5\u7684\u540D\u79F0"}, {".sigalg.algorithm.name.of.signature.algorithm", "[-sigalg <\u7B97\u6CD5>] \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"}, - {".crl.auto.file.include.CRL.in.signed.jar", - "[-crl[:auto| <file>] \u5728\u5DF2\u7B7E\u540D\u7684 jar \u4E2D\u5305\u542B CRL"}, {".verify.verify.a.signed.JAR.file", "[-verify] \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"}, {".verbose.suboptions.verbose.output.when.signing.verifying.", - "[-verbose[:suboptions]] \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"}, + "[-verbose[:\u5B50\u9009\u9879]] \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"}, {".suboptions.can.be.all.grouped.or.summary", " \u5B50\u9009\u9879\u53EF\u4EE5\u662F all, grouped \u6216 summary"}, {".certs.display.certificates.when.verbose.and.verifying", @@ -108,7 +106,7 @@ "[-strict] \u5C06\u8B66\u544A\u89C6\u4E3A\u9519\u8BEF"}, {"Option.lacks.argument", "\u9009\u9879\u7F3A\u5C11\u53C2\u6570"}, {"Please.type.jarsigner.help.for.usage", "\u8BF7\u952E\u5165 jarsigner -help \u4EE5\u4E86\u89E3\u7528\u6CD5"}, - {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jarfile \u540D\u79F0"}, + {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jar \u6587\u4EF6\u7684\u540D\u79F0"}, {"Please.specify.alias.name", "\u8BF7\u6307\u5B9A\u522B\u540D"}, {"Only.one.alias.can.be.specified", "\u53EA\u80FD\u6307\u5B9A\u4E00\u4E2A\u522B\u540D"}, {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.", @@ -159,7 +157,7 @@ {"File.specified.by.certchain.does.not.exist", "\u7531 -certchain \u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728"}, {"Cannot.restore.certchain.from.file.specified", - "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F certchain"}, + "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F\u8BC1\u4E66\u94FE"}, {"Certificate.chain.not.found.in.the.file.specified.", "\u5728\u6307\u5B9A\u7684\u6587\u4EF6\u4E2D\u627E\u4E0D\u5230\u8BC1\u4E66\u94FE\u3002"}, {"found.non.X.509.certificate.in.signer.s.chain", @@ -183,17 +181,13 @@ {"TSA.location.", "TSA \u4F4D\u7F6E: "}, {"TSA.certificate.", "TSA \u8BC1\u4E66: "}, {"no.response.from.the.Timestamping.Authority.", - "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002"}, - {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.", - "\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u4EE3\u7406\u3002 "}, - {"Supply.the.following.options.to.jarsigner.", - "\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "}, + "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u6216 HTTPS \u4EE3\u7406\u3002\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "}, + {"or", "\u6216"}, {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the", "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548 KeyStore \u6761\u76EE\u3002"}, {"using.an.alternative.signing.mechanism", "\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"}, {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"}, - {"with.a.CRL.including.d.entries", "\u5177\u6709\u5305\u542B %d \u4E2A\u6761\u76EE\u7684 CRL"}, {"Warning.", "\u8B66\u544A: "}, {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.", "\u6B64 jar \u5305\u542B\u5C1A\u672A\u8FDB\u884C\u5B8C\u6574\u6027\u68C0\u67E5\u7684\u672A\u7B7E\u540D\u6761\u76EE\u3002 "}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_de.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_de.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_de.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "Keystore-Typ erwartet"}, - {"can.not.specify.Principal.with.a.", - "Principal kann nicht mit einer "}, - {"wildcard.class.without.a.wildcard.name", - "Platzhalterklasse ohne Platzhalternamen angegeben werden"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "Principal kann nicht mit einer Platzhalterklasse ohne Platzhalternamen angegeben werden"}, {"expected.codeBase.or.SignedBy", "codeBase oder SignedBy erwartet"}, {"only.Principal.based.grant.entries.permitted", "Nur Principal-basierte Berechtigungseintr\u00E4ge zul\u00E4ssig"}, {"expected.permission.entry", "Berechtigungseintrag erwartet"}, {"number.", "Nummer "}, - {"expected.", "erwartet "}, - {".read.end.of.file", ", Dateiende gelesen"}, + {"expected.expect.read.end.of.file.", + "{0} erwartet, Dateiende gelesen"}, {"expected.read.end.of.file", "\";\" erwartet, Dateiende gelesen"}, {"line.", "Zeile "}, {".expected.", ": erwartet: \""}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "Nullname angegeben"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_es.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_es.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_es.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "se esperaba un tipo de almac\u00E9n de claves"}, - {"can.not.specify.Principal.with.a.", - "no se puede especificar Principal con una "}, - {"wildcard.class.without.a.wildcard.name", - "clase comod\u00EDn sin nombre de comod\u00EDn"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "no se puede especificar Principal con una clase de comod\u00EDn sin un nombre de comod\u00EDn"}, {"expected.codeBase.or.SignedBy", "se esperaba codeBase o SignedBy"}, {"only.Principal.based.grant.entries.permitted", "s\u00F3lo se permite otorgar entradas basadas en Principal"}, {"expected.permission.entry", "se esperaba un permiso de entrada"}, {"number.", "n\u00FAmero "}, - {"expected.", "se esperaba "}, - {".read.end.of.file", ", se ha le\u00EDdo el final de archivo"}, + {"expected.expect.read.end.of.file.", + "se esperaba [{0}], se ha le\u00EDdo final de archivo"}, {"expected.read.end.of.file", "se esperaba ';', se ha le\u00EDdo el final de archivo"}, {"line.", "l\u00EDnea "}, {".expected.", ": se esperaba '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "se ha proporcionado un nombre nulo"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_fr.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_fr.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_fr.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "type de fichier de cl\u00E9s attendu"}, - {"can.not.specify.Principal.with.a.", - "impossible de sp\u00E9cifier le principal avec une "}, - {"wildcard.class.without.a.wildcard.name", - "classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "impossible de sp\u00E9cifier le principal avec une classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"}, {"expected.codeBase.or.SignedBy", "codeBase ou SignedBy attendu"}, {"only.Principal.based.grant.entries.permitted", "seules les entr\u00E9es bas\u00E9es sur Principal sont autoris\u00E9es"}, {"expected.permission.entry", "entr\u00E9e de droit attendue"}, {"number.", "nombre "}, - {"expected.", "attendu "}, - {".read.end.of.file", ", lecture de fin de fichier"}, + {"expected.expect.read.end.of.file.", + "attendu {0}, lecture de fin de fichier"}, {"expected.read.end.of.file", "attendu ';', lecture de fin de fichier"}, {"line.", "ligne "}, {".expected.", ": attendu '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal : "}, {"SolarisPrincipal.", "SolarisPrincipal : "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "nom NULL fourni"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_it.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_it.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_it.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "tipo keystore previsto"}, - {"can.not.specify.Principal.with.a.", - "impossibile specificare il principal con una "}, - {"wildcard.class.without.a.wildcard.name", - "classe carattere jolly senza un nome carattere jolly"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "impossibile specificare un principal con una classe carattere jolly senza un nome carattere jolly"}, {"expected.codeBase.or.SignedBy", "previsto codeBase o SignedBy"}, {"only.Principal.based.grant.entries.permitted", "sono consentiti solo valori garantiti basati sul principal"}, {"expected.permission.entry", "prevista voce di autorizzazione"}, {"number.", "numero "}, - {"expected.", "previsto "}, - {".read.end.of.file", ", letto end of file"}, + {"expected.expect.read.end.of.file.", + "previsto {0}, letto end of file"}, {"expected.read.end.of.file", "previsto ';', letto end of file"}, {"line.", "riga "}, {".expected.", ": previsto '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "il nome fornito \u00E8 nullo"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_ja.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\u4E88\u60F3\u3055\u308C\u305F\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30BF\u30A4\u30D7"}, - {"can.not.specify.Principal.with.a.", - "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u306F\u3001\u6B21\u306E\u3082\u306E\u3092\u4F7F\u7528\u3057\u3066\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 "}, - {"wildcard.class.without.a.wildcard.name", - "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u540D\u306E\u306A\u3044\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u3001\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"}, {"expected.codeBase.or.SignedBy", "\u4E88\u60F3\u3055\u308C\u305FcodeBase\u307E\u305F\u306FSignedBy"}, {"only.Principal.based.grant.entries.permitted", "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u30FB\u30D9\u30FC\u30B9\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u307F\u304C\u8A31\u53EF\u3055\u308C\u307E\u3059\u3002"}, {"expected.permission.entry", "\u4E88\u60F3\u3055\u308C\u305F\u30A2\u30AF\u30BB\u30B9\u6A29\u30A8\u30F3\u30C8\u30EA"}, {"number.", "\u6570 "}, - {"expected.", "\u4E88\u60F3\u5024 "}, - {".read.end.of.file", ", \u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F\u3002"}, + {"expected.expect.read.end.of.file.", + "{0}\u3067\u306F\u306A\u304F\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"}, {"expected.read.end.of.file", "\u4E88\u60F3\u5024\u306F';'\u3067\u3059\u304C\u3001\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"}, {"line.", "\u884C\u756A\u53F7 "}, {".expected.", ": \u4E88\u60F3\u5024'"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "null\u306E\u540D\u524D\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_ko.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_ko.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_ko.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."}, - {"can.not.specify.Principal.with.a.", - "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294"}, - {"wildcard.class.without.a.wildcard.name", - "\uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}, {"expected.codeBase.or.SignedBy", "codeBase \uB610\uB294 SignedBy\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."}, {"only.Principal.based.grant.entries.permitted", "\uC8FC\uCCB4 \uAE30\uBC18 \uAD8C\uD55C \uBD80\uC5EC \uD56D\uBAA9\uB9CC \uD5C8\uC6A9\uB429\uB2C8\uB2E4."}, {"expected.permission.entry", "\uAD8C\uD55C \uD56D\uBAA9\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."}, {"number.", "\uC22B\uC790 "}, - {"expected.", "\uD544\uC694\uD55C \uD56D\uBAA9: "}, - {".read.end.of.file", ", \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."}, + {"expected.expect.read.end.of.file.", + "{0}\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."}, {"expected.read.end.of.file", "';'\uC774 \uD544\uC694\uD558\uC9C0\uB9CC \uD30C\uC77C\uC758 \uB05D\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."}, {"line.", "\uD589 "}, {".expected.", ": \uD544\uC694\uD55C \uD56D\uBAA9: '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "\uB110 \uC774\uB984\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "tipo de armazenamento de chaves esperado"}, - {"can.not.specify.Principal.with.a.", - "n\u00E3o \u00E9 poss\u00EDvel especificar um Principal com uma "}, - {"wildcard.class.without.a.wildcard.name", - "de curinga sem um nome de curinga"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "n\u00E3o \u00E9 poss\u00EDvel especificar um principal com uma classe curinga sem um nome curinga"}, {"expected.codeBase.or.SignedBy", "CodeBase ou SignedBy esperado"}, {"only.Principal.based.grant.entries.permitted", "somente \u00E9 permitido conceder entradas com base no Principal"}, {"expected.permission.entry", "entrada de permiss\u00E3o esperada"}, {"number.", "n\u00FAmero "}, - {"expected.", "esperado "}, - {".read.end.of.file", ", fim de arquivo lido"}, + {"expected.expect.read.end.of.file.", + "esperado {0}, ler fim do arquivo"}, {"expected.read.end.of.file", "esperado ';', fim de arquivo lido"}, {"line.", "linha "}, {".expected.", ": esperado '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "nome nulo fornecido"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_sv.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_sv.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_sv.java Sat May 14 11:52:15 2011 -0700 @@ -70,11 +70,11 @@ {"Configuration.Error.Can.not.specify.multiple.entries.for.appName", "Konfigurationsfel:\n\tKan inte ange flera poster f\u00F6r {0}"}, {"Configuration.Error.expected.expect.read.end.of.file.", - "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [end of file]"}, + "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"}, {"Configuration.Error.Line.line.expected.expect.found.value.", - "Konfigurationsfel:\n\tLine {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"}, + "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"}, {"Configuration.Error.Line.line.expected.expect.", - "Konfigurationsfel:\n\tLine {0}: f\u00F6rv\u00E4ntade [{1}]"}, + "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}]"}, {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value", "Konfigurationsfel:\n\tRad {0}: systemegenskapen [{1}] ut\u00F6kad till tomt v\u00E4rde"}, @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "f\u00F6rv\u00E4ntad nyckellagertyp"}, - {"can.not.specify.Principal.with.a.", - "kan inte ange identitetshavare med "}, - {"wildcard.class.without.a.wildcard.name", - "jokerteckenklass utan jokerteckennamn"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "kan inte ange identitetshavare med en jokerteckenklass utan ett jokerteckennamn"}, {"expected.codeBase.or.SignedBy", "f\u00F6rv\u00E4ntade codeBase eller SignedBy"}, {"only.Principal.based.grant.entries.permitted", "endast identitetshavarbaserade poster till\u00E5ts"}, {"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"}, {"number.", "antal "}, - {"expected.", "f\u00F6rv\u00E4ntade "}, - {".read.end.of.file", ", l\u00E4ste filslut"}, + {"expected.expect.read.end.of.file.", + "f\u00F6rv\u00E4ntade {0}, l\u00E4ste filslut"}, {"expected.read.end.of.file", "f\u00F6rv\u00E4ntade ';', l\u00E4ste filslut"}, {"line.", "rad "}, {".expected.", ": f\u00F6rv\u00E4ntade '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "angav null-namn"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\u5E94\u4E3A\u5BC6\u94A5\u5E93\u7C7B\u578B"}, - {"can.not.specify.Principal.with.a.", - "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528"}, - {"wildcard.class.without.a.wildcard.name", - "\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\u6CA1\u6709\u901A\u914D\u7B26\u540D\u79F0, \u65E0\u6CD5\u4F7F\u7528\u901A\u914D\u7B26\u7C7B\u6307\u5B9A\u4E3B\u7528\u6237"}, {"expected.codeBase.or.SignedBy", "\u5E94\u4E3A codeBase \u6216 SignedBy"}, {"only.Principal.based.grant.entries.permitted", "\u53EA\u5141\u8BB8\u57FA\u4E8E\u4E3B\u7528\u6237\u7684\u6388\u6743\u6761\u76EE"}, {"expected.permission.entry", "\u5E94\u4E3A\u6743\u9650\u6761\u76EE"}, {"number.", "\u7F16\u53F7 "}, - {"expected.", "\u5E94\u4E3A "}, - {".read.end.of.file", ", \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"}, + {"expected.expect.read.end.of.file.", + "\u5E94\u4E3A{0}, \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"}, {"expected.read.end.of.file", "\u5E94\u4E3A ';', \u8BFB\u53D6\u7684\u662F\u6587\u4EF6\u7ED3\u5C3E"}, {"line.", "\u884C "}, {".expected.", ": \u5E94\u4E3A '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "\u63D0\u4F9B\u7684\u540D\u79F0\u4E3A\u7A7A\u503C"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java --- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java Sat May 14 11:52:15 2011 -0700 @@ -111,17 +111,15 @@ // com.sun.security.auth.PolicyParser {"expected.keystore.type", "\u9810\u671F\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, - {"can.not.specify.Principal.with.a.", - "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A"}, - {"wildcard.class.without.a.wildcard.name", - "\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"}, + {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name", + "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"}, {"expected.codeBase.or.SignedBy", "\u9810\u671F\u7684 codeBase \u6216 SignedBy"}, {"only.Principal.based.grant.entries.permitted", "\u53EA\u5141\u8A31\u4EE5 Principal \u70BA\u57FA\u790E\u7684\u6388\u6B0A\u9805\u76EE"}, {"expected.permission.entry", "\u9810\u671F\u7684\u6B0A\u9650\u9805\u76EE"}, {"number.", "\u865F\u78BC "}, - {"expected.", "\u9810\u671F\u7684 "}, - {".read.end.of.file", "\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"}, + {"expected.expect.read.end.of.file.", + "\u9810\u671F\u70BA {0}, \u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"}, {"expected.read.end.of.file", "\u9810\u671F\u7684 ';'\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"}, {"line.", "\u884C "}, {".expected.", ": \u9810\u671F '"}, @@ -136,6 +134,9 @@ {"SolarisNumericUserPrincipal.", "SolarisNumericUserPrincipal: "}, {"SolarisPrincipal.", "SolarisPrincipal: "}, + // provided.null.name is the NullPointerException message when a + // developer incorrectly passes a null name to the constructor of + // subclasses of java.security.Principal {"provided.null.name", "\u63D0\u4F9B\u7A7A\u503C\u540D\u7A31"} }; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java --- a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Sat May 14 11:52:15 2011 -0700 @@ -191,8 +191,8 @@ * * */ - public CodeSigner[] verify(Map<String, CodeSigner[]> verifiedSigners, - Map<String, CodeSigner[]> sigFileSigners) + public CodeSigner[] verify(Hashtable<String, CodeSigner[]> verifiedSigners, + Hashtable<String, CodeSigner[]> sigFileSigners) throws JarException { if (skip) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_de.java --- a/jdk/src/share/classes/sun/security/util/Resources_de.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_de.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Option]..."}, {"Options.", "Optionen:"}, {"Use.keytool.help.for.all.available.commands", "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"}, @@ -67,6 +68,7 @@ "Exportiert ein Zertifikat"}, //-exportcert {"Generates.a.key.pair", "Generiert ein Schl\u00FCsselpaar"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Generiert einen Secret Key"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "}, {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Eintragstyp: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Keystore-Typ: "}, {"Keystore.provider.", "Keystore-Provider: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]: "}, {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]: "}, - {"YES", "JA"}, + {"YES", "Ja"}, {"New.prompt.", "Neues {0}: "}, {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"}, {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "}, @@ -368,7 +368,7 @@ "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Clonen von Private Key-Eintr\u00E4gen"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Warnung Warnung Warnung *****************"}, {"Signer.d.", "Signaturgeber #%d:"}, {"Timestamp.", "Zeitstempel:"}, {"Signature.", "Signatur:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Kein Zertifikat vom SSL-Server"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* Integrit\u00E4t der im Keystore gespeicherten Informationen *"}, + "* Die Integrit\u00E4t der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* Integrit\u00E4t der in srckeystore gespeicherten Informationen*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* ist NICHT verifiziert worden. Damit die Integrit\u00E4t verifiziert werden kann, *"}, - {".you.must.provide.your.keystore.password.", - "* m\u00FCssen Sie Ihr Keystore-Kennwort angeben. *"}, - {".you.must.provide.the.srckeystore.password.", - "* m\u00FCssen Sie das Kennwort f\u00FCr srckeystore angeben. *"}, - + "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"}, @@ -403,7 +393,7 @@ "Zertifikat der obersten Ebene in Antwort:\n"}, {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "}, {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]: "}, - {"NO", "NEIN"}, + {"NO", "Nein"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_es.java --- a/jdk/src/share/classes/sun/security/util/Resources_es.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_es.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Opci\u00F3n]..."}, {"Options.", "Opciones:"}, {"Use.keytool.help.for.all.available.commands", "Utilice\"keytool -help\" para todos los comandos disponibles"}, @@ -67,6 +68,7 @@ "Exporta el certificado"}, //-exportcert {"Generates.a.key.pair", "Genera un par de claves"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Genera un clave secreta"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -112,7 +114,7 @@ {"destination.keystore.type", "tipo de almac\u00E9n de claves de destino"}, //-deststoretype {"distinguished.name", - "nombre distinguido"}, //-dname + "nombre distintivo"}, //-dname {"X.509.extension", "extensi\u00F3n X.509"}, //-ext {"output.file.name", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Longitud de la Cadena de Certificado: "}, {"Certificate.i.1.", "Certificado[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Huella Digital de Certificado (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Tipo de Entrada: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Tipo de Almac\u00E9n de Claves: "}, {"Keystore.provider.", "Proveedor de Almac\u00E9n de Claves: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "\u00BFA\u00FAn desea agregarlo a su propio almac\u00E9n de claves? [no]: "}, {"Trust.this.certificate.no.", "\u00BFConfiar en este certificado? [no]: "}, - {"YES", "S\u00CD"}, + {"YES", "S\u00ED"}, {"New.prompt.", "Nuevo {0}: "}, {"Passwords.must.differ", "Las contrase\u00F1as deben ser distintas"}, {"Re.enter.new.prompt.", "Vuelva a escribir el nuevo {0}: "}, @@ -368,7 +368,7 @@ "El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone s\u00F3lo permite la clonaci\u00F3n de entradas de claves privadas"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Advertencia Advertencia Advertencia *****************"}, {"Signer.d.", "#%d de Firmante:"}, {"Timestamp.", "Registro de Hora:"}, {"Signature.", "Firma:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Ning\u00FAn certificado del servidor SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* La integridad de la informaci\u00F3n almacenada en su almac\u00E9n de claves *"}, + "* La integridad de la informaci\u00F3n almacenada en el almac\u00E9n de claves *\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a del almac\u00E9n de claves. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* La totalidad de la informaci\u00F3n almacenada en srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* NO se ha comprobado. Para comprobar dicha integridad, *"}, - {".you.must.provide.your.keystore.password.", - "* deber\u00E1 proporcionar su contrase\u00F1a de almac\u00E9n de claves. *"}, - {".you.must.provide.the.srckeystore.password.", - "* deber\u00E1 indicar la contrase\u00F1a de srckeystore. *"}, - + "* La integridad de la informaci\u00F3n almacenada en srckeystore*\n* NO se ha comprobado. Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a de srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "La respuesta de certificado no contiene una clave p\u00FAblica para <{0}>"}, @@ -403,7 +393,7 @@ "Certificado de nivel superior en la respuesta:\n"}, {".is.not.trusted.", "... no es de confianza. "}, {"Install.reply.anyway.no.", "\u00BFInstalar respuesta de todos modos? [no]: "}, - {"NO", "NO"}, + {"NO", "No"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Las claves p\u00FAblicas en la respuesta y en el almac\u00E9n de claves no coinciden"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_fr.java --- a/jdk/src/share/classes/sun/security/util/Resources_fr.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_fr.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Option]..."}, {"Options.", "Options :"}, {"Use.keytool.help.for.all.available.commands", "Utiliser \"keytool -help\" pour toutes les commandes disponibles"}, @@ -67,6 +68,7 @@ "Exporte le certificat"}, //-exportcert {"Generates.a.key.pair", "G\u00E9n\u00E8re une paire de cl\u00E9s"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "G\u00E9n\u00E8re une cl\u00E9 secr\u00E8te"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Longueur de cha\u00EEne du certificat : "}, {"Certificate.i.1.", "Certificat[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Empreinte du certificat (SHA1) : "}, - {"Entry.type.trustedCertEntry.", "Type d'entr\u00E9e : trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Type de fichier de cl\u00E9s : "}, {"Keystore.provider.", "Fournisseur de fichier de cl\u00E9s : "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "Voulez-vous toujours l'ajouter \u00E0 votre fichier de cl\u00E9s ? [non] : "}, {"Trust.this.certificate.no.", "Faire confiance \u00E0 ce certificat ? [non] : "}, - {"YES", "OUI"}, + {"YES", "Oui"}, {"New.prompt.", "Nouveau {0} : "}, {"Passwords.must.differ", "Les mots de passe doivent diff\u00E9rer"}, {"Re.enter.new.prompt.", "Indiquez encore le nouveau {0} : "}, @@ -368,7 +368,7 @@ "L''entr\u00E9e \u00E0 laquelle l''alias <{0}> fait r\u00E9f\u00E9rence n''est pas une entr\u00E9e de type cl\u00E9 priv\u00E9e. La commande -keyclone prend uniquement en charge le clonage des cl\u00E9s priv\u00E9es"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Avertissement Avertissement Avertissement *****************"}, {"Signer.d.", "Signataire n\u00B0%d :"}, {"Timestamp.", "Horodatage :"}, {"Signature.", "Signature :"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Aucun certificat du serveur SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *"}, + "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *"}, - {".you.must.provide.your.keystore.password.", - "* vous devez fournir le mot de passe de votre fichier de cl\u00E9s. *"}, - {".you.must.provide.the.srckeystore.password.", - "* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"}, - + "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "La r\u00E9ponse au certificat ne contient pas de cl\u00E9 publique pour <{0}>"}, @@ -403,7 +393,7 @@ "Certificat de niveau sup\u00E9rieur dans la r\u00E9ponse :\n"}, {".is.not.trusted.", "... non s\u00E9curis\u00E9. "}, {"Install.reply.anyway.no.", "Installer la r\u00E9ponse quand m\u00EAme ? [non] : "}, - {"NO", "NON"}, + {"NO", "Non"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Les cl\u00E9s publiques de la r\u00E9ponse et du fichier de cl\u00E9s ne concordent pas"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_it.java --- a/jdk/src/share/classes/sun/security/util/Resources_it.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_it.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Opzione]..."}, {"Options.", "Opzioni:"}, {"Use.keytool.help.for.all.available.commands", "Utilizzare \"keytool -help\" per visualizzare tutti i comandi disponibili"}, @@ -67,6 +68,7 @@ "Esporta il certificato"}, //-exportcert {"Generates.a.key.pair", "Genera una coppia di chiavi"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Genera una chiave segreta"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Lunghezza catena certificati: "}, {"Certificate.i.1.", "Certificato[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Impronta digitale certificato (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Tipo di voce: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Tipo keystore: "}, {"Keystore.provider.", "Provider keystore: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "L''alias <{0}> fa riferimento a un tipo di voce che non \u00E8 una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private."}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Avvertenza Avvertenza Avvertenza *****************"}, {"Signer.d.", "Firmatario #%d:"}, {"Timestamp.", "Indicatore orario:"}, {"Signature.", "Firma:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Nessun certificato dal server SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *"}, + "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del keystore. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* L'integrit\u00E0 delle informazioni salvate nel srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* NON \u00E8 stata verificata. A tale scopo \u00E8 necessario fornire *"}, - {".you.must.provide.your.keystore.password.", - "* la password del keystore. *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u00C8 necessario fornire la password per il srckeystore. *"}, - + "* L'integrit\u00E0 delle informazioni memorizzate nel srckeystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "La risposta del certificato non contiene la chiave pubblica per <{0}>"}, @@ -403,7 +393,7 @@ "Certificato di primo livello nella risposta:\n"}, {".is.not.trusted.", "...non \u00E8 considerato sicuro. "}, {"Install.reply.anyway.no.", "Installare la risposta? [no]: "}, - {"NO", "NO"}, + {"NO", "No"}, {"Public.keys.in.reply.and.keystore.don.t.match", "Le chiavi pubbliche nella risposta e nel keystore non corrispondono"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_ja.java --- a/jdk/src/share/classes/sun/security/util/Resources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\u30AA\u30D7\u30B7\u30E7\u30F3]..."}, {"Options.", "\u30AA\u30D7\u30B7\u30E7\u30F3:"}, {"Use.keytool.help.for.all.available.commands", "\u4F7F\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u306B\u3064\u3044\u3066\u306F\"keytool -help\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"}, @@ -67,6 +68,7 @@ "\u8A3C\u660E\u66F8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-exportcert {"Generates.a.key.pair", "\u9375\u30DA\u30A2\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "\u79D8\u5BC6\u9375\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306E\u9577\u3055: "}, {"Certificate.i.1.", "\u8A3C\u660E\u66F8[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8(SHA1): "}, - {"Entry.type.trustedCertEntry.", "\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30D7: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7: "}, {"Keystore.provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "\u5225\u540D<{0}>\u304C\u53C2\u7167\u3057\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002-keyclone\u30B3\u30DE\u30F3\u30C9\u306F\u79D8\u5BC6\u9375\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u4F5C\u6210\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "*****************\u8B66\u544A \u8B66\u544A \u8B66\u544A*****************"}, {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"}, {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"}, {"Signature.", "\u7F72\u540D:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "SSL\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027 *"}, + "*\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* \u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u5B8C\u5168\u6027 *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F *"}, - {".you.must.provide.your.keystore.password.", - "* \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 *"}, - + "*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\u8A3C\u660E\u66F8\u5FDC\u7B54\u306B\u306F\u3001<{0}>\u306E\u516C\u958B\u9375\u306F\u542B\u307E\u308C\u307E\u305B\u3093"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_ko.java --- a/jdk/src/share/classes/sun/security/util/Resources_ko.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_ko.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\uC635\uC158]..."}, {"Options.", "\uC635\uC158:"}, {"Use.keytool.help.for.all.available.commands", "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uBA85\uB839\uC5D0 \"keytool -help\" \uC0AC\uC6A9"}, @@ -67,6 +68,7 @@ "\uC778\uC99D\uC11C\uB97C \uC775\uC2A4\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-exportcert {"Generates.a.key.pair", "\uD0A4 \uC30D\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\uC778\uC99D\uC11C \uCCB4\uC778 \uAE38\uC774: "}, {"Certificate.i.1.", "\uC778\uC99D\uC11C[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\uC778\uC99D\uC11C \uC9C0\uBB38(SHA1): "}, - {"Entry.type.trustedCertEntry.", "\uD56D\uBAA9 \uC720\uD615: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615: "}, {"Keystore.provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "<{0}> \uBCC4\uCE6D\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC774 \uC544\uB2CC \uD56D\uBAA9 \uC720\uD615\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4. -keyclone \uBA85\uB839\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC758 \uBCF5\uC81C\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4."}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** \uACBD\uACE0 \uACBD\uACE0 \uACBD\uACE0 *****************"}, {"Signer.d.", "\uC11C\uBA85\uC790 #%d:"}, {"Timestamp.", "\uC2DC\uAC04 \uAE30\uB85D:"}, {"Signature.", "\uC11C\uBA85:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "SSL \uC11C\uBC84\uC5D0\uC11C \uAC00\uC838\uC628 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *"}, + "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74 *"}, - {".you.must.provide.your.keystore.password.", - "* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, - {".you.must.provide.the.srckeystore.password.", - "* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, - + "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774 *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\uC778\uC99D\uC11C \uD68C\uC2E0\uC5D0 <{0}>\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_pt_BR.java --- a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Op\u00E7\u00E3o]..."}, {"Options.", "Op\u00E7\u00F5es:"}, {"Use.keytool.help.for.all.available.commands", "Use \"keytool -help\" para todos os comandos dispon\u00EDveis"}, @@ -67,8 +68,9 @@ "Exporta o certificado"}, //-exportcert {"Generates.a.key.pair", "Gera um par de chaves"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", - "Gera uma chave secreta"}, //-genseckey + "Gera uma chave Secreta"}, //-genseckey {"Generates.certificate.from.a.certificate.request", "Gera um certificado de uma solicita\u00E7\u00E3o de certificado"}, //-gencert {"Generates.CRL", "Gera CRL"}, //-gencrl @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "Comprimento da cadeia de certificados: "}, {"Certificate.i.1.", "Certificado[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Fingerprint (MD5) do certificado: "}, - {"Entry.type.trustedCertEntry.", "Tipo de entrada: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Tipo de \u00E1rea de armazenamento de chaves: "}, {"Keystore.provider.", "Fornecedor da \u00E1rea de armazenamento de chaves: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "Ainda deseja adicion\u00E1-lo \u00E0 sua \u00E1rea de armazenamento de chaves? [n\u00E3o]: "}, {"Trust.this.certificate.no.", "Confiar neste certificado? [n\u00E3o]: "}, - {"YES", "SIM"}, + {"YES", "Sim"}, {"New.prompt.", "Nova {0}: "}, {"Passwords.must.differ", "As senhas devem ser diferentes"}, {"Re.enter.new.prompt.", "Informe novamente a nova {0}: "}, @@ -368,7 +368,7 @@ "O alias <{0}> faz refer\u00EAncia a um tipo de entrada que n\u00E3o \u00E9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00E0 clonagem de entradas de chave privada"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Advert\u00EAncia Advert\u00EAncia Advert\u00EAncia *****************"}, {"Signer.d.", "Signat\u00E1rio #%d:"}, {"Timestamp.", "Timestamp:"}, {"Signature.", "Assinatura:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "N\u00E3o \u00E9 um certificado do servidor SSL"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *"}, + "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha da \u00E1rea de armazenamento de chaves. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* N\u00C3O foi verificada! Para verificar a integridade destas informa\u00E7\u00F5es, *"}, - {".you.must.provide.your.keystore.password.", - "* voc\u00EA deve fornecer a senha da sua \u00E1rea de armazenamento de chaves. *"}, - {".you.must.provide.the.srckeystore.password.", - "* voc\u00EA deve fornecer a senha do srckeystore. *"}, - + "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore *\n* N\u00C3O foi verificada! Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha do srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "A resposta do certificado n\u00E3o cont\u00E9m a chave p\u00FAblica de <{0}>"}, @@ -403,7 +393,7 @@ "Certificado de n\u00EDvel superior na resposta:\n"}, {".is.not.trusted.", "... n\u00E3o \u00E9 confi\u00E1vel. "}, {"Install.reply.anyway.no.", "Instalar resposta assim mesmo? [n\u00E3o]: "}, - {"NO", "N\u00C3O"}, + {"NO", "N\u00E3o"}, {"Public.keys.in.reply.and.keystore.don.t.match", "As chaves p\u00FAblicas da resposta e da \u00E1rea de armazenamento de chaves n\u00E3o correspondem"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", @@ -440,9 +430,9 @@ "Advert\u00EAncia: Argumento(s) inv\u00E1lido(s) para o construtor: {0}"}, {"Illegal.Principal.Type.type", "Tipo Principal Inv\u00E1lido: {0}"}, {"Illegal.option.option", "Op\u00E7\u00E3o inv\u00E1lida: {0}"}, - {"Usage.policytool.options.", "Uso: policytool [options]"}, + {"Usage.policytool.options.", "Uso: policytool [op\u00E7\u00F5es]"}, {".file.file.policy.file.location", - " [-file <file>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"}, + " [-file <arquivo>] localiza\u00E7\u00E3o do arquivo de pol\u00EDtica"}, {"New", "Novo"}, {"Open", "Abrir"}, {"Save", "Salvar"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_sv.java --- a/jdk/src/share/classes/sun/security/util/Resources_sv.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_sv.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [Alternativ]..."}, {"Options.", "Alternativ:"}, {"Use.keytool.help.for.all.available.commands", "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg\" f\u00F6r alla tillg\u00E4ngliga kommandon"}, @@ -67,6 +68,7 @@ "Exporterar certifikat"}, //-exportcert {"Generates.a.key.pair", "Genererar nyckelpar"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "Genererar hemlig nyckel"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "L\u00E4ngd p\u00E5 certifikatskedja: "}, {"Certificate.i.1.", "Certifikat[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "Certifikatets fingeravtryck (SHA1): "}, - {"Entry.type.trustedCertEntry.", "Posttyp: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "Nyckellagertyp: "}, {"Keystore.provider.", "Nyckellagerleverant\u00F6r: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -331,7 +331,7 @@ {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", "Vill du fortfarande l\u00E4gga till det i ditt eget nyckellagret? [nej]: "}, {"Trust.this.certificate.no.", "Litar du p\u00E5 det h\u00E4r certifikatet? [nej]: "}, - {"YES", "JA"}, + {"YES", "Ja"}, {"New.prompt.", "Nytt {0}: "}, {"Passwords.must.differ", "L\u00F6senorden m\u00E5ste vara olika"}, {"Re.enter.new.prompt.", "Ange nytt {0} igen: "}, @@ -368,7 +368,7 @@ "Aliaset <{0}> refererar till en posttyp som inte \u00E4r n\u00E5gon privat nyckelpost. Kommandot -keyclone har endast st\u00F6d f\u00F6r kloning av privata nyckelposter"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** Varning Varning Varning *****************"}, {"Signer.d.", "Signerare #%d:"}, {"Timestamp.", "Tidsst\u00E4mpel:"}, {"Signature.", "Underskrift:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "Inget certifikat fr\u00E5n SSL-servern"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *"}, + "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen *\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r nyckellagret. *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* Integriteten f\u00F6r informationen som lagras i srckeystore*"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* har INTE verifierats! Om du vill verifiera dess integritet, *"}, - {".you.must.provide.your.keystore.password.", - "* m\u00E5ste du ange nyckellagerl\u00F6senord. *"}, - {".you.must.provide.the.srckeystore.password.", - "* du m\u00E5ste ange l\u00F6senordet f\u00F6r srckeystore. *"}, - + "* Integriteten f\u00F6r den information som lagras i srckeystore*\n* har INTE verifierats! Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r srckeystore. *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "Certifikatsvaret inneh\u00E5ller inte n\u00E5gon offentlig nyckel f\u00F6r <{0}>"}, @@ -403,7 +393,7 @@ "Toppniv\u00E5certifikatet i svaret:\n"}, {".is.not.trusted.", "... \u00E4r inte betrott. "}, {"Install.reply.anyway.no.", "Vill du installera svaret \u00E4nd\u00E5? [nej]: "}, - {"NO", "NEJ"}, + {"NO", "Nej"}, {"Public.keys.in.reply.and.keystore.don.t.match", "De offentliga nycklarna i svaret och nyckellagret matchar inte varandra"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", @@ -639,9 +629,9 @@ {"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"}, {"number.", "antal "}, {"expected.expect.read.end.of.file.", - "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [end of file]"}, + "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"}, {"expected.read.end.of.file.", - "f\u00F6rv\u00E4ntade [;], l\u00E4ste [end of file]"}, + "f\u00F6rv\u00E4ntade [;], l\u00E4ste [filslut]"}, {"line.number.msg", "rad {0}: {1}"}, {"line.number.expected.expect.found.actual.", "rad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_zh_CN.java --- a/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\u9009\u9879]..."}, {"Options.", "\u9009\u9879:"}, {"Use.keytool.help.for.all.available.commands", "\u4F7F\u7528 \"keytool -help\" \u83B7\u53D6\u6240\u6709\u53EF\u7528\u547D\u4EE4"}, @@ -67,8 +68,9 @@ "\u5BFC\u51FA\u8BC1\u4E66"}, //-exportcert {"Generates.a.key.pair", "\u751F\u6210\u5BC6\u94A5\u5BF9"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", - "\u751F\u6210\u5BC6\u94A5"}, //-genseckey + "\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, //-genseckey {"Generates.certificate.from.a.certificate.request", "\u6839\u636E\u8BC1\u4E66\u8BF7\u6C42\u751F\u6210\u8BC1\u4E66"}, //-gencert {"Generates.CRL", "\u751F\u6210 CRL"}, //-gencrl @@ -187,7 +189,7 @@ {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "}, {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"}, {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.", - "\u8B66\u544A: PKCS12 KeyStores \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"}, + "\u8B66\u544A: PKCS12 KeyStore \u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"}, {".keystore.must.be.NONE.if.storetype.is.{0}", "\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"}, {"Too.many.retries.program.terminated", @@ -208,13 +210,13 @@ "\u5982\u679C\u6E90\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"}, {"Illegal.startdate.value", "\u975E\u6CD5\u5F00\u59CB\u65E5\u671F\u503C"}, {"Validity.must.be.greater.than.zero", - "\u6709\u6548\u6027\u5FC5\u987B\u5927\u4E8E\u96F6"}, + "\u6709\u6548\u671F\u5FC5\u987B\u5927\u4E8E\u96F6"}, {"provName.not.a.provider", "{0}\u4E0D\u662F\u63D0\u4F9B\u65B9"}, {"Usage.error.no.command.provided", "\u7528\u6CD5\u9519\u8BEF: \u6CA1\u6709\u63D0\u4F9B\u547D\u4EE4"}, {"Source.keystore.file.exists.but.is.empty.", "\u6E90\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "}, {"Please.specify.srckeystore", "\u8BF7\u6307\u5B9A -srckeystore"}, {"Must.not.specify.both.v.and.rfc.with.list.command", - "\u4E0D\u80FD\u4F7F\u7528 'list' \u547D\u4EE4\u6765\u6307\u5B9A -v \u53CA -rfc"}, + "'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A -v \u53CA -rfc"}, {"Key.password.must.be.at.least.6.characters", "\u5BC6\u94A5\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"}, {"New.password.must.be.at.least.6.characters", @@ -244,7 +246,7 @@ {"Warning.Overwriting.existing.alias.alias.in.destination.keystore", "\u8B66\u544A: \u6B63\u5728\u8986\u76D6\u76EE\u6807\u5BC6\u94A5\u5E93\u4E2D\u7684\u73B0\u6709\u522B\u540D {0}"}, {"Existing.entry.alias.alias.exists.overwrite.no.", - "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [\u5426]: "}, + "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [no]: "}, {"Too.many.failures.try.later", "\u6545\u969C\u592A\u591A - \u8BF7\u7A0D\u540E\u518D\u8BD5"}, {"Certification.request.stored.in.file.filename.", "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BA4\u8BC1\u8BF7\u6C42"}, @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\u8BC1\u4E66\u94FE\u957F\u5EA6: "}, {"Certificate.i.1.", "\u8BC1\u4E66[{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\u8BC1\u4E66\u6307\u7EB9 (SHA1): "}, - {"Entry.type.trustedCertEntry.", "\u6761\u76EE\u7C7B\u578B: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\u5BC6\u94A5\u5E93\u7C7B\u578B: "}, {"Keystore.provider.", "\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -325,13 +325,13 @@ {"Certificate.already.exists.in.keystore.under.alias.trustalias.", "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u5BC6\u94A5\u5E93\u4E2D"}, {"Do.you.still.want.to.add.it.no.", - "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [\u5426]: "}, + "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [no]: "}, {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.", "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u7CFB\u7EDF\u8303\u56F4\u7684 CA \u5BC6\u94A5\u5E93\u4E2D"}, {"Do.you.still.want.to.add.it.to.your.own.keystore.no.", - "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [\u5426]: "}, - {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [\u5426]: "}, - {"YES", "YES"}, + "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [no]: "}, + {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [no]: "}, + {"YES", "\u662F"}, {"New.prompt.", "\u65B0{0}: "}, {"Passwords.must.differ", "\u53E3\u4EE4\u4E0D\u80FD\u76F8\u540C"}, {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F93\u5165\u65B0{0}: "}, @@ -339,7 +339,7 @@ {"They.don.t.match.Try.again", "\u5B83\u4EEC\u4E0D\u5339\u914D\u3002\u8BF7\u91CD\u8BD5"}, {"Enter.prompt.alias.name.", "\u8F93\u5165{0}\u522B\u540D: "}, {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.", - "\u5BFC\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "}, + "\u8F93\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165): "}, {"Enter.alias.name.", "\u8F93\u5165\u522B\u540D: "}, {".RETURN.if.same.as.for.otherAlias.", "\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"}, @@ -368,7 +368,7 @@ "\u522B\u540D <{0}> \u5F15\u7528\u4E86\u4E0D\u5C5E\u4E8E\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u6761\u76EE\u7C7B\u578B\u3002-keyclone \u547D\u4EE4\u4EC5\u652F\u6301\u5BF9\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u514B\u9686"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"}, {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"}, {"Timestamp.", "\u65F6\u95F4\u6233:"}, {"Signature.", "\u7B7E\u540D:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "\u6CA1\u6709\u6765\u81EA SSL \u670D\u52A1\u5668\u7684\u8BC1\u4E66"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *"}, + "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027 *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *"}, - {".you.must.provide.your.keystore.password.", - "* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, - + "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027*\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1! \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002 *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\u8BC1\u4E66\u56DE\u590D\u4E2D\u4E0D\u5305\u542B <{0}> \u7684\u516C\u5171\u5BC6\u94A5"}, @@ -402,8 +392,8 @@ {"Top.level.certificate.in.reply.", "\u56DE\u590D\u4E2D\u7684\u9876\u7EA7\u8BC1\u4E66:\n"}, {".is.not.trusted.", "... \u662F\u4E0D\u53EF\u4FE1\u7684\u3002"}, - {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [\u5426]: "}, - {"NO", "NO"}, + {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [no]: "}, + {"NO", "\u5426"}, {"Public.keys.in.reply.and.keystore.don.t.match", "\u56DE\u590D\u4E2D\u7684\u516C\u5171\u5BC6\u94A5\u4E0E\u5BC6\u94A5\u5E93\u4E0D\u5339\u914D"}, {"Certificate.reply.and.certificate.in.keystore.are.identical", @@ -415,7 +405,7 @@ {"Secret.key.not.generated.alias.alias.already.exists", "\u6CA1\u6709\u751F\u6210\u5BC6\u94A5, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"}, {"Please.provide.keysize.for.secret.key.generation", - "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BC6\u94A5"}, + "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BF9\u79F0\u5BC6\u94A5"}, {"Extensions.", "\u6269\u5C55: "}, {".Empty.value.", "(\u7A7A\u503C)"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/Resources_zh_TW.java --- a/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Sat May 14 11:52:15 2011 -0700 @@ -47,7 +47,8 @@ "*******************************************\n\n"}, // keytool: Help part - {".OPTION.", " [OPTION]..."}, +// "Option" should be translated. + {".OPTION.", " [\u9078\u9805]..."}, {"Options.", "\u9078\u9805:"}, {"Use.keytool.help.for.all.available.commands", "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"}, @@ -67,6 +68,7 @@ "\u532F\u51FA\u6191\u8B49"}, //-exportcert {"Generates.a.key.pair", "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair +// translation of "secret" key should be different to "private" key. {"Generates.a.secret.key", "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey {"Generates.certificate.from.a.certificate.request", @@ -304,8 +306,6 @@ {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "}, {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"}, {"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "}, - {"Entry.type.trustedCertEntry.", "\u8F38\u5165\u985E\u578B: trustedCertEntry\n"}, - {"trustedCertEntry.", "trustedCertEntry,"}, {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "}, {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "}, {"Your.keystore.contains.keyStore.size.entry", @@ -368,7 +368,7 @@ "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"}, {".WARNING.WARNING.WARNING.", - "***************** WARNING WARNING WARNING *****************"}, + "***************** \u8B66\u544A \u8B66\u544A \u8B66\u544A *****************"}, {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"}, {"Timestamp.", "\u6642\u6233:"}, {"Signature.", "\u7C3D\u7AE0:"}, @@ -378,20 +378,10 @@ {"No.certificate.from.the.SSL.server", "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"}, - // Translators of the following 5 pairs, ATTENTION: - // the next 5 string pairs are meant to be combined into 2 paragraphs, - // 1+3+4 and 2+3+5. make sure your translation also does. {".The.integrity.of.the.information.stored.in.your.keystore.", - "* \u8CC7\u8A0A\u7684\u5B8C\u6574\u6027\u5DF2\u5132\u5B58\u5728\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D *"}, + "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002 *"}, {".The.integrity.of.the.information.stored.in.the.srckeystore.", - "* \u8CC7\u8A0A\u7684\u5B8C\u6574\u6027\u5DF2\u5132\u5B58\u5728 srckeystore \u4E2D *"}, - {".has.NOT.been.verified.In.order.to.verify.its.integrity.", - "* \u5C1A\u672A\u88AB\u9A57\u8B49\uFF01\u70BA\u4E86\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*"}, - {".you.must.provide.your.keystore.password.", - "* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5BC6\u78BC\u3002 *"}, - {".you.must.provide.the.srckeystore.password.", - "* \u60A8\u5FC5\u9808\u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"}, - + "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002 *"}, {"Certificate.reply.does.not.contain.public.key.for.alias.", "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/SignatureFileManifest.java --- a/jdk/src/share/classes/sun/security/util/SignatureFileManifest.java Wed May 11 16:12:01 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,251 +0,0 @@ -/* - * Copyright (c) 2011, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.security.util; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.jar.Attributes; -import java.util.jar.Manifest; - -/** - * This class provides streaming mode reading of manifest files. - * Used by {@link SignatureFileVerifier}. - */ -class SignatureFileManifest extends Manifest { - - /* - * Reading a manifest into this object by calling update(byte[]) on chunks. - * During the reading, the bytes are saved in (@code current} until a line - * is complete and the key-value pair is saved in {@code currentAttr}. When - * a section is complete, {@code consumeAttr} is called to merge - * {@code currentAttr} into main attributes or a named entry. - */ - - // Internal state during update() style reading - // 0. not in update mode - // 1, in update mode but main attributes not completed yet - // 2. main attributes completed, still reading the entries - private int state = 0; - - // The partial line read - private byte[] current; - - // Number of bytes in current - private int currentPos = 0; - - // The current Attribute - private Attributes currentAttr; - - /** - * Reads a manifest in chunks. - * - * This method must be called in a row, reading chunks from a single - * manifest file by order. After all chunks are read, caller must call - * {@code update(null)} to fully consume the manifest. - * - * The entry names and attributes read will be merged in with the current - * manifest entries. The {@link #read} method cannot be called inside a - * row of update calls. - * - * Along with the calls, caller can call {@link #getMainAttributes()}, - * {@link #getAttributes(java.lang.String)} or {@link #getEntries()} - * to get already available contents. However, in order not to return - * partial result, when the main attributes in the new manifest is not - * consumed completely, {@link #getMainAttributes()} throws an - * {@code IllegalStateException}. When a certain named entry is not - * consumed completely, {@link #getAttributes(java.lang.String)} - * returns the old {@code Attributes} for the name (if it exists). - * - * @param data null for last call, otherwise, feeding chunks - * @param offset offset into data to begin read - * @param length length of data after offset to read - * @exception IOException if an I/O error has occurred - * @exception IllegalStateException if {@code update(null)} is called - * without any previous {@code update(non-null)} call - */ - public void update(byte[] data, int offset, int length) throws IOException { - - // The last call - if (data == null) { - if (state == 0) { - throw new IllegalStateException("No data to update"); - } - // We accept manifest not ended with \n or \n\n - if (hasLastByte()) { - consumeCurrent(); - } - // We accept empty lines at the end - if (!currentAttr.isEmpty()) { - consumeAttr(); - } - state = 0; // back to non-update state - current = null; - currentAttr = null; - return; - } - - // The first call - if (state == 0) { - current = new byte[1024]; - currentAttr = super.getMainAttributes(); // the main attribute - state = 1; - } - - int end = offset + length; - - while (offset < end) { - switch (data[offset]) { - case '\r': - break; // always skip - case '\n': - if (hasLastByte() && lastByte() == '\n') { // new section - consumeCurrent(); - consumeAttr(); - if (state == 1) { - state = 2; - } - currentAttr = new Attributes(2); - } else { - if (hasLastByte()) { - // save \n into current but do not parse, - // there might be a continuation later - ensureCapacity(); - current[currentPos++] = data[offset]; - } else if (state == 1) { - // there can be multiple empty lines between - // sections, but cannot be at the beginning - throw new IOException("invalid manifest format"); - } - } - break; - case ' ': - if (!hasLastByte()) { - throw new IOException("invalid manifest format"); - } else if (lastByte() == '\n') { - currentPos--; // continuation, remove last \n - } else { // a very normal ' ' - ensureCapacity(); - current[currentPos++] = data[offset]; - } - break; - default: - if (hasLastByte() && lastByte() == '\n') { - // The start of a new pair, not continuation - consumeCurrent(); // the last line read - } - ensureCapacity(); - current[currentPos++] = data[offset]; - break; - } - offset++; - } - } - - /** - * Returns the main Attributes for the Manifest. - * @exception IllegalStateException the main attributes is being read - * @return the main Attributes for the Manifest - */ - public Attributes getMainAttributes() { - if (state == 1) { - throw new IllegalStateException(); - } - return super.getMainAttributes(); - } - - /** - * Reads the Manifest from the specified InputStream. The entry - * names and attributes read will be merged in with the current - * manifest entries. - * - * @param is the input stream - * @exception IOException if an I/O error has occurred - * @exception IllegalStateException if called between two {@link #update} - * calls - */ - public void read(InputStream is) throws IOException { - if (state != 0) { - throw new IllegalStateException("Cannot call read between updates"); - } - super.read(is); - } - - /* - * ---------- Helper methods ----------------- - */ - - private void ensureCapacity() { - if (currentPos >= current.length-1) { - current = Arrays.copyOf(current, current.length*2); - } - } - - private boolean hasLastByte() { - return currentPos > 0; - } - - private byte lastByte() { - return current[currentPos-1]; - } - - // Parse current as key:value and save into currentAttr. - // There MUST be something inside current. - private void consumeCurrent() throws IOException { - // current normally has a \n end, except for the last line - if (current[currentPos-1] == '\n') currentPos--; - for (int i=0; i<currentPos; i++) { - if (current[i] == ':') { - String key = new String(current, 0, 0, i); - i++; - while (i < currentPos && current[i] == ' ') { i++; } - String value = new String(current, i, currentPos-i, "UTF-8"); - currentAttr.putValue(key, value); - currentPos = 0; - return; - } - } - throw new IOException("invalid header field"); - } - - // Merge currentAttr into Manifest - private void consumeAttr() throws IOException { - // Only needed for named entries. For the main attribute, key/value - // is added into attr directly, but since getMainAttributes() throws - // an exception, the partial data is not leaked. - if (state != 1) { - String name = currentAttr.getValue("Name"); - if (name != null) { - currentAttr.remove(new Attributes.Name("Name")); - Attributes old = getAttributes(name); - if (old != null) old.putAll(currentAttr); - else getEntries().put(name, currentAttr); - } else { - throw new IOException("invalid manifest format"); - } - } - } -} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java --- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Sat May 14 11:52:15 2011 -0700 @@ -55,8 +55,8 @@ /** the PKCS7 block for this .DSA/.RSA/.EC file */ private PKCS7 block; - // the content of the raw .SF file as an InputStream - private InputStream sfStream; + /** the raw bytes of the .SF file */ + private byte sfBytes[]; /** the name of the signature block file, uppercased and without * the extension (.DSA/.RSA/.EC) @@ -66,9 +66,6 @@ /** the ManifestDigester */ private ManifestDigester md; - /** The MANIFEST.MF */ - private Manifest man; - /** cache of created MessageDigest objects */ private HashMap<String, MessageDigest> createdDigests; @@ -86,7 +83,6 @@ * @param rawBytes the raw bytes of the signature block file */ public SignatureFileVerifier(ArrayList<CodeSigner[]> signerCache, - Manifest man, ManifestDigester md, String name, byte rawBytes[]) @@ -98,18 +94,13 @@ try { obj = Providers.startJarVerification(); block = new PKCS7(rawBytes); - byte[] contentData = block.getContentInfo().getData(); - if (contentData != null) { - sfStream = new ByteArrayInputStream(contentData); - } + sfBytes = block.getContentInfo().getData(); certificateFactory = CertificateFactory.getInstance("X509"); } finally { Providers.stopJarVerification(obj); } this.name = name.substring(0, name.lastIndexOf(".")) .toUpperCase(Locale.ENGLISH); - - this.man = man; this.md = md; this.signerCache = signerCache; } @@ -117,13 +108,31 @@ /** * returns true if we need the .SF file */ - public boolean needSignatureFile() + public boolean needSignatureFileBytes() { - return sfStream == null; + + return sfBytes == null; } - public void setSignatureFile(InputStream ins) { - this.sfStream = ins; + + /** + * returns true if we need this .SF file. + * + * @param name the name of the .SF file without the extension + * + */ + public boolean needSignatureFile(String name) + { + return this.name.equalsIgnoreCase(name); + } + + /** + * used to set the raw bytes of the .SF file when it + * is external to the signature block file. + */ + public void setSignatureFile(byte sfBytes[]) + { + this.sfBytes = sfBytes; } /** @@ -136,18 +145,12 @@ * Signature File or PKCS7 block file name */ public static boolean isBlockOrSF(String s) { - return s.endsWith(".SF") || isBlock(s); - } - - /** - * Utility method used by JarVerifier to determine PKCS7 block - * files names that are supported - * - * @param s file name - * @return true if the input file name is a PKCS7 block file name - */ - public static boolean isBlock(String s) { - return s.endsWith(".DSA") || s.endsWith(".RSA") || s.endsWith(".EC"); + // we currently only support DSA and RSA PKCS7 blocks + if (s.endsWith(".SF") || s.endsWith(".DSA") || + s.endsWith(".RSA") || s.endsWith(".EC")) { + return true; + } + return false; } /** get digest from cache */ @@ -177,7 +180,7 @@ * * */ - public void process(Map<String, CodeSigner[]> signers, + public void process(Hashtable<String, CodeSigner[]> signers, List manifestDigests) throws IOException, SignatureException, NoSuchAlgorithmException, JarException, CertificateException @@ -194,86 +197,31 @@ } - private void processImpl(Map<String, CodeSigner[]> signers, + private void processImpl(Hashtable<String, CodeSigner[]> signers, List manifestDigests) throws IOException, SignatureException, NoSuchAlgorithmException, JarException, CertificateException { - SignatureFileManifest sf = new SignatureFileManifest(); - InputStream ins = sfStream; + Manifest sf = new Manifest(); + sf.read(new ByteArrayInputStream(sfBytes)); - byte[] buffer = new byte[4096]; - int sLen = block.getSignerInfos().length; - boolean mainOK = false; // main attributes of SF is available... - boolean manifestSigned = false; // and it matches MANIFEST.MF - BASE64Decoder decoder = new BASE64Decoder(); + String version = + sf.getMainAttributes().getValue(Attributes.Name.SIGNATURE_VERSION); - PKCS7.PKCS7Verifier[] pvs = new PKCS7.PKCS7Verifier[sLen]; - for (int i=0; i<sLen; i++) { - pvs[i] = PKCS7.PKCS7Verifier.from(block, block.getSignerInfos()[i]); + if ((version == null) || !(version.equalsIgnoreCase("1.0"))) { + // XXX: should this be an exception? + // for now we just ignore this signature file + return; } - /* - * Verify SF in streaming mode. The chunks of the file are fed into - * the Manifest object sf and all PKCS7Verifiers. As soon as the main - * attributes is available, we'll check if manifestSigned is true. If - * yes, there is no need to fill in sf's entries field, since it should - * be identical to entries in man. - */ - while (true) { - int len = ins.read(buffer); - if (len < 0) { - if (!manifestSigned) { - sf.update(null, 0, 0); - } - break; - } else { - for (int i=0; i<sLen; i++) { - if (pvs[i] != null) pvs[i].update(buffer, 0, len); - } - // Continue reading if verifyManifestHash fails (or, the - // main attributes is not available yet) - if (!manifestSigned) { - sf.update(buffer, 0, len); - if (!mainOK) { - try { - Attributes attr = sf.getMainAttributes(); - String version = attr.getValue( - Attributes.Name.SIGNATURE_VERSION); + SignerInfo[] infos = block.verify(sfBytes); - if ((version == null) || - !(version.equalsIgnoreCase("1.0"))) { - // XXX: should this be an exception? - // for now we just ignore this signature file - return; - } - - mainOK = true; - manifestSigned = verifyManifestHash( - sf, md, decoder, manifestDigests); - } catch (IllegalStateException ise) { - // main attributes not available yet - } - } - } - } - } - List<SignerInfo> intResult = new ArrayList<>(sLen); - for (int i = 0; i < sLen; i++) { - if (pvs[i] != null) { - SignerInfo signerInfo = pvs[i].verify(); - if (signerInfo != null) { - intResult.add(signerInfo); - } - } - } - if (intResult.isEmpty()) { + if (infos == null) { throw new SecurityException("cannot verify signature block file " + name); } - SignerInfo[] infos = - intResult.toArray(new SignerInfo[intResult.size()]); + BASE64Decoder decoder = new BASE64Decoder(); CodeSigner[] newSigners = getSigners(infos, block); @@ -281,37 +229,26 @@ if (newSigners == null) return; + Iterator<Map.Entry<String,Attributes>> entries = + sf.getEntries().entrySet().iterator(); + + // see if we can verify the whole manifest first + boolean manifestSigned = verifyManifestHash(sf, md, decoder, manifestDigests); + // verify manifest main attributes if (!manifestSigned && !verifyManifestMainAttrs(sf, md, decoder)) { throw new SecurityException ("Invalid signature file digest for Manifest main attributes"); } - Iterator<Map.Entry<String,Attributes>> entries; - - if (manifestSigned) { - if (debug != null) { - debug.println("full manifest signature match, " - + "update signer info from MANIFEST.MF"); - } - entries = man.getEntries().entrySet().iterator(); - } else { - if (debug != null) { - debug.println("full manifest signature unmatch, " - + "update signer info from SF file"); - } - entries = sf.getEntries().entrySet().iterator(); - } - - // go through each section - + // go through each section in the signature file while(entries.hasNext()) { Map.Entry<String,Attributes> e = entries.next(); String name = e.getKey(); if (manifestSigned || - (verifySection(e.getValue(), name, md, decoder))) { + (verifySection(e.getValue(), name, md, decoder))) { if (name.startsWith("./")) name = name.substring(2); @@ -656,6 +593,7 @@ if (set == subset) return true; + boolean match; for (int i = 0; i < subset.length; i++) { if (!contains(set, subset[i])) return false; @@ -675,6 +613,8 @@ if ((oldSigners == null) && (signers == newSigners)) return true; + boolean match; + // make sure all oldSigners are in signers if ((oldSigners != null) && !isSubSet(oldSigners, signers)) return false; @@ -698,7 +638,7 @@ } void updateSigners(CodeSigner[] newSigners, - Map<String, CodeSigner[]> signers, String name) { + Hashtable<String, CodeSigner[]> signers, String name) { CodeSigner[] oldSigners = signers.get(name); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/swing/FilePane.java --- a/jdk/src/share/classes/sun/swing/FilePane.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/swing/FilePane.java Sat May 14 11:52:15 2011 -0700 @@ -763,7 +763,7 @@ public void setValueAt(Object value, int row, int col) { if (col == COLUMN_FILENAME) { - JFileChooser chooser = getFileChooser(); + final JFileChooser chooser = getFileChooser(); File f = (File)getValueAt(row, col); if (f != null) { String oldDisplayName = chooser.getName(f); @@ -782,18 +782,25 @@ // rename FileSystemView fsv = chooser.getFileSystemView(); - File f2 = fsv.createFileObject(f.getParentFile(), newFileName); + final File f2 = fsv.createFileObject(f.getParentFile(), newFileName); if (f2.exists()) { JOptionPane.showMessageDialog(chooser, MessageFormat.format(renameErrorFileExistsText, oldFileName), renameErrorTitleText, JOptionPane.ERROR_MESSAGE); } else { if (FilePane.this.getModel().renameFile(f, f2)) { if (fsv.isParent(chooser.getCurrentDirectory(), f2)) { - if (chooser.isMultiSelectionEnabled()) { - chooser.setSelectedFiles(new File[]{f2}); - } else { - chooser.setSelectedFile(f2); - } + // The setSelectedFile method produces a new setValueAt invocation while the JTable + // is editing. Postpone file selection to be sure that edit mode of the JTable + // is completed + SwingUtilities.invokeLater(new Runnable() { + public void run() { + if (chooser.isMultiSelectionEnabled()) { + chooser.setSelectedFiles(new File[]{f2}); + } else { + chooser.setSelectedFile(f2); + } + } + }); } else { // Could be because of delay in updating Desktop folder // chooser.setSelectedFile(null); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/swing/WindowsPlacesBar.java --- a/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Sat May 14 11:52:15 2011 -0700 @@ -29,6 +29,8 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.*; +import java.security.AccessController; +import java.security.PrivilegedAction; import javax.swing.*; import javax.swing.border.*; @@ -79,7 +81,12 @@ setBackground(bgColor); FileSystemView fsv = fc.getFileSystemView(); - files = (File[])ShellFolder.get("fileChooserShortcutPanelFolders"); + files = AccessController.doPrivileged(new PrivilegedAction<File[]>() { + public File[] run() { + return (File[]) ShellFolder.get("fileChooserShortcutPanelFolders"); + } + }); + buttons = new JToggleButton[files.length]; buttonGroup = new ButtonGroup(); for (int i = 0; i < files.length; i++) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java --- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Sat May 14 11:52:15 2011 -0700 @@ -197,7 +197,7 @@ {"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"}, {"HelpMenu.About.title", "JConsole\u306B\u3064\u3044\u3066(A)"}, {"HelpMenu.About.title.mnemonic", 'A'}, - {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(U)"}, + {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9"}, {"HelpMenu.UserGuide.title.mnemonic", 'U'}, {"HelpMenu.title", "\u30D8\u30EB\u30D7(H)"}, {"HelpMenu.title.mnemonic", 'H'}, @@ -308,7 +308,7 @@ {"Password: .mnemonic", 'P'}, {"Password.accessibleName", "\u30D1\u30B9\u30EF\u30FC\u30C9"}, {"Peak","\u30D4\u30FC\u30AF"}, - {"Perform GC", "GC\u306E\u5B9F\u884C(G)"}, + {"Perform GC", "GC\u306E\u5B9F\u884C"}, {"Perform GC.mnemonic", 'G'}, {"Perform GC.toolTip", "\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"}, {"Plotter.accessibleName", "\u30C1\u30E3\u30FC\u30C8"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java --- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Sat May 14 11:52:15 2011 -0700 @@ -197,7 +197,7 @@ {"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"}, {"HelpMenu.About.title", "\u5173\u4E8E JConsole(A)"}, {"HelpMenu.About.title.mnemonic", 'A'}, - {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357(U)"}, + {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357"}, {"HelpMenu.UserGuide.title.mnemonic", 'U'}, {"HelpMenu.title", "\u5E2E\u52A9(H)"}, {"HelpMenu.title.mnemonic", 'H'}, @@ -308,7 +308,7 @@ {"Password: .mnemonic", 'P'}, {"Password.accessibleName", "\u53E3\u4EE4"}, {"Peak","\u5CF0\u503C"}, - {"Perform GC", "\u6267\u884C GC(G)"}, + {"Perform GC", "\u6267\u884C GC"}, {"Perform GC.mnemonic", 'G'}, {"Perform GC.toolTip", "\u8BF7\u6C42\u5783\u573E\u6536\u96C6"}, {"Plotter.accessibleName", "\u56FE\u8868"}, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_de.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Alle # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Schwerwiegend # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Warnung # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Information # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Konfiguration # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Fein # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Feiner # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Am feinsten # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Deaktiviert diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_es.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Todo # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Advertencia # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Informaci\u00F3n # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Configurar # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Detallado # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Muy Detallado # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=M\u00E1s Detallado # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Desactivado diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Tout # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Avertissement # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Infos # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Config # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Pr\u00E9cis # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Plus pr\u00E9cis # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Le plus pr\u00E9cis # The following ALL CAPS words should be translated. -OFF=OFF +OFF=D\u00E9sactiv\u00E9 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_it.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Tutto # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Avvertenza # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Informazioni # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Configurazione # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Buono # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Migliore # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Ottimale # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Non attivo diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -29,18 +29,18 @@ # The following ALL CAPS words should be translated. ALL=\u3059\u3079\u3066 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\u91CD\u5927 # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\u8B66\u544A # The following ALL CAPS words should be translated. INFO=\u60C5\u5831 # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \u69CB\u6210 # The following ALL CAPS words should be translated. -FINE=\u8A73\u7D30\u30EC\u30D9\u30EB(\u4F4E) +FINE=\u666E\u901A # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\u8A73\u7D30 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\u6700\u3082\u8A73\u7D30 # The following ALL CAPS words should be translated. OFF=\u30AA\u30D5 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=\uBAA8\uB450 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\uC2EC\uAC01 # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\uACBD\uACE0 # The following ALL CAPS words should be translated. -INFO=INFO +INFO=\uC815\uBCF4 # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \uAD6C\uC131 # The following ALL CAPS words should be translated. -FINE=FINE +FINE=\uBBF8\uC138 # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\uBCF4\uB2E4 \uBBF8\uC138 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\uAC00\uC7A5 \uBBF8\uC138 # The following ALL CAPS words should be translated. -OFF=OFF +OFF=\uD574\uC81C diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Tudo # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Grave # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Advert\u00EAncia # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Informa\u00E7\u00F5es # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Configura\u00E7\u00E3o # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Detalhado # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Mais Detalhado # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=O Mais Detalhado # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Desativado diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=Alla # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=Allvarlig # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=Varning # The following ALL CAPS words should be translated. -INFO=INFO +INFO=Info # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= Konfig # The following ALL CAPS words should be translated. -FINE=FINE +FINE=Fin # The following ALL CAPS words should be translated. -FINER=FINER +FINER=Finare # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=Finaste # The following ALL CAPS words should be translated. -OFF=OFF +OFF=Av diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=ALL +ALL=\u5168\u90E8 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\u4E25\u91CD # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\u8B66\u544A # The following ALL CAPS words should be translated. -INFO=INFO +INFO=\u4FE1\u606F # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \u914D\u7F6E # The following ALL CAPS words should be translated. -FINE=FINE +FINE=\u8BE6\u7EC6 # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\u8F83\u8BE6\u7EC6 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\u975E\u5E38\u8BE6\u7EC6 # The following ALL CAPS words should be translated. -OFF=OFF +OFF=\u7981\u7528 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties --- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. # The following ALL CAPS words should be translated. -ALL=\u6240\u6709 +ALL=\u5168\u90E8 # The following ALL CAPS words should be translated. -SEVERE=SEVERE +SEVERE=\u56B4\u91CD # The following ALL CAPS words should be translated. -WARNING=WARNING +WARNING=\u8B66\u544A # The following ALL CAPS words should be translated. INFO=\u8CC7\u8A0A # The following ALL CAPS words should be translated. -CONFIG= CONFIG +CONFIG= \u7D44\u614B # The following ALL CAPS words should be translated. -FINE=\u7D30\u7DFB +FINE=\u8A73\u7D30 # The following ALL CAPS words should be translated. -FINER=FINER +FINER=\u8F03\u8A73\u7D30 # The following ALL CAPS words should be translated. -FINEST=FINEST +FINEST=\u6700\u8A73\u7D30 # The following ALL CAPS words should be translated. OFF=\u95DC\u9589 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_de.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=Chinesisch zu=Zulu +# key is ISO 639.2 language code +aar=Afar +abk=Abchasisch +ace=Aceh-Sprache +ach=Acholi-Sprache +ada=Adangme +ady=Adygeisch +afa=Afro-Asiatisch +afh=Afrihili +afr=Afrikaans +ain=Ainu-Sprache +aka=Akan +akk=Akkadisch +alb=Albanisch +ale=Aleutisch +alg=Algonkin-Sprache +alt=S\u00FCd-Altaisch +amh=Amharisch +ang=Altenglisch +anp=Angika +apa=Apache-Sprache +ara=Arabisch +arc=Aram\u00E4isch +arg=Aragonisch +arm=Armenisch +arn=Araukanisch +arp=Arapaho +art=Kunstsprache +arw=Arawak-Sprache +asm=Assamesisch +ast=Asturianisch +ath=Athapaskisch +aus=Australisch +ava=Avarisch +ave=Avestisch +awa=Awadhi +aym=Aymara +aze=Aserbaidschanisch +bad=Banda +bai=Bamileke-Sprache +bak=Baschkirisch +bal=Belutschisch +bam=Bambara +ban=Balinesisch +baq=Baskisch +bas=Basaa-Sprache +bat=Baltisch +bej=Bedauye +bel=Belorussisch +bem=Bemba-Sprache +ben=Bengalisch +ber=Berber-Sprache +bho=Bodschpuri +bih=Biharisch +bik=Bikol-Sprache +bin=Bini-Sprache +bis=Bislamisch +bla=Blackfoot-Sprache +bnt=Bantu-Sprache +bos=Bosnisch +bra=Braj-Bhakha +bre=Bretonisch +btk=Battakisch +bua=Burjatisch +bug=Buginesisch +bul=Bulgarisch +bur=Burmesisch +byn=Blin +cad=Caddo +cai=Zentralamerikanische Indianersprache +car=Karibisch +cat=Katalanisch +cau=Kaukasisch +ceb=Cebuano +cel=Keltisch +cha=Chamorro +chb=Chibcha-Sprache +che=Tschetschenisch +chg=Tschagataisch +chi=Chinesisch +chk=Trukesisch +chm=Tscheremissisch +chn=Chinook +cho=Choctaw +chp=Chipewyan +chr=Cherokee +chu=Kirchenslawisch +chv=Chuvash +chy=Cheyenne +cmc=Cham-Sprache +cop=Koptisch +cor=Cornish +cos=Korsisch +cpe=Kreolisch-Englische Sprache +cpf=Kreolisch-Franz\u00F6sische Sprache +cpp=Kreolisch-Portugiesische Sprache +cre=Cree +crh=Krimtatarisch +crp=Kreolische Sprache +csb=Kaschubisch +cus=Kuschitisch +cze=Tschechisch +dak=Dakota-Sprache +dan=D\u00E4nisch +dar=Darginisch +day=Dajak +del=Delaware-Sprache +den=Slave +dgr=Dogrib +din=Dinka-Sprache +div=Divehi +doi=Dogri +dra=Drawidisch +dsb=Niedersorbisch +dua=Duala +dum=Mittelniederl\u00E4ndisch +dut=Niederl\u00E4ndisch +dyu=Dyula-Sprache +dzo=Bhutani +efi=Efik +egy=\u00C4gyptisch +eka=Ekajuk +elx=Elamisch +eng=Englisch +enm=Mittelenglisch +epo=Esperanto +est=Estnisch +ewe=Ewe +ewo=Ewondo +fan=Pangwe-Sprache +fao=F\u00E4r\u00F6isch +fat=Fanti-Sprache +fij=Fidschi +fil=Philippinisch +fin=Finnisch +fiu=Finnougrisch +fon=Fon-Sprache +fre=Franz\u00F6sisch +frm=Mittelfranz\u00F6sisch +fro=Altfranz\u00F6sisch +frr=Nordfriesisch +frs=Ostfriesisch +fry=Westfriesisch +ful=Fulah +fur=Friulisch +gaa=Ga-Sprache +gay=Gayo +gba=Gbaya-Sprache +gem=Germanisch +geo=Georgisch +ger=Deutsch +gez=Geez +gil=Gilbertesisch +gla=G\u00E4lisch +gle=Irisch +glg=Galizisch +glv=Manx +gmh=Mittelhochdeutsch +goh=Althochdeutsch +gon=Gondi-Sprache +gor=Mongondou +got=Gotisch +grb=Grebo-Sprache +grc=Altgriechisch +gre=Modernes Griechisch (1453-) +grn=Guarani +gsw=Schweizerdeutsch +guj=Gujaratisch +gwi=Kutchin-Sprache +hai=Haida-Sprache +hat=Haitisch +hau=Haussa +haw=Hawaiisch +heb=Hebr\u00E4isch +her=Herero +hil=Hiligaynon-Sprache +him=Himachali +hin=Hindi +hit=Hethitisch +hmn=Miao-Sprache +hmo=Hiri Motu +hrv=Kroatisch +hsb=Obersorbisch +hun=Ungarisch +hup=Hupa +iba=Iban +ibo=Igbo +ice=Isl\u00E4ndisch +ido=Ido +iii=Sichuan Yi +ijo=Ijo-Sprache +iku=Inuktitut +ile=Interlingue +ilo=Ilokano-Sprache +ina=Interlingua (Internationale Hilfssprache, Vereinigung) +inc=Indoarisch +ind=Indonesisch +ine=Indogermanisch +inh=Inguschisch +ipk=Inupiak +ira=Iranische Sprache +iro=Irokesische Sprache +ita=Italienisch +jav=Javanesisch +jbo=Lojban +jpn=Japanisch +jpr=J\u00FCdisch-Persisch +jrb=J\u00FCdisch-Arabisch +kaa=Karakalpakisch +kab=Kabylisch +kac=Kachin-Sprache +kal=Kalaallisut (Gr\u00F6nl\u00E4ndisch) +kam=Kamba +kan=Kannada +kar=Karenisch +kas=Kaschmirisch +kau=Kanuri +kaw=Kawi +kaz=Kasachisch +kbd=Kabardinisch +kha=Khasi-Sprache +khi=Khoisan-Sprache +khm=Khmerisch, Zentral +kho=Sakisch +kik=Kikuyu +kin=Kinyarwanda +kir=Kirgisisch +kmb=Kimbundu-Sprache +kok=Konkani +kom=Komi +kon=Kongo +kor=Koreanisch +kos=Kosraeanisch +kpe=Kpelle-Sprache +krc=Karatschaiisch-Balkarisch +krl=Karelisch +kro=Kru-Sprache +kru=Oraon-Sprache +kua=Kuanyama +kum=Kumykisch +kur=Kurdisch +kut=Kutenai-Sprache +lad=Ladino +lah=Lahnda +lam=Lamba-Sprache +lao=Laotisch +lat=Lateinisch +lav=Lettisch +lez=Lesgisch +lim=Limburgisch +lin=Lingalisch +lit=Litauisch +lol=Mongo +loz=Rotse-Sprache +ltz=Luxemburgisch +lua=Luba-Lulua +lub=Luba-Katanga +lug=Ganda +lui=Luiseno-Sprache +lun=Lunda-Sprache +luo=Luo-Sprache +lus=Lushai-Sprache +mac=Mazedonisch +mad=Maduresisch +mag=Khotta +mah=Marshall +mai=Maithili +mak=Makassarisch +mal=Malaysisch +man=Manding-Sprache +mao=Maorisch +map=Austronesisch +mar=Marathi +mas=Massai-Sprache +may=Malay +mdf=Moksha +mdr=Mandaresisch +men=Mende-Sprache +mga=Mittelirisch (900-1200) +mic=Micmac-Sprache +min=Minangkabau-Sprache +mis=(andere Sprache) +mkh=Mon-Khmer-Sprache +mlg=Malagasisch +mlt=Maltesisch +mnc=Mandschurisch +mni=Meithei-Sprache +mno=Manobo-Sprache +moh=Mohawk-Sprache +mon=Mongolisch +mos=Mossi-Sprache +mul=Mehrsprachig +mun=Munda-Sprache +mus=Muskogee-Sprache +mwl=Mirandesisch +mwr=Marwari +myn=Maya-Sprache +myv=Ersja-Mordwinisch +nah=Nahuatl +nai=Nordamerikanische Indianersprache +nap=Neapolitanisch +nau=Nauru +nav=Navajo +nbl=Ndebele, S\u00FCd +nde=Ndebele, Nord +ndo=Ndonga +nds=Niederdeutsch +nep=Nepalesisch +new=Newan +nia=Nias-Sprache +nic=Cordoba +niu=Niue-Sprache +nno=Norwegisch, Nynorsk +nob=Bokmal, Norwegisch +nog=Nogai +non=Altnordisch +nor=Norwegisch +nqo=N'Ko +nso=Nord-Sotho-Sprache +nub=Nubisch +nwc=Alt-Newari +nya=Chichewa +nym=Nyamwezi-Sprache +nyn=Nyankole +nyo=Nyoro +nzi=Nzima +oci=Okzitanisch (nach 1500) +oji=Ojibwa +ori=Orija +orm=Oromo (Afan) +osa=Osage-Sprache +oss=Ossetisch +ota=Osmanisch +oto=Otomangue-Sprache +paa=Papuasprache +pag=Pangasinan-Sprache +pal=Mittelpersisch +pam=Pampanggan-Sprache +pan=Pundjabisch +pap=Papiamento +pau=Palau +peo=Altpersisch +per=Persisch +phi=Philippinisch +phn=Ph\u00F6nikisch +pli=Pali +pol=Polnisch +pon=Ponapeanisch +por=Portugiesisch +pra=Prakrit +pro=Altprovenzalisch +pus=Paschtunisch +que=Quechua +raj=Rajasthani +rap=Osterinsel-Sprache +rar=Rarotonganisch +roa=Romanische Sprache +roh=Romantsch +rom=Romani +rum=Rum\u00E4nisch +run=Kirundisch +rup=Aromunisch +rus=Russisch +sad=Sandawe-Sprache +sag=Sango +sah=Jakutisch +sai=S\u00FCdamerikanische Indianersprache +sal=Salish-Sprache +sam=Samaritanisch +san=Sanskrit +sas=Sasak +sat=Santali +scn=Sizilianisch +sco=Schottisch +sel=Selkupisch +sem=Semitisch +sga=Altirisch +sgn=Geb\u00E4rdensprache +shn=Schan-Sprache +sid=Sidamo +sin=Singhalesisch +sio=Sioux-Sprache +sit=Tolar +sla=Slawisch +slo=Slowakisch +slv=Slowenisch +sma=S\u00FCd-Samisch +sme=Nord-Samisch +smi=Lappisch +smj=Lule-Lappisch +smn=Inari-Lappisch +smo=Samoanisch +sms=Skolt-Lappisch +sna=Schonisch +snd=Zinti-Sprache +snk=Soninke-Sprache +sog=Sogdisch +som=Somalisch +son=Songhai-Sprache +sot=S\u00FCd-Sotho +spa=Spanisch +srd=Sardisch +srn=Srananisch +srp=Serbisch +srr=Serer-Sprache +ssa=Nilosaharanisch +ssw=Swasil\u00E4ndisch +suk=Sukuma-Sprache +sun=Sundanesisch +sus=Susu +sux=Sumerisch +swa=Suaheli +swe=Schwedisch +syc=Altsyrisch +syr=Syrisch +tah=Tahitisch +tai=Tai-Sprache +tam=Tsongaisch +tat=Tatarisch +tel=Telugu +tem=Temne +ter=Tereno-Sprache +tet=Tetum-Sprache +tgk=Tadschikisch +tgl=Tagalog +tha=Thai +tib=Tibetanisch +tig=Tigre +tir=Tigrinja +tiv=Tiv-Sprache +tkl=Tokelauanisch +tlh=Klingonisch +tli=Tlingit-Sprache +tmh=Tamaseq +tog=Tsonga-Sprache +ton=Tonga (Tonga-Inseln) +tpi=Neumelanesisch +tsi=Tsimshian-Sprache +tsn=Sezuan +tso=Tsonga +tuk=Turkmenisch +tum=Tumbuka-Sprache +tup=Tupi-Sprache +tur=T\u00FCrkisch +tut=Altaisch +tvl=Elliceanisch +twi=Twi +tyv=Tuwinisch +udm=Udmurtisch +uga=Ugaritisch +uig=Uigurisch +ukr=Ukrainisch +umb=Mbundu-Sprache +und=Unbestimmte Sprache +urd=Urdu +uzb=Usbekisch +vai=Vai-Sprache +ven=Venda +vie=Vietnamesisch +vol=Volap\u00FCk +vot=Wotisch +wak=Wakashanisch +wal=Walamo-Sprache +war=Waray +was=Washo-Sprache +wel=Walisisch +wen=Sorbisch +wln=Wallonisch +wol=Wolof +xal=Kalm\u00FCckisch +xho=Xhosa +yao=Yao-Sprache +yap=Yapesisch +yid=Jiddish +yor=Joruba +ypk=Yupik-Sprache +zap=Zapotekisch +zbl=Bliss-Symbole +zen=Zenaga +zha=Zhuang +znd=Zande-Sprache +zul=Zulu +zun=Zuni-Sprache +zxx=Keine Sprachinhalte +zza=Zaza + +# script names +# key is ISO 15924 script code + +Arab=Arabisch +Armi=Armi +Armn=Armenisch +Avst=Avestisch +Bali=Balinesisch +Bamu=Bamum +Bass=Bassa VHA +Batk=Battakisch +Beng=Bengalisch +Blis=Bliss-Symbole +Bopo=Bopomofo +Brah=Brahmi +Brai=Blindenschrift +Bugi=Buginesisch +Buhd=Buhid +Cakm=Cakm +Cans=UCAS +Cari=Karisch +Cham=Cham +Cher=Cherokee +Cirt=Cirth +Copt=Koptisch +Cprt=Zypriotisch +Cyrl=Kyrillisch +Cyrs=Altkirchenslawisch +Deva=Devanagari +Dsrt=Deseret +Dupl=Duployan Shorthand +Egyd=\u00C4gyptisch - Demotisch +Egyh=\u00C4gyptisch - Hieratisch +Egyp=\u00C4gyptische Hieroglyphen +Elba=Elbasan +Ethi=\u00C4thiopisch +Geok=Khutsuri +Geor=Georgisch +Glag=Glagolitisch +Goth=Gotisch +Gran=Grantha +Grek=Griechisch +Gujr=Gujaratisch +Guru=Gurmukhi +Hang=Hangul +Hani=Chinesisch +Hano=Hanunoo +Hans=Vereinfachte Chinesische Schrift +Hant=Traditionelle Chinesische Schrift +Hebr=Hebr\u00E4isch +Hira=Hiragana +Hmng=Pahawh Hmong +Hrkt=Katakana oder Hiragana +Hung=Altungarisch +Inds=Indus-Schrift +Ital=Altitalienisch +Java=Javanesisch +Jpan=Japanisch +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Kambodschanisch +Knda=Kannada +Kore=Koreanisch +Kpel=Kpelle-Sprache +Kthi=Kthi +Lana=Lanna +Laoo=Laotisch +Latf=Lateinisch - Fraktur-Variante +Latg=Lateinisch - G\u00E4lische Variante +Latn=Lateinisch +Lepc=Lepcha +Limb=Limbu +Lina=Linear A +Linb=Linear B +Lisu=Lisu +Loma=Loma +Lyci=Lykisch +Lydi=Lydisch +Mand=Mand\u00E4isch +Mani=Manich\u00E4nisch +Maya=Maya-Hieroglyphen +Mend=Mende-Sprache +Merc=Meroitisch, kursiv +Mero=Meroitisch +Mlym=Malaysisch +Mong=Mongolisch +Moon=Moon +Mtei=Meitei Mayek +Mymr=Birmanisch +Narb=Altes Nordarabisch +Nbat=Nabat\u00E4isch +Nkgb=Nakhi Geba +Nkoo=N'Ko +Ogam=Ogham +Olck=Ol Chiki +Orkh=Orchon-Runen +Orya=Orija +Osma=Osmanisch +Palm=Palmyrenisch +Perm=Altpermisch +Phag=Phags-pa +Phli=Phli +Phlp=Phlp +Phlv=Pahlavi +Phnx=Ph\u00F6nizisch +Plrd=Pollard Phonetisch +Prti=Prti +Rjng=Rejang +Roro=Rongorongo +Runr=Runenschrift +Samr=Samaritanisch +Sara=Sarati +Sarb=Alts\u00FCdarabisch +Saur=Saurashtra +Sgnw=Geb\u00E4rdensprache +Shaw=Shaw-Alphabet +Sind=Zinti-Sprache +Sinh=Sinhala +Sund=Sundanesisch +Sylo=Syloti Nagri +Syrc=Syrisch +Syre=Syrisch - Estrangelo-Variante +Syrj=Westsyrisch +Syrn=Ostsyrisch +Tagb=Tagbanwa +Tale=Tai Le +Talu=Tai Lue +Taml=Tsongaisch +Tavt=Tavt +Telu=Telugu +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Thaana +Thai=Thai +Tibt=Tibetanisch +Ugar=Ugaritisch +Vaii=Vai-Sprache +Visp=Sichtbare Sprache +Wara=Warang Citi +Xpeo=Altpersisch +Xsux=Sumerisch-akkadische Keilschrift +Yiii=Yi +Zinh=Geerbter Schriftwert +Zmth=Zmth +Zsym=Zsym +Zxxx=Schriftlos +Zyyy=Unbestimmt +Zzzz=Uncodierte Schrift + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=S\u00fcdafrika ZM=Sambia ZW=Simbabwe + +# territory names +# key is UN M.49 country and area code + +001=Welt +002=Afrika +003=Nordamerika +005=S\u00FCdamerika +009=Ozeanien +011=Westafrika +013=Mittelamerika +014=Ostafrika +015=Nordafrika +017=Zentralafrika +018=S\u00FCdafrika +019=Amerika +021=N\u00F6rdliches Amerika +029=Karibik +030=Ostasien +034=S\u00FCdasien +035=S\u00FCdostasien +039=S\u00FCdeuropa +053=Australien und Neuseeland +054=Melanesien +057=Mikronesisches Inselgebiet +061=Polynesien +142=Asien +143=Zentralasien +145=Westasien +150=Europa +151=Osteuropa +154=Nordeuropa +155=Westeuropa +419=Lateinamerika und Karibik diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_es.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=chino zu=zul\u00fa +# key is ISO 639.2 language code +aar=afar +abk=Abjasio +ace=acehn\u00E9s +ach=acoli +ada=adangme +ady=adigeo +afa=afgani (1927-2002) +afh=afrihili +afr=Afrikaans +ain=ainu +aka=Acano +akk=acadio +alb=Alban\u00E9s +ale=aleutiano +alg=lenguas algonquinas +alt=alt\u00E1i meridional +amh=Am\u00E1rico +ang=florines de las Antillas Neerlandesas +anp=angika +apa=lenguas apache +ara=australes argentinos +arc=arameo +arg=Aragon\u00E9s +arm=Armenio +arn=araucano +arp=pesos argentinos (ARP) +art=lengua artificial +arw=arahuaco +asm=Asam\u00E9s +ast=asturiano +ath=lenguas atabascas +aus=lenguas australianas +ava=\u00C1varo +ave=Av\u00E9stico +awa=avadhi +aym=Aimara +aze=Azerbaiyano +bad=dinares bosnios +bai=lenguas bamileke +bak=Bashkir +bal=baluchi +bam=marcos convertibles de Bosnia-Herzegovina +ban=balin\u00E9s +baq=Vasco +bas=basa +bat=lengua b\u00E1ltica +bej=beja +bel=francos belgas (financieros) +bem=bemba +ben=Bengal\u00ED +ber=bereber +bho=bhojpuri +bih=Bihar\u00ED +bik=bicol +bin=bini +bis=Bislama +bla=siksika +bnt=bant\u00FA +bos=Bosnio +bra=braj +bre=cruceiros brasile\u00F1os (BRE) +btk=batak +bua=buriat +bug=Buguin\u00E9s +bul=B\u00FAlgaro +bur=Birmano +byn=blin +cad=d\u00F3lares canadienses +cai=lengua india centroamericana +car=caribe +cat=Catal\u00E1n +cau=lengua cauc\u00E1sica +ceb=cebuano +cel=lengua celta +cha=Chamorro +chb=chibcha +che=euros WIR +chg=chagat\u00E1i +chi=Chino +chk=truk\u00E9s +chm=mar\u00ED +chn=jerga chinuk +cho=choctaw +chp=chipewyan +chr=cherokee +chu=Eslavo Eclesi\u00E1stico +chv=Chuvacho +chy=cheyene +cmc=lenguas ch\u00E1micas +cop=pesos colombianos +cor=C\u00F3rnico +cos=corso +cpe=lengua criolla o pidgin basada en el ingl\u00E9s +cpf=lengua criolla o pidgin basada en el franc\u00E9s +cpp=lengua criolla o pidgin basada en el portugu\u00E9s +cre=cree +crh=t\u00E1rtaro de Crimea +crp=lengua criolla o pidgin +csb=casubio +cus=lengua cusita +cze=checo +dak=dakota +dan=dan\u00E9s +dar=dargva +day=dayak +del=delaware +den=slave +dgr=dogrib +din=dinka +div=Dhivehi +doi=dogri +dra=lengua drav\u00EDdica +dsb=sorbio inferior +dua=duala +dum=neerland\u00E9s medieval +dut=Holand\u00E9s +dyu=diula +dzo=Dzongkha +efi=efik +egy=egipcio antiguo +eka=ekajuk +elx=elamita +eng=Ingl\u00E9s +enm=ingl\u00E9s medieval +epo=Esperanto +est=Estonio +ewe=Ef\u00E9 +ewo=ewondo +fan=fang +fao=Faro\u00E9s +fat=fanti +fij=fidjiano +fil=filipino +fin=Finland\u00E9s +fiu=lengua fino\u00FAgria +fon=fon +fre=franc\u00E9s +frm=franc\u00E9s medieval +fro=franc\u00E9s antiguo +frr=fris\u00F3n septentrional +frs=fris\u00F3n oriental +fry=Frisio del Oeste +ful=Fula +fur=friulano +gaa=ga +gay=gayo +gba=gbaya +gem=lengua germ\u00E1nica +geo=Georgiano +ger=Alem\u00E1n +gez=geez +gil=gilbert\u00E9s +gla=Ga\u00E9lico +gle=Irland\u00E9s +glg=Gallego +glv=Man\u00E9s +gmh=alem\u00E1n de la alta edad media +goh=alem\u00E1n de la alta edad antigua +gon=gondi +gor=gorontalo +got=g\u00F3tico +grb=grebo +grc=griego antiguo +gre=Griego moderno (1453-) +grn=Guaran\u00ED +gsw=alem\u00E1n suizo +guj=Gujarati +gwi=kutchin +hai=haida +hat=Haitiano +hau=Hausa +haw=hawaiano +heb=hebreo +her=herero +hil=hiligaynon +him=himachali +hin=hindi +hit=hitita +hmn=hmong +hmo=Hiri motu +hrv=Croata +hsb=sorbio superior +hun=h\u00FAngaro +hup=hupa +iba=iban +ibo=Ibo +ice=Island\u00E9s +ido=Ido +iii=Yi de Sichu\u00E1n +ijo=ijo +iku=Inuktitut +ile=Interling\u00FCe +ilo=ilocano +ina=Interlingua (IALA, del ingl\u00E9s International Auxiliary Language Association) +inc=lengua \u00EDndica +ind=Indonesio +ine=lengua indoeuropea +inh=ingush +ipk=I\u00F1upiaq +ira=lengua irania +iro=lenguas iroquesas +ita=Italiano +jav=Javan\u00E9s +jbo=lojban +jpn=Japon\u00E9s +jpr=judeo-persa +jrb=judeo-\u00E1rabe +kaa=karakalpako +kab=cabila +kac=kachin +kal=Kalaallisut +kam=kamba +kan=Canar\u00E9s +kar=karen +kas=Cachemir\u00ED +kau=Kanuri +kaw=kawi +kaz=Kazajo +kbd=kabardiano +kha=khasi +khi=lengua joisana +khm=Jemer Central +kho=kotan\u00E9s +kik=Kikuyu +kin=Ruand\u00E9s +kir=kirghiz +kmb=kimbundu +kok=konkani +kom=Komi +kon=Congo +kor=Coreano +kos=kosraeano +kpe=kpelle +krc=karachay-balkar +krl=carelio +kro=kru +kru=kurukh +kua=Kuanyama +kum=kumyk +kur=Curdo +kut=kutenai +lad=ladino +lah=lahnda +lam=lamba +lao=Laosiano +lat=lat\u00EDn +lav=Let\u00F3n +lez=lezgiano +lim=Limburgu\u00E9s +lin=Lingala +lit=Lituano +lol=mongo +loz=lozi +ltz=Luxemburgu\u00E9s +lua=luba-lulua +lub=Luba-katanga +lug=Luganda +lui=luise\u00F1o +lun=lunda +luo=luo +lus=lushai +mac=Macedonio +mad=dirhams marroqu\u00EDes +mag=magahi +mah=marshal\u00E9s +mai=maithili +mak=macasar +mal=Malayalam +man=mandingo +mao=Maor\u00ED +map=lengua austronesia +mar=Marathi +mas=masai +may=malayo +mdf=moksha +mdr=mandar +men=mende +mga=ariary malgache +mic=micmac +min=minangkabau +mis=lenguas varias +mkh=lengua mon-jemer +mlg=Malgache +mlt=Malt\u00E9s +mnc=manch\u00FA +mni=manipuri +mno=lenguas manobo +moh=mohawk +mon=Mongol +mos=mossi +mul=lenguas m\u00FAltiples +mun=lenguas munda +mus=creek +mwl=mirand\u00E9s +mwr=marwari +myn=maya +myv=erzya +nah=n\u00E1huatl +nai=lengua india norteamericana +nap=napolitano +nau=Nauruano +nav=Navajo +nbl=Ndebele del Sur +nde=ndebele septentrional +ndo=Ndonga +nds=bajo alem\u00E1n +nep=Nepal\u00ED +new=newari +nia=nias +nic=c\u00F3rdobas nicarag\u00FCenses +niu=niueano +nno=Noruego Nynorsk +nob=Noruego Bokmal +nog=nogai +non=n\u00F3rdico antiguo +nor=Noruego +nqo=n'ko +nso=sotho septentrional +nub=lenguas nubias +nwc=newari cl\u00E1sico +nya=Chichewa +nym=nyamwezi +nyn=nyankole +nyo=nyoro +nzi=nzima +oci=Occitano (posterior a 1500) +oji=Ojibwa +ori=oriya +orm=Oromo +osa=osage +oss=Os\u00E9tico +ota=turco otomano +oto=lenguas otomanas +paa=lengua pap\u00FA +pag=pangasin\u00E1n +pal=pahlavi +pam=pampanga +pan=Penyab\u00ED +pap=papiamento +pau=palauano +peo=persa antiguo +per=Persa +phi=lengua filipina +phn=fenicio +pli=Pali +pol=Polaco +pon=pohnpeiano +por=Portugu\u00E9s +pra=lenguas pr\u00E1critas +pro=provenzal antiguo +pus=Pushto; Pashto +que=Quechua +raj=rajasthani +rap=rapanui +rar=rarotongano +roa=lengua romance +roh=Romansh +rom=roman\u00ED +rum=rumano +run=Rund\u00ED +rup=arrumano +rus=Ruso +sad=sandawe +sag=Sango +sah=yakut +sai=lengua india sudamericana +sal=lenguas salish +sam=arameo samaritano +san=S\u00E1nscrito +sas=sasak +sat=santali +scn=siciliano +sco=escoc\u00E9s +sel=selkup +sem=lengua sem\u00EDtica +sga=irland\u00E9s antiguo +sgn=lenguajes de signos +shn=shan +sid=sidamo +sin=Cingal\u00E9s +sio=lenguas sioux +sit=t\u00F3lares eslovenos +sla=lengua eslava +slo=Eslovaco +slv=Esloveno +sma=sami meridional +sme=Sami del Norte +smi=lengua sami +smj=sami lule +smn=sami inari +smo=Samoano +sms=sami skolt +sna=shona +snd=Sindhi +snk=sonink\u00E9 +sog=sogdiano +som=Somal\u00ED +son=songhai +sot=Sotho del Sur +spa=Espa\u00F1ol +srd=d\u00F3lar surinam\u00E9s +srn=sranan tongo +srp=serbio +srr=serer +ssa=lengua nilo-sahariana +ssw=Suazi +suk=sukuma +sun=sudan\u00E9s +sus=sus\u00FA +sux=sumerio +swa=Swahili +swe=Sueco +syc=sir\u00EDaco cl\u00E1sico +syr=siriaco +tah=tahitiano +tai=lengua tai +tam=Tamil +tat=Tatar +tel=Telugu +tem=temne +ter=tereno +tet=tet\u00FAn +tgk=Tajik +tgl=Tagalo +tha=Tailand\u00E9s +tib=Tibetano +tig=tigr\u00E9 +tir=Tigrinya +tiv=tiv +tkl=tokelauano +tlh=klingon +tli=tlingit +tmh=tamashek +tog=tonga del Nyasa +ton=Tongano (Islas Tonga) +tpi=tok pisin +tsi=tsimshiano +tsn=Tswana +tso=Tsonga +tuk=Turcomano +tum=tumbuka +tup=lenguas tup\u00ED +tur=Turco +tut=lengua altaica +tvl=tuvaluano +twi=Tui +tyv=tuviniano +udm=udmurt +uga=ugar\u00EDtico +uig=Uiguro +ukr=Ucraniano +umb=umbundu +und=indeterminada +urd=Urdu +uzb=Uzbeco +vai=vai +ven=Venda +vie=vietnamita +vol=Volapuk +vot=v\u00F3tico +wak=lenguas wakasha +wal=walamo +war=waray +was=washo +wel=Gal\u00E9s +wen=lenguas sorbias +wln=val\u00F3n +wol=Uolof +xal=kalmyk +xho=Xhosa +yao=yao +yap=yap\u00E9s +yid=Y\u00EDdish +yor=Yoruba +ypk=lenguas yupik +zap=zapoteco +zbl=s\u00EDmbolos bliss +zen=zenaga +zha=Zhuang +znd=zande +zul=Zul\u00FA +zun=zun\u00ED +zxx=sin contenido ling\u00FC\u00EDstico +zza=zazaki + +# script names +# key is ISO 15924 script code + +Arab=\u00E1rabe +Armi=Arameo Imperial +Armn=armenio +Avst=av\u00E9stico +Bali=balin\u00E9s +Bamu=Bamum +Bass=Bassa Vah +Batk=batak +Beng=bengal\u00ED +Blis=s\u00EDmbolos bliss +Bopo=bopomofo +Brah=brahm\u00ED +Brai=braille +Bugi=bugin\u00E9s +Buhd=buhid +Cakm=Chakma +Cans=s\u00EDmbolos abor\u00EDgenes canadienses unificados +Cari=cario +Cham=cham +Cher=cherokee +Cirt=cirth +Copt=copto +Cprt=chipriota +Cyrl=cir\u00EDlico +Cyrs=cir\u00EDlico del antiguo eslavo eclesi\u00E1stico +Deva=devanagari +Dsrt=deseret +Dupl=Taquigraf\u00EDa Duploy\u00E9 +Egyd=egipcio dem\u00F3tico +Egyh=egipcio hier\u00E1tico +Egyp=jerogl\u00EDficos egipcios +Elba=Elbasan +Ethi=eti\u00F3pico +Geok=georgiano eclesi\u00E1stico +Geor=georgiano +Glag=glagol\u00EDtico +Goth=g\u00F3tico +Gran=Grantha +Grek=griego +Gujr=gujarati +Guru=gurmuji +Hang=hangul +Hani=han +Hano=hanunoo +Hans=han simplificado +Hant=han tradicional +Hebr=hebreo +Hira=hiragana +Hmng=pahawh hmong +Hrkt=katakana o hiragana +Hung=h\u00FAngaro antiguo +Inds=Indio (harappan) +Ital=antigua bastardilla +Java=javan\u00E9s +Jpan=japon\u00E9s +Kali=kayah li +Kana=katakana +Khar=kharoshthi +Khmr=jemer +Knda=canar\u00E9s +Kore=coreano +Kpel=Kpelle +Kthi=Kaithi +Lana=lanna +Laoo=lao +Latf=latino fraktur +Latg=latino ga\u00E9lico +Latn=lat\u00EDn +Lepc=lepcha +Limb=limbu +Lina=lineal A +Linb=lineal B +Lisu=Lisu +Loma=Loma +Lyci=licio +Lydi=lidio +Mand=mandeo +Mani=Manique\u00EDsmo +Maya=jerogl\u00EDficos mayas +Mend=Mend\u00E9 +Merc=Mero\u00EDtico Cursivo +Mero=mero\u00EDtico +Mlym=malay\u00E1lam +Mong=mongol +Moon=Luna +Mtei=manipuri +Mymr=birmano +Narb=\u00C1rabe del Norte Antiguo +Nbat=Nabateo +Nkgb=Nakhi Geba +Nkoo=n'Ko +Ogam=ogham +Olck=ol chiki +Orkh=orkhon +Orya=oriya +Osma=osmaniya +Palm=Palmire\u00F1o +Perm=permiano antiguo +Phag=phags-pa +Phli=Pahlavi, Inscripciones +Phlp=Pahlavi, Salterio +Phlv=Pahlavi, Libros +Phnx=fenicio +Plrd=Pollard Miao +Prti=Parto, Inscripciones +Rjng=Rejang +Roro=Rongorongo +Runr=r\u00FAnico +Samr=Samaritano +Sara=Sarati +Sarb=\u00C1rabe del Sur Antiguo +Saur=Saurashtra +Sgnw=Escritura de Signos +Shaw=shaviano +Sind=Sindhi +Sinh=binhala +Sund=sudan\u00E9s +Sylo=Syloti Nagri +Syrc=siriaco +Syre=siriaco estrangelo +Syrj=siriaco occidental +Syrn=siriaco oriental +Tagb=tagban\u00FAa +Tale=tai le +Talu=Nuevo Tai Lue +Taml=tamil +Tavt=Tai Viet +Telu=telugu +Teng=tengwar +Tfng=Tifinagh +Tglg=tagalo +Thaa=thaana +Thai=tailand\u00E9s +Tibt=tibetano +Ugar=ugar\u00EDtico +Vaii=Vai +Visp=lenguaje visible +Wara=Warang Citi +Xpeo=persa antiguo +Xsux=Sumerio-Acadio Cuneiforme +Yiii=yi +Zinh=heredado +Zmth=Notaci\u00F3n Matem\u00E1tica +Zsym=s\u00EDmbolos +Zxxx=no escrito +Zyyy=com\u00FAn +Zzzz=escritura desconocida o no v\u00E1lida + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Sud\u00e1frica ZM=Zambia ZW=Zimbabue + +# territory names +# key is UN M.49 country and area code + +001=Mundo +002=\u00C1frica +003=Am\u00E9rica del Norte +005=Suram\u00E9rica +009=Ocean\u00EDa +011=\u00C1frica occidental +013=Centroam\u00E9rica +014=\u00C1frica oriental +015=\u00C1frica septentrional +017=\u00C1frica central +018=\u00C1frica meridional +019=Am\u00E9ricas +021=Norteam\u00E9rica +029=Caribe +030=Asia oriental +034=Asia meridional +035=Sudeste asi\u00E1tico +039=Europa meridional +053=Australia y Nueva Zelanda +054=Melanesia +057=Micronesia [057] +061=Polinesia +142=Asia +143=Asia central +145=Asia occidental +150=Europa +151=Europa oriental +154=Europa septentrional +155=Europa occidental +419=Latinoam\u00E9rica y el Caribe diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_fr.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=chinois zu=zoulou +# key is ISO 639.2 language code +aar=Afar +abk=Abkhaze +ace=Achinais +ach=Acoli +ada=Adangme +ady=Adygh\u00E9en +afa=Afro-asiatique +afh=Afrihili +afr=Afrikaans +ain=A\u00EFnou +aka=Akan +akk=Akkadien +alb=Albanais +ale=Al\u00E9oute +alg=Langue algonquienne +alt=Alta\u00EF du Sud +amh=Amharique +ang=Vieil anglais (environ 450-1100) +anp=Angika +apa=Langue apache +ara=Arabe +arc=Aram\u00E9en officiel (700-300 av. J.-C.) +arg=Aragonais +arm=Arm\u00E9nien +arn=Mapudungun +arp=Arapaho +art=Langue artificielle +arw=Arawak +asm=Assamais +ast=Asturien +ath=Langue athapascane +aus=Langue australienne +ava=Avar +ave=Avestique +awa=Awadhi +aym=Aymara +aze=Az\u00E9ri +bad=Banda +bai=Langue bamil\u00E9k\u00E9e +bak=Bachkir +bal=Baloutchi +bam=Bambara +ban=Balinais +baq=Basque +bas=Bassa +bat=Langue balte +bej=Bedja +bel=Bi\u00E9lorusse +bem=Bemba +ben=Bengali +ber=Berb\u00E8re +bho=Bhojpuri +bih=Bihari +bik=Bikol +bin=Bini +bis=Bichlamar +bla=Siksika +bnt=Bantou +bos=Bosniaque +bra=Braj +bre=Breton +btk=Batak +bua=Bouriate +bug=Bouguinais +bul=Bulgare +bur=Birman +byn=Blin +cad=Caddo +cai=Langue am\u00E9rindienne centrale +car=Galibi Caribe +cat=Catalan +cau=Langue caucasienne +ceb=Cebuano +cel=Langue celtique +cha=Chamorro +chb=Chibcha +che=Tch\u00E9tch\u00E8ne +chg=Tchaghata\u00EF +chi=Chinois +chk=Chuuk +chm=Mari +chn=Jargon chinook +cho=Choctaw +chp=Chipewyan +chr=Cherokee +chu=Slavon liturgique +chv=Tchouvache +chy=Cheyenne +cmc=Langue chame +cop=Copte +cor=Cornouaillais +cos=Corse +cpe=Cr\u00E9ole ou pidgin anglais +cpf=Cr\u00E9ole ou pidgin fran\u00E7ais +cpp=Cr\u00E9ole ou pidgin portugais +cre=Cri +crh=Turc de Crim\u00E9e +crp=Cr\u00E9ole ou pidgin +csb=Kachoube +cus=Langue couchitique +cze=Tch\u00E8que +dak=Dakota +dan=Danois +dar=Dargwa +day=Dayak +del=Delaware +den=Slave (Athapascan) +dgr=Dogrib +din=Dinka +div=Divehi +doi=Dogri +dra=Langue dravidienne +dsb=Bas-sorabe +dua=Douala +dum=Moyen n\u00E9erlandais +dut=N\u00E9erlandais +dyu=Dioula +dzo=Dzongkha +efi=Efik +egy=Egyptien ancien +eka=Ekajuk +elx=Elamite +eng=Anglais +enm=Moyen anglais +epo=Esp\u00E9ranto +est=Estonien +ewe=Ewe +ewo=Ewondo +fan=Fang +fao=F\u00E9ro\u00EFen +fat=Fanti +fij=Fidjien +fil=Filipino +fin=Finnois +fiu=Langue finno-ougrienne +fon=Fon +fre=Fran\u00E7ais +frm=Moyen fran\u00E7ais +fro=Ancien fran\u00E7ais +frr=Frison du Nord +frs=Frison oriental +fry=Frison occidental +ful=Peul +fur=Frioulan +gaa=Ga +gay=Gayo +gba=Gbaya +gem=Langue germanique +geo=G\u00E9orgien +ger=Allemand +gez=Gu\u00E8ze +gil=Gilbertais +gla=Gallois +gle=Irlandais +glg=Galicien +glv=Mannois +gmh=Moyen haut-allemand +goh=Ancien haut-allemand +gon=Gondi +gor=Gorontalo +got=Gothique +grb=Grebo +grc=Grec ancien +gre=Grec, moderne (1453 -) +grn=Guarani +gsw=Al\u00E9manique +guj=Goudjarati +gwi=Gwich'in +hai=Haida +hat=Ha\u00EFtien +hau=Haoussa +haw=Hawa\u00EFen +heb=H\u00E9breu +her=Herero +hil=Hiligaynon +him=Himachali +hin=Hindi +hit=Hittite +hmn=Hmong +hmo=Hiri Motu +hrv=Croate +hsb=Haut-sorabe +hun=Hongrois +hup=Hupa +iba=Iban +ibo=Igbo +ice=Islandais +ido=Ido +iii=Yi de Sichuan +ijo=Ijo +iku=Inuktitut +ile=Interlingue +ilo=Ilokano +ina=Interlingua (International Auxiliary Language Association) +inc=Langue indo-aryenne +ind=Indon\u00E9sien +ine=Langue indo-europ\u00E9enne +inh=Ingouche +ipk=Inupiaq +ira=Langue iranienne +iro=Langue iroquoienne +ita=Italien +jav=Javanais +jbo=Lojban +jpn=Japonais +jpr=Jud\u00E9o-persan +jrb=Jud\u00E9o-arabe +kaa=Karakalpak +kab=Kabyle +kac=Kachin +kal=Groenlandais +kam=Kamba +kan=Kannada +kar=Karen +kas=Kashmiri +kau=Kanuri +kaw=Kawi +kaz=Kazakh +kbd=Kabardin +kha=Khasi +khi=Langue kho\u00EFsan +khm=Khmer central +kho=Khotanais +kik=Kikuyu +kin=Kinyarwanda +kir=Kirghize +kmb=Kimbundu +kok=Konkani +kom=Komi +kon=Kikongo +kor=Cor\u00E9en +kos=Kosrae +kpe=Kpell\u00E9 +krc=Karatcha\u00EF balkar +krl=Car\u00E9lien +kro=Krou +kru=Kurukh +kua=Kwanyama +kum=Koumyk +kur=Kurde +kut=Kutenai +lad=Ladino +lah=Lahnda +lam=Lamba +lao=Laotien +lat=Latin +lav=Letton +lez=Lezghien +lim=Limburgan +lin=Lingala +lit=Lituanien +lol=Mongo +loz=Lozi +ltz=Luxembourgeois +lua=Luba-Lulua +lub=Luba-Katanga +lug=Ganda +lui=Luiseno +lun=Lunda +luo=Luo +lus=Lushai +mac=Mac\u00E9donien +mad=Madurais +mag=Magahi +mah=Marshallais +mai=Maithili +mak=Makassar +mal=Malayalam +man=Mandingue +mao=Maori +map=Malayo-polyn\u00E9sien +mar=Marathi +mas=Masai +may=Malais +mdf=Moksa +mdr=Mandar +men=Mend\u00E9 +mga=Irlandais, moyen (900 - 1200) +mic=Micmac +min=Minangkabau +mis=Non cod\u00E9 +mkh=Langue mon-khm\u00E8re +mlg=Malgache +mlt=Maltais +mnc=Mandchou +mni=Manipuri +mno=Langue manobo +moh=Mohawk +mon=Mongol +mos=Mor\u00E9 +mul=Multilingue +mun=Langue mounda +mus=Creek +mwl=Mirandais +mwr=Marwari +myn=Langue maya +myv=Erzya +nah=Nahuatl +nai=Langue am\u00E9rindienne du Nord +nap=Napolitain +nau=Nauruan +nav=Navajo +nbl=Ndebele, Sud +nde=Ndebele, nord +ndo=Ndonga +nds=Bas-allemand +nep=N\u00E9palais +new=Newari +nia=Nias +nic=Niger-kordofanian +niu=Niue +nno=Norv\u00E9gien nynorsk +nob=Bokmal, Norv\u00E9gien +nog=Noga\u00EF +non=Vieux norrois +nor=Norv\u00E9gien +nqo=N'Ko +nso=Pedi +nub=Langue nubienne +nwc=Newari classique +nya=Chichewa +nym=Nyamwezi +nyn=Nyankole +nyo=Nyoro +nzi=Nzema +oci=Occitan (apr\u00E8s 1500) +oji=Ojibwa +ori=Oriya +orm=Oromo +osa=Osage +oss=Oss\u00E8te +ota=Turc ottoman +oto=Langue otomangue +paa=Langue papoue +pag=Pangasinan +pal=Pahlavi +pam=Pampangan +pan=Panjabi +pap=Papiamento +pau=Palau +peo=Persan ancien +per=Persan +phi=Langue philippine +phn=Ph\u00E9nicien +pli=Pali +pol=Polonais +pon=Pohnpei +por=Portugais +pra=Langues pr\u00E2krit +pro=Proven\u00E7al ancien +pus=Pushto ; Pashto +que=Quechua +raj=Rajasthani +rap=Rapanui +rar=Rarotongien +roa=Langue romane +roh=Romanche +rom=Romani +rum=Roumain +run=Rundi +rup=Aroumain +rus=Russe +sad=Sandawe +sag=Sango +sah=Yakoute +sai=Langue am\u00E9rindienne du Sud +sal=Langue salishenne +sam=Aram\u00E9en samaritain +san=Sanscrit +sas=Sasak +sat=Santal +scn=Sicilien +sco=Ecossais +sel=Selkoupe +sem=Langue s\u00E9mitique +sga=Ancien irlandais +sgn=Langue des signes +shn=Shan +sid=Sidamo +sin=Sinhala +sio=Langue sioux +sit=Sino-tib\u00E9tain +sla=Langue slave +slo=Slovaque +slv=Slov\u00E8ne +sma=Sami du sud +sme=Sami du Nord +smi=Langue samie +smj=Sami de Lule +smn=Sami d'Inari +smo=Samoan +sms=Sami skolt +sna=Shona +snd=Sindhi +snk=Sonink\u00E9 +sog=Sogdien +som=Somali +son=Songhai +sot=Sotho, sud +spa=Espagnol +srd=Sarde +srn=Sranan Tongo +srp=Serbe +srr=S\u00E9r\u00E8re +ssa=Langue nilo-saharienne +ssw=Swati +suk=Sukuma +sun=Soundanais +sus=Soussou +sux=Sum\u00E9rien +swa=Souah\u00E9li +swe=Su\u00E9dois +syc=Syriaque classique +syr=Syriaque +tah=Tahitien +tai=Langue ta\u00EF +tam=Tamoul +tat=Tatar +tel=T\u00E9lougou +tem=Temne +ter=Tereno +tet=Tetum +tgk=Tadjik +tgl=Tagalog +tha=Tha\u00EF +tib=Tib\u00E9tain +tig=Tigre +tir=Tigrigna +tiv=Tiv +tkl=Tokelau +tlh=Klingon +tli=Tlingit +tmh=Tamacheq +tog=Tonga nyasa +ton=Tonga (Iles Tonga) +tpi=Tok Pisin +tsi=Tsimshian +tsn=Tswana +tso=Tsonga +tuk=Turkm\u00E8ne +tum=Tumbuka +tup=Langue tupi +tur=Turc +tut=Langue alta\u00EFque +tvl=Tuvalu +twi=Twi +tyv=Touva +udm=Oudmourte +uga=Ougaritique +uig=Ou\u00EFgour +ukr=Ukrainien +umb=Umbundu +und=Ind\u00E9termin\u00E9 +urd=Ourdou +uzb=Ouzbek +vai=Va\u00EF +ven=Venda +vie=Vietnamien +vol=Volapuk +vot=Vote +wak=Langues wakashennes +wal=Wolaitta +war=Waray +was=Washo +wel=Gallois +wen=Langue sorabe +wln=Wallon +wol=Wolof +xal=Kalmouk +xho=Xhosa +yao=Yao +yap=Yap +yid=Yiddish +yor=Yoruba +ypk=Langues yupik +zap=Zapot\u00E8que +zbl=Symboles Bliss +zen=Zenaga +zha=Zhuang +znd=Zande +zul=Zoulou +zun=Zuni +zxx=Sans contenu linguistique +zza=Zazaki + +# script names +# key is ISO 15924 script code + +Arab=Arabe +Armi=Aram\u00E9en imp\u00E9rial +Armn=Arm\u00E9nien +Avst=Avestique +Bali=Balinais +Bamu=Bamoun +Bass=Bassa Vah +Batk=Batak +Beng=Bengali +Blis=Symboles Bliss +Bopo=Bopomofo +Brah=Brahmi +Brai=Braille +Bugi=Bouguis +Buhd=Bouhide +Cakm=Chakma +Cans=Syllabaire autochtone canadien unifi\u00E9 +Cari=Carien +Cham=Cham +Cher=Cherokee +Cirt=Cirth +Copt=Copte +Cprt=Syllabaire chypriote +Cyrl=Cyrillique +Cyrs=Cyrillique (variante slavonne) +Deva=Devanagari +Dsrt=Deseret +Dupl=St\u00E9nographie Duploy\u00E9 +Egyd=D\u00E9motique \u00E9gyptien +Egyh=Hi\u00E9ratique \u00E9gyptien +Egyp=Hi\u00E9roglyphes \u00E9gyptiens +Elba=Elbasan +Ethi=Ethiopique +Geok=G\u00E9orgien khoutsouri +Geor=G\u00E9orgien +Glag=Glagolitique +Goth=Gothique +Gran=Grantha +Grek=Grec +Gujr=Goudjarati +Guru=Gourmoukh\u00EE +Hang=Hangul +Hani=Id\u00E9ogrammes han +Hano=Hanunoo +Hans=Id\u00E9ogrammes han simplifi\u00E9s +Hant=Id\u00E9ogrammes han traditionnels +Hebr=H\u00E9breu +Hira=Hiragana +Hmng=Pahawh Hmong +Hrkt=Katakana ou Hiragana +Hung=Ancien hongrois +Inds=Indus +Ital=Ancien italique +Java=Javanais +Jpan=Japonais +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Khmer +Knda=Kannada +Kore=Cor\u00E9en +Kpel=Kpelle +Kthi=Kaithi +Lana=Tai Tham +Laoo=Laotien +Latf=Latin (variante bris\u00E9e) +Latg=Latin (variante ga\u00E9lique) +Latn=Latin +Lepc=Lepcha +Limb=Limbou +Lina=Lin\u00E9aire A +Linb=Lin\u00E9aire B +Lisu=Lisu +Loma=Loma +Lyci=Lycien +Lydi=Lydien +Mand=Mand\u00E9en +Mani=Manich\u00E9en +Maya=Hi\u00E9roglyphes mayas +Mend=Mend\u00E9 +Merc=Cursive m\u00E9ro\u00EFtique +Mero=M\u00E9ro\u00EFtique +Mlym=Malayalam +Mong=Mongol +Moon=Moon +Mtei=Meitei Mayek +Mymr=Myanmar +Narb=Arabe ancien du Nord +Nbat=Nabat\u00E9en +Nkgb=Nakhi Geba +Nkoo=N'Ko +Ogam=Ogam +Olck=Ol tchiki +Orkh=Orkhon +Orya=Oriya +Osma=Osmanais +Palm=Palmyr\u00E9en +Perm=Ancien permien +Phag=Phags pa +Phli=Pehlevi des inscriptions +Phlp=Pehlevi des psautiers +Phlv=Pehlevi des livres +Phnx=Ph\u00E9nicien +Plrd=Miao +Prti=Parthe des inscriptions +Rjng=Rejang +Roro=Rongorongo +Runr=Runique +Samr=Samaritain +Sara=Sarati +Sarb=Arabe ancien du Sud +Saur=Saurashtra +Sgnw=Ecriture des signes +Shaw=Shavian +Sind=Sindhi +Sinh=Singhalais +Sund=Soundanais +Sylo=Syloti Nagri +Syrc=Syriaque +Syre=Syriaque estrangh\u00E9lo +Syrj=Syriaque occidental +Syrn=Syriaque oriental +Tagb=Tagbanoua +Tale=Ta\u00EF-le +Talu=Nouveau ta\u00EF-lue +Taml=Tamoul +Tavt=Ta\u00EF Viet +Telu=T\u00E9lougou +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Th\u00E2na +Thai=Tha\u00EF +Tibt=Tib\u00E9tain +Ugar=Ougaritique +Vaii=Va\u00EF +Visp=Langage visuel +Wara=Warang Citi +Xpeo=Cun\u00E9iforme pers\u00E9politain +Xsux=Cun\u00E9iforme sum\u00E9ro-akkadien +Yiii=Yi +Zinh=H\u00E9rit\u00E9 +Zmth=Notation math\u00E9matique +Zsym=Symboles +Zxxx=Non \u00E9crit +Zyyy=Script non d\u00E9termin\u00E9 +Zzzz=Ecriture inconnue ou non valide + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Afrique du Sud ZM=Zambie ZW=Zimbabwe + +# territory names +# key is UN M.49 country and area code + +001=Monde +002=Afrique +003=Am\u00E9rique du Nord +005=Am\u00E9rique du Sud +009=Oc\u00E9anie +011=Afrique occidentale +013=Am\u00E9rique centrale +014=Afrique orientale +015=Afrique septentrionale +017=Afrique centrale +018=Afrique australe +019=Am\u00E9riques +021=Am\u00E9rique septentrionale +029=Cara\u00EFbes +030=Asie orientale +034=Asie du Sud +035=Asie du Sud-Est +039=Europe m\u00E9ridionale +053=Australie et Nouvelle-Z\u00E9lande +054=M\u00E9lan\u00E9sie +057=R\u00E9gion micron\u00E9sienne +061=Polyn\u00E9sie +142=Asie +143=Asie centrale +145=Asie occidentale +150=Europe +151=Europe orientale +154=Europe septentrionale +155=Europe occidentale +419=Am\u00E9rique latine et Cara\u00EFbes diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_it.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=cinese zu=zulu +# key is ISO 639.2 language code +aar=Afar +abk=Abkhaso +ace=Accinese +ach=Acioli +ada=Adangme +ady=Adyghe +afa=Lingua afroasiatica +afh=Afrihili +afr=Afrikaans +ain=Ainu +aka=Akan +akk=Accado +alb=Albanese +ale=Aleuto +alg=Lingue algonchine +alt=Altai del sud +amh=Amarico +ang=Inglese antico (dal 450 al 1100 c.a.) +anp=Angika +apa=Lingue apache +ara=Arabo +arc=Aramaico ufficiale (dal 700 al 300 AC) +arg=Aragonese +arm=Armeno +arn=Mapudungun +arp=Arapaho +art=Lingua artificiale +arw=Aruaco +asm=Assamese +ast=Asturiano +ath=Lingue Athapascan +aus=Australiano +ava=Avaro +ave=Avestano +awa=Awadhi +aym=Aymara +aze=Azero +bad=Banda +bai=Lingue bamileke +bak=Baschiro +bal=Beluci +bam=Bambara +ban=Balinese +baq=Basco +bas=Basa +bat=Lingua baltica +bej=Begia +bel=Bielorusso +bem=Wemba +ben=Bengalese +ber=Berbero +bho=Bhojpuri +bih=Bihari +bik=Bicol +bin=Bini +bis=Bislama +bla=Siksika +bnt=Bantu +bos=Bosniaco +bra=Braj +bre=Bretone +btk=Batak +bua=Buriat +bug=Buginese +bul=Bulgaro +bur=Birmano +byn=Blin +cad=Caddo +cai=Lingua indiana dell'America centrale +car=Caribe (Galibi) +cat=Catalano +cau=Lingua caucasica +ceb=Cebuano +cel=Lingua celtica +cha=Chamorro +chb=Chibcha +che=Ceceno +chg=Chagataico +chi=Cinese +chk=Chuukese +chm=Mari +chn=Gergo chinook +cho=Choctaw +chp=Chipewyan +chr=Cherokee +chu=Slavo ecclesiastico +chv=Chuvash +chy=Cheyenne +cmc=Lingue chamic +cop=Copto +cor=Cornico +cos=Corso +cpe=Creolo e pidgin basato sull'inglese +cpf=Creolo e pidgin basato sul francese +cpp=Creolo e pidgin basato sul portoghese +cre=Cree +crh=Turco crimeo +crp=Creolo e pidgin +csb=Kashubian +cus=Lingua cuscitica +cze=Ceco +dak=Dakota +dan=Danese +dar=Dargwa +day=Land Dayak +del=Delaware +den=Slave (Athapascan) +dgr=Dogrib +din=Dinca +div=Divehi +doi=Dogri +dra=Lingua dravidica +dsb=Basso sorabo +dua=Duala +dum=Olandese medio (dal 1050 al 1350 c.a.) +dut=Olandese +dyu=Diula +dzo=Dzongkha +efi=Efik +egy=Egiziano antico +eka=Ekajuka +elx=Elamitico +eng=Inglese +enm=Inglese medio (dal 1100 al 1500) +epo=Esperanto +est=Estone +ewe=Ewe +ewo=Ewondo +fan=Fang +fao=Faroese +fat=Fanti +fij=Figiano +fil=Filippino +fin=Finlandese +fiu=Lingua ungrofinnica +fon=Fon +fre=Francese +frm=Francese medio (dal 1400 al 1600 c.a.) +fro=Francese antico (dal 842 al 1400 c.a.) +frr=Frisone settentrionale +frs=Frisone orientale +fry=Frisone occidentale +ful=Fulah +fur=Friulano +gaa=Ga +gay=Gayo +gba=Gbaya +gem=Lingua germanica +geo=Georgiano +ger=Tedesco +gez=Geez +gil=Gilbertese +gla=Gaelico +gle=Irlandese +glg=Galiziano +glv=Manx +gmh=Tedesco medio alto (dal 1050 al 1500 c.a.) +goh=Tedesco antico alto (dal 750 al 1050 c.a.) +gon=Gondi +gor=Gorontalo +got=Gotico +grb=Grebo +grc=Greco antico (fino al 1453) +gre=Greco moderno (dal 1453) +grn=Guaran\u00EC +gsw=Tedesco svizzero +guj=Gujarati +gwi=Gwich'in +hai=Haida +hat=Haitiano +hau=Hausa +haw=Hawaiano +heb=Ebraico +her=Herero +hil=Hiligaynon +him=Himachali +hin=Hindi +hit=Hittite +hmn=Hmong +hmo=Hiri Motu +hrv=Croato +hsb=Alto sorabo +hun=Ungherese +hup=Hupa +iba=Iban +ibo=Igbo +ice=Islandese +ido=Ido +iii=Sichuan Yi +ijo=Ijo +iku=Inuktitut +ile=Interlingue +ilo=Ilocano +ina=Interlingua (Associazione internazionale per la lingua ausiliaria) +inc=Lingua indiana +ind=Indonesiano +ine=Lingua indoeuropea +inh=Ingush +ipk=Inupiaq +ira=Iraniano +iro=Lingue irochesi +ita=Italiano +jav=Giavanese +jbo=Lojban +jpn=Giapponese +jpr=Giudeo persiano +jrb=Giudeo arabo +kaa=Kara-Kalpak +kab=Kabyle +kac=Kachin +kal=Kalaallisut +kam=Kamba +kan=Kannada +kar=Karen +kas=Kashmiri +kau=Kanuri +kaw=Kawi +kaz=Kazako +kbd=Kabardia +kha=Khasi +khi=Lingua khoisan +khm=Khmer centrale +kho=Khotanese +kik=Kikuyu +kin=Kinyarwanda +kir=Kirghiso +kmb=Kimbundu +kok=Konkani +kom=Komi +kon=Kongo +kor=Coreano +kos=Kosraean +kpe=Kpelle +krc=Karachay-Balkar +krl=Careliano +kro=Kru +kru=Kurukh +kua=Kuanyama +kum=Kumyk +kur=Curdo +kut=Kutenai +lad=Ladino +lah=Lahnda +lam=Lamba +lao=Lao +lat=Latino +lav=Lettone +lez=Lezghian +lim=Limburgese +lin=Lingala +lit=Lituano +lol=Mongo +loz=Lozi +ltz=Lussemburghese +lua=Luba-Lulua +lub=Luba-Katanga +lug=Ganda +lui=Luiseno +lun=Lunda +luo=Luo (Kenya e Tanzania) +lus=Lushai +mac=Macedone +mad=Madurese +mag=Magahi +mah=Marshallese +mai=Maithili +mak=Makasar +mal=Malayalam +man=Mandingo +mao=Maori +map=Austronesiano +mar=Marathi +mas=Masai +may=Malese +mdf=Moksha +mdr=Mandar +men=Mende +mga=Irlandese medio (dal 900 al 1200) +mic=Mi'kmaq +min=Minangkabau +mis=Lingue non codificate +mkh=Lingua mon-khmer +mlg=Malgascio +mlt=Maltese +mnc=Manchu +mni=Manipuri +mno=Manobo +moh=Mohawk +mon=Mongolo +mos=Mossi +mul=Multilingua +mun=Lingua munda +mus=Creek +mwl=Mirandese +mwr=Marwari +myn=Lingue maya +myv=Erzya +nah=Nahuatl +nai=Lingua indiana del Nord America +nap=Napoletano +nau=Nauruano +nav=Navajo +nbl=Ndebele del sud +nde=Ndebele del nord +ndo=Ndonga +nds=Basso tedesco +nep=Nepalese +new=Nepal Bhasa +nia=Nias +nic=Lingua niger-cordofan +niu=Niue +nno=Norvegese nynorsk +nob=Norvegese bokm\u00E5l +nog=Nogai +non=Norse antico +nor=Norvegese +nqo=N'Ko +nso=Pedi +nub=Nubiano +nwc=Newari classico +nya=Chichewa +nym=Nyamwezi +nyn=Nyankole +nyo=Nyoro +nzi=Nzima +oci=Occitano (dopo il 1500) +oji=Ojibwa +ori=Oriya +orm=Oromo +osa=Osage +oss=Ossetico +ota=Turco, ottomano (1500-1928) +oto=Lingue otomi +paa=Lingua papuana +pag=Pangasinan +pal=Pahlavi +pam=Pampanga +pan=Punjabi +pap=Papiamento +pau=Palau +peo=Persiano antico (dal 600 al 400 AC) +per=Persiano +phi=Lingua filippina +phn=Fenicio +pli=Pali +pol=Polacco +pon=Pohnpeiano +por=Portoghese +pra=Pracrito +pro=Provenzale antico (fino al 1500) +pus=Pushto; Pashto +que=Quechua +raj=Rajasthani +rap=Rapanui +rar=Rarotonga +roa=Lingua romanza +roh=Romancio +rom=Romani +rum=Romeno +run=Kirundi +rup=Aromaniano +rus=Russo +sad=Sandawe +sag=Sango +sah=Yakut +sai=Lingua indiana del Sud America +sal=Lingue salish +sam=Aramaico samaritano +san=Sanscrito +sas=Sasak +sat=Santali +scn=Siciliano +sco=Scozzese +sel=Selkup +sem=Lingua semitica +sga=Irlandese antico (fino al 900) +sgn=Lingua dei segni +shn=Shan +sid=Sidamo +sin=Singalese +sio=Lingue sioux +sit=Lingua sino-tibetana +sla=Lingua slava +slo=Slovacco +slv=Sloveno +sma=Sami del sud +sme=Sami del nord +smi=Sami +smj=Sami lule +smn=Sami inari +smo=Samoano +sms=Sami skolt +sna=Shona +snd=Sindhi +snk=Soninke +sog=Sogdiano +som=Somalo +son=Songhai +sot=Sotho del sud +spa=Spagnolo +srd=Sardo +srn=Sranan Tongo +srp=Serbo +srr=Serer +ssa=Lingua nilo-sahariana +ssw=Swati +suk=Sukuma +sun=Sundanese +sus=Susu +sux=Sumero +swa=Swahili +swe=Svedese +syc=Siriaco classico +syr=Siriaco +tah=Taitiano +tai=Tai +tam=Tamil +tat=Tataro +tel=Telugu +tem=Temne +ter=Tereno +tet=Tetum +tgk=Tagiko +tgl=Tagalog +tha=Tailandese +tib=Tibetano +tig=Tigre +tir=Tigrinya +tiv=Tiv +tkl=Tokelau +tlh=Klingon +tli=Tlingit +tmh=Tamashek +tog=Tonga (Nyasa) +ton=Tonga (Isole Tonga) +tpi=Tok pisin +tsi=Tsimshian +tsn=Tswana +tso=Tsonga +tuk=Turkmeno +tum=Tumbuka +tup=Lingue tupi +tur=Turco +tut=Lingua altaica +tvl=Tuvalu +twi=Twi +tyv=Tuvinian +udm=Udmurt +uga=Ugaritico +uig=Uiguro +ukr=Ucraino +umb=Umbundu +und=Lingua imprecisata +urd=Urdu +uzb=Uzbeko +vai=Vai +ven=Venda +vie=Vietnamita +vol=Volapuk +vot=Voto +wak=Lingue wakash +wal=Walamo +war=Waray +was=Washo +wel=Gallese +wen=Sorabo +wln=Vallone +wol=Wolof +xal=Kalmyk +xho=Xhosa +yao=Yao +yap=Yapese +yid=Yiddish +yor=Yoruba +ypk=Lingue Yupik +zap=Zapotec +zbl=Simboli bliss +zen=Zenaga +zha=Zhuang +znd=Zande +zul=Zulu +zun=Zuni +zxx=Nessun contenuto linguistico +zza=Zazaki + +# script names +# key is ISO 15924 script code + +Arab=Arabo +Armi=Aramaico imperiale +Armn=Armeno +Avst=Avestano +Bali=Balinese +Bamu=Bamum +Bass=Bassa Vah +Batk=Batak +Beng=Bengalese +Blis=Simboli bliss +Bopo=Bopomofo +Brah=Brahmi +Brai=Braille +Bugi=Buginese +Buhd=Buhid +Cakm=Chakma +Cans=Simboli aborigeni canadesi unificati +Cari=Cario +Cham=Cham +Cher=Cherokee +Cirt=Cirth +Copt=Copto +Cprt=Cipriota +Cyrl=Cirillico +Cyrs=Cirillico (antico slavo ecclesiastico) +Deva=Devanagari +Dsrt=Deseret +Dupl=Stenografia duployan +Egyd=Egiziano demotico +Egyh=Ieratico egiziano +Egyp=Geroglifici egiziani +Elba=Elbasan +Ethi=Etiope +Geok=Khutsuri +Geor=Georgiano +Glag=Glagolitico +Goth=Gotico +Gran=Grantha +Grek=Greco +Gujr=Gujarati +Guru=Gurmukhi +Hang=Hangul +Hani=Han +Hano=Hanunoo +Hans=Han semplificato +Hant=Han tradizionale +Hebr=Ebraico +Hira=Hiragana +Hmng=Pahawh Hmong +Hrkt=Katakana o Hiragana +Hung=Ungherese antico +Inds=Ind\u00F9 +Ital=Italico antico +Java=Giavanese +Jpan=Giapponese +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Khmer +Knda=Kannada +Kore=Coreano +Kpel=Kpelle +Kthi=Kaithi +Lana=Tai Tham +Laoo=Lao +Latf=Variante fraktur del latino +Latg=Latino gaelico +Latn=Latino +Lepc=Lepcha +Limb=Limbu +Lina=Lineare A +Linb=Lineare B +Lisu=Lisu +Loma=Loma +Lyci=Licio +Lydi=Lidio +Mand=Mandaico +Mani=Manicheo +Maya=Geroglifici maya +Mend=Mende +Merc=Corsivo meroitico +Mero=Meoitico +Mlym=Malayalam +Mong=Mongolo +Moon=Moon +Mtei=Meitei Mayek +Mymr=Myanmar +Narb=Arabo antico del nord +Nbat=Lingua nabatea +Nkgb=Nakhi Geba +Nkoo=N'Ko +Ogam=Ogamico +Olck=Ol Chiki +Orkh=Orkhon +Orya=Oriya +Osma=Osmanya +Palm=Palmyrene +Perm=Permiano antico +Phag=Phags-pa +Phli=Pahlavi (Inscriptional) +Phlp=Pahlavi (Psalter) +Phlv=Pahlavi (Book) +Phnx=Fenicio +Plrd=Miao +Prti=Partico (iscrizioni) +Rjng=Rejang +Roro=Rongorongo +Runr=Runico +Samr=Samaritano +Sara=Sarati +Sarb=Arabo antico del sud +Saur=Saurashtra +Sgnw=SignWriting +Shaw=Shaviano +Sind=Sindhi +Sinh=Singalese +Sund=Sundanese +Sylo=Syloti Nagri +Syrc=Siriaco +Syre=Siriaco estrangelo +Syrj=Siriaco occidentale +Syrn=Siriaco orientale +Tagb=Tagbanwa +Tale=Tai Le +Talu=Tai Lue semplificato +Taml=Tamil +Tavt=Tai Viet +Telu=Telugu +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Thaana +Thai=Tailandese +Tibt=Tibetano +Ugar=Ugaritico +Vaii=Vai +Visp=Discorso visibile +Wara=Warang Citi +Xpeo=Persiano antico +Xsux=Cuneiforme sumero-accadico +Yiii=Yi +Zinh=Script ereditato +Zmth=Notazione matematica +Zsym=Simboli +Zxxx=Non scritto +Zyyy=Script indeterminato +Zzzz=Script non codificato + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Sudafrica ZM=Zambia ZW=Zimbabwe + +# territory names +# key is UN M.49 country and area code + +001=Mondo +002=Africa +003=America del Nord +005=America del Sud +009=Oceania +011=Africa occidentale +013=America centrale +014=Africa orientale +015=Africa settentrionale +017=Africa centrale +018=Africa meridionale +019=Americhe +021=America settentrionale +029=Caraibi +030=Asia orientale +034=Asia meridionale +035=Asia sudorientale +039=Europa meridionale +053=Australia e Nuova Zelanda +054=Melanesia +057=Regione Micronesiana +061=Polinesia +142=Asia +143=Asia centrale +145=Asia occidentale +150=Europa +151=Europa orientale +154=Europa settentrionale +155=Europa occidentale +419=America Latina e Caraibi diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=\u4e2d\u56fd\u8a9e zu=\u30ba\u30fc\u30eb\u30fc\u8a9e +# key is ISO 639.2 language code +aar=\u30A2\u30D5\u30A1\u30EB\u8A9E +abk=\u30A2\u30D6\u30CF\u30FC\u30BA\u8A9E +ace=\u30A2\u30C1\u30A7\u30FC\u8A9E +ach=\u30A2\u30C1\u30E7\u30EA\u8A9E +ada=\u30A2\u30C0\u30F3\u30B0\u30E1\u8A9E +ady=\u30A2\u30C7\u30A3\u30B2\u8A9E +afa=\u30A2\u30D5\u30AC\u30CB\u30FC (1927-2002) +afh=\u30A2\u30D5\u30EA\u30D2\u30EA\u8A9E +afr=\u30A2\u30D5\u30EA\u30AB\u30FC\u30F3\u30B9\u8A9E +ain=\u30A2\u30A4\u30CC\u8A9E +aka=\u30A2\u30AB\u30F3\u8A9E +akk=\u30A2\u30C3\u30AB\u30C9\u8A9E +alb=\u30A2\u30EB\u30D0\u30CB\u30A2\u8A9E +ale=\u30A2\u30EC\u30A6\u30C8\u8A9E +alg=\u30A2\u30EB\u30B4\u30F3\u30AD\u30A2\u30F3\u8A9E\u65CF +alt=\u5357\u30A2\u30EB\u30BF\u30A4\u8A9E +amh=\u30A2\u30E0\u30CF\u30E9\u8A9E +ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB \u30AE\u30EB\u30C0\u30FC +anp=\u30A2\u30F3\u30AE\u30AB\u8A9E +apa=\u30A2\u30D1\u30C3\u30C1\u8A9E\u65CF +ara=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3 \u30A2\u30A5\u30B9\u30C8\u30E9\u30FC\u30EB +arc=\u30A2\u30E9\u30E0\u8A9E +arg=\u30A2\u30E9\u30B4\u30F3\u8A9E +arm=\u30A2\u30EB\u30E1\u30CB\u30A2\u8A9E +arn=\u30A2\u30E9\u30A6\u30AB\u30F3\u8A9E +arp=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3 \u30DA\u30BD (1983-1985) +art=\u4EBA\u5DE5\u8AF8\u8A9E +arw=\u30A2\u30E9\u30EF\u30AF\u8A9E +asm=\u30A2\u30C3\u30B5\u30E0\u8A9E +ast=\u30A2\u30B9\u30C8\u30A5\u30EA\u30A2\u30B9\u8A9E +ath=\u30A2\u30B5\u30D1\u30B9\u30AB\u30F3\u8A9E\u65CF +aus=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u8A9E\u65CF +ava=\u30A2\u30F4\u30A1\u30EB\u8A9E +ave=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E +awa=\u30A2\u30EF\u30C7\u30A3\u30FC\u8A9E +aym=\u30A2\u30A4\u30DE\u30E9\u8A9E +aze=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u8A9E +bad=\u30DC\u30B9\u30CB\u30A2 \u30C7\u30A3\u30CA\u30FC\u30EB +bai=\u30D0\u30DF\u30EC\u30B1\u8A9E\u65CF +bak=\u30D0\u30B7\u30AD\u30FC\u30EB\u8A9E +bal=\u30D0\u30EB\u30FC\u30C1\u30FC\u8A9E +bam=\u30DC\u30B9\u30CB\u30A2 \u30DE\u30EB\u30AF (BAM) +ban=\u30D0\u30EA\u8A9E +baq=\u30D0\u30B9\u30AF\u8A9E +bas=\u30D0\u30B5\u8A9E +bat=\u30D0\u30EB\u30C8\u8AF8\u8A9E +bej=\u30D9\u30B8\u30E3\u8A9E +bel=\u30D9\u30EB\u30AE\u30FC \u30D5\u30E9\u30F3 (BEL) +bem=\u30D9\u30F3\u30D0\u8A9E +ben=\u30D9\u30F3\u30AC\u30EB\u8A9E +ber=\u30D9\u30EB\u30D9\u30EB\u8AF8\u8A9E +bho=\u30DC\u30FC\u30B8\u30D7\u30EA\u30FC\u8A9E +bih=\u30D3\u30CF\u30FC\u30EB\u8A9E +bik=\u30D3\u30B3\u30EB\u8A9E +bin=\u30D3\u30CB\u8A9E +bis=\u30D3\u30B9\u30E9\u30DE\u8A9E +bla=\u30B7\u30AF\u30B7\u30AB\u8A9E +bnt=\u30D0\u30F3\u30C8\u30A5\u8AF8\u8A9E +bos=\u30DC\u30B9\u30CB\u30A2\u8A9E +bra=\u30D6\u30E9\u30B8\u8A9E +bre=\u30D6\u30E9\u30B8\u30EB \u30AF\u30EB\u30BC\u30A4\u30ED (1990-1993) +btk=\u30D0\u30BF\u30AF\u8A9E +bua=\u30D6\u30EA\u30E4\u30FC\u30C8\u8A9E +bug=\u30D6\u30AE\u8A9E +bul=\u30D6\u30EB\u30AC\u30EA\u30A2\u8A9E +bur=\u30D3\u30EB\u30DE\u8A9E +byn=\u30D3\u30EA\u30F3\u8A9E +cad=\u30AB\u30CA\u30C0 \u30C9\u30EB +cai=\u4E2D\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E +car=\u30AB\u30EA\u30D6\u8A9E +cat=\u30AB\u30BF\u30ED\u30CB\u30A2\u8A9E +cau=\u30B3\u30FC\u30AB\u30B5\u30B9\u8AF8\u8A9E +ceb=\u30BB\u30D6\u30A2\u30CE\u8A9E +cel=\u30B1\u30EB\u30C8\u8AF8\u8A9E +cha=\u30C1\u30E3\u30E2\u30ED\u8A9E +chb=\u30C1\u30D6\u30C1\u30E3\u8A9E +che=\u30C1\u30A7\u30C1\u30A7\u30F3\u8A9E +chg=\u30C1\u30E3\u30AC\u30BF\u30A4\u8A9E +chi=\u4E2D\u56FD\u8A9E +chk=\u30C1\u30E5\u30FC\u30AF\u8A9E +chm=\u30DE\u30EA\u8A9E +chn=\u30D3\u30FC\u30C1\u30FB\u30E9\u30FB\u30DE\u30FC \u7B49 +cho=\u30C1\u30E7\u30AF\u30C8\u30FC\u8A9E +chp=\u30C1\u30DA\u30EF\u30A4\u30A2\u30F3\u8A9E +chr=\u30C1\u30A7\u30ED\u30AD\u30FC\u8A9E +chu=\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E +chv=\u30C1\u30E5\u30F4\u30A1\u30B7\u30E5\u8A9E +chy=\u30B7\u30E3\u30A4\u30A2\u30F3\u8A9E +cmc=\u30C1\u30E3\u30E0\u8A9E\u65CF +cop=\u30B3\u30ED\u30F3\u30D3\u30A2 \u30DA\u30BD +cor=\u30B3\u30FC\u30F3\u30A6\u30A9\u30FC\u30EB\u8A9E +cos=\u30B3\u30EB\u30B7\u30AB\u8A9E +cpe=\u82F1\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +cpf=\u30D5\u30E9\u30F3\u30B9\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +cpp=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E\u304C\u57FA\u76E4\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +cre=\u30AF\u30EA\u30FC\u8A9E +crh=\u30AF\u30EA\u30DF\u30A2\u30FB\u30BF\u30BF\u30FC\u30EB\u8A9E +crp=\u305D\u306E\u4ED6\u306E\u6DF7\u6210\u8A9E\u30FB\u6DF7\u5408\u8A9E +csb=\u30AB\u30B7\u30E5\u30FC\u30D6\u8A9E +cus=\u30AF\u30B7\u30E5\u8AF8\u8A9E +cze=\u30C1\u30A7\u30B3\u8A9E +dak=\u30C0\u30B3\u30BF\u8A9E +dan=\u30C7\u30F3\u30DE\u30FC\u30AF\u8A9E +dar=\u30C0\u30EB\u30AC\u30F3\u8A9E +day=\u30C0\u30E4\u30AF\u8A9E +del=\u30C7\u30E9\u30A6\u30A7\u30A2\u8A9E +den=\u30B9\u30EC\u30A4\u30D3\u30FC\u8A9E +dgr=\u30C9\u30B0\u30EA\u30D6\u8A9E +din=\u30C7\u30A3\u30F3\u30AB\u8A9E +div=\u30C7\u30A3\u30D9\u30D2\u8A9E +doi=\u30C9\u30B0\u30EA\u8A9E +dra=\u30C9\u30E9\u30F4\u30A3\u30C0\u8AF8\u8A9E +dsb=\u4F4E\u30BD\u30EB\u30D3\u30A2\u8A9E +dua=\u30C9\u30A5\u30A2\u30E9\u8A9E +dum=\u4E2D\u4E16\u30AA\u30E9\u30F3\u30C0\u8A9E +dut=\u30AA\u30E9\u30F3\u30C0\u8A9E +dyu=\u30C7\u30A5\u30A6\u30E9\u8A9E +dzo=\u30BE\u30F3\u30AB\u8A9E +efi=\u30A8\u30D5\u30A3\u30C3\u30AF\u8A9E +egy=\u53E4\u4EE3\u30A8\u30B8\u30D7\u30C8\u8A9E +eka=\u30A8\u30AB\u30B8\u30E5\u30AF\u8A9E +elx=\u30A8\u30E9\u30E0\u8A9E +eng=\u82F1\u8A9E +enm=\u4E2D\u4E16\u82F1\u8A9E +epo=\u30A8\u30B9\u30DA\u30E9\u30F3\u30C8\u8A9E +est=\u30A8\u30B9\u30C8\u30CB\u30A2\u8A9E +ewe=\u30A8\u30A6\u30A7\u8A9E +ewo=\u30A8\u30A6\u30A9\u30F3\u30C9\u8A9E +fan=\u30D5\u30A1\u30F3\u30B0\u8A9E +fao=\u30D5\u30A7\u30ED\u30FC\u8A9E +fat=\u30D5\u30A1\u30F3\u30C6\u30A3\u30FC\u8A9E +fij=\u30D5\u30A3\u30B8\u30FC\u8A9E +fil=\u30D5\u30A3\u30EA\u30D4\u30CE\u8A9E +fin=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u8A9E +fiu=\u30D5\u30A3\u30F3\u30FB\u30A6\u30B4\u30EB\u8AF8\u8A9E +fon=\u30D5\u30A9\u30F3\u8A9E +fre=\u30D5\u30E9\u30F3\u30B9\u8A9E +frm=\u4E2D\u671F\u30D5\u30E9\u30F3\u30B9\u8A9E +fro=\u53E4\u30D5\u30E9\u30F3\u30B9\u8A9E +frr=\u5317\u30D5\u30EA\u30B8\u30A2\u8A9E +frs=\u6771\u30D5\u30EA\u30B8\u30A2\u8A9E +fry=\u897F\u30D5\u30EA\u30B8\u30A2\u8A9E +ful=\u30D5\u30E9\u8A9E +fur=\u30D5\u30EA\u30A6\u30EA\u8A9E +gaa=\u30AC\u8A9E +gay=\u30AC\u30E8\u8A9E +gba=\u30D0\u30E4\u8A9E +gem=\u30B2\u30EB\u30DE\u30F3\u8AF8\u8A9E +geo=\u30B0\u30EB\u30B8\u30A2\u8A9E +ger=\u30C9\u30A4\u30C4\u8A9E +gez=\u30B2\u30A8\u30BA\u8A9E +gil=\u30AD\u30EA\u30D0\u30B9\u8A9E +gla=\u30B2\u30FC\u30EB\u8A9E +gle=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E +glg=\u30AC\u30EA\u30B7\u30A2\u8A9E +glv=\u30DE\u30F3\u5CF6\u8A9E +gmh=\u4E2D\u9AD8\u30C9\u30A4\u30C4\u8A9E +goh=\u53E4\u9AD8\u30C9\u30A4\u30C4\u8A9E +gon=\u30B4\u30FC\u30F3\u30C7\u30A3\u30FC\u8A9E +gor=\u30B4\u30ED\u30F3\u30BF\u30ED\u8A9E +got=\u30B4\u30FC\u30C8\u8A9E +grb=\u30B0\u30EC\u30DC\u8A9E +grc=\u53E4\u4EE3\u30AE\u30EA\u30B7\u30E3\u8A9E +gre=\u73FE\u4EE3\u30AE\u30EA\u30B7\u30E3\u8A9E(1453-) +grn=\u30B0\u30A2\u30E9\u30CB\u30FC\u8A9E +gsw=\u30B9\u30A4\u30B9\u30C9\u30A4\u30C4\u8A9E\uFF08\u30B9\u30A4\u30B9\uFF09 +guj=\u30B0\u30B8\u30E3\u30E9\u30C8\u8A9E +gwi=\u30B0\u30A6\u30A3\u30C3\u30C1\u30F3\u8A9E +hai=\u30CF\u30A4\u30C0\u8A9E +hat=\u30CF\u30A4\u30C1\u8A9E +hau=\u30CF\u30A6\u30B5\u8A9E +haw=\u30CF\u30EF\u30A4\u8A9E +heb=\u30D8\u30D6\u30E9\u30A4\u8A9E +her=\u30D8\u30EC\u30ED\u8A9E +hil=\u30D2\u30EA\u30AC\u30A4\u30CE\u30F3\u8A9E +him=\u30D2\u30DE\u30C1\u30E3\u30EB\u8A9E +hin=\u30D2\u30F3\u30C7\u30A3\u30FC\u8A9E +hit=\u30D2\u30C3\u30BF\u30A4\u30C8\u8A9E +hmn=\u30D5\u30E2\u30F3\u8A9E +hmo=\u30D2\u30EA\u30E2\u30C8\u30A5\u8A9E +hrv=\u30AF\u30ED\u30A2\u30C1\u30A2\u8A9E +hsb=\u4E0A\u30BD\u30EB\u30D3\u30A2\u8A9E +hun=\u30CF\u30F3\u30AC\u30EA\u30FC\u8A9E +hup=\u30A2\u30BF\u30D1\u30B9\u30AB\u8A9E +iba=\u30A4\u30D0\u30F3\u8A9E +ibo=\u30A4\u30DC\u8A9E +ice=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u8A9E +ido=\u30A4\u30C9\u8A9E +iii=\u56DB\u5DDD\u30A4(\u5F5D)\u8A9E +ijo=\u30A4\u30B8\u30E7\u30FC\u8A9E +iku=\u30A4\u30CC\u30AF\u30A6\u30C6\u30A3\u30C8\u30C3\u30C8\u8A9E +ile=\u30A4\u30F3\u30BF\u30FC\u30EA\u30F3\u30B0 +ilo=\u30A4\u30ED\u30AB\u30CE\u8A9E +ina=\u30A4\u30F3\u30BF\u30FC\u30EA\u30F3\u30B0\u30A2\u8A9E(\u56FD\u969B\u88DC\u52A9\u8A9E\u5354\u4F1A) +inc=\u30A4\u30F3\u30C9\u8AF8\u8A9E +ind=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u8A9E +ine=\u5370\u6B27\u8AF8\u8A9E +inh=\u30A4\u30F3\u30B0\u30B7\u8A9E +ipk=\u30A4\u30CC\u30D4\u30A2\u30C3\u30AF\u8A9E +ira=\u30A4\u30E9\u30F3\u8A9E +iro=\u30A4\u30ED\u30B3\u30A4\u8A9E\u65CF +ita=\u30A4\u30BF\u30EA\u30A2\u8A9E +jav=\u30B8\u30E3\u30EF\u8A9E +jbo=\u30ED\u30B8\u30D0\u30F3\u8A9E +jpn=\u65E5\u672C\u8A9E +jpr=\u30E6\u30C0\u30E4\u30FB\u30DA\u30EB\u30B7\u30A2\u8A9E +jrb=\u30E6\u30C0\u30E4\u30FB\u30A2\u30E9\u30D3\u30A2\u8A9E +kaa=\u30AB\u30E9\u30FB\u30AB\u30EB\u30D1\u30AF\u8A9E +kab=\u30AB\u30D3\u30EB\u8A9E +kac=\u30AB\u30C1\u30F3\u8A9E +kal=\u30AB\u30E9\u30A2\u30EA\u30B9\u8A9E +kam=\u30AB\u30F3\u30D0\u8A9E +kan=\u30AB\u30F3\u30CA\u30C0\u8A9E +kar=\u30AB\u30EC\u30F3\u8A9E +kas=\u30AB\u30B7\u30DF\u30FC\u30EB\u8A9E +kau=\u30AB\u30CC\u30EA\u8A9E +kaw=\u30AB\u30A6\u30A3\u8A9E +kaz=\u30AB\u30B6\u30D5\u8A9E +kbd=\u30AB\u30D0\u30EB\u30C9\u8A9E +kha=\u30AB\u30B7\u8A9E +khi=\u30B3\u30A4\u30B5\u30F3\u8AF8\u8A9E +khm=\u4E2D\u592E\u30AF\u30E1\u30FC\u30EB\u8A9E +kho=\u30B3\u30FC\u30BF\u30F3\u8A9E +kik=\u30AD\u30AF\u30E6\u8A9E +kin=\u30AD\u30CB\u30E4\u30EB\u30EF\u30F3\u30C0\u8A9E +kir=\u30AD\u30EB\u30AE\u30B9\u8A9E +kmb=\u30AD\u30F3\u30D6\u30F3\u30C9\u30A5\u8A9E +kok=\u30B3\u30F3\u30AB\u30CB\u8A9E +kom=\u30B3\u30DF\u8A9E +kon=\u30B3\u30F3\u30B4\u8A9E +kor=\u97D3\u56FD\u8A9E +kos=\u30B3\u30B7\u30E3\u30A8\u8A9E +kpe=\u30AF\u30DA\u30EC\u8A9E +krc=\u30AB\u30E9\u30C1\u30E3\u30A4\u8A9E +krl=\u30AB\u30EC\u30EA\u30A2\u8A9E +kro=\u30AF\u30EB\u30FC\u8A9E +kru=\u30AF\u30EB\u30AF\u8A9E +kua=\u30AF\u30A2\u30CB\u30E3\u30DE\u8A9E +kum=\u30AF\u30E0\u30AF\u8A9E +kur=\u30AF\u30EB\u30C9\u8A9E +kut=\u30AF\u30C6\u30CA\u30A4\u8A9E +lad=\u30E9\u30B8\u30CE\u8A9E +lah=\u30E9\u30D5\u30F3\u30C0\u30FC\u8A9E +lam=\u30E9\u30F3\u30D0\u8A9E +lao=\u30E9\u30AA\u8A9E +lat=\u30E9\u30C6\u30F3\u8A9E +lav=\u30E9\u30C8\u30D3\u30A2\u8A9E +lez=\u30EC\u30BA\u30AE\u8A9E +lim=\u30EA\u30F3\u30D6\u30EB\u30D5\u8A9E +lin=\u30EA\u30F3\u30AC\u30E9\u8A9E +lit=\u30EA\u30C8\u30A2\u30CB\u30A2\u8A9E +lol=\u30E2\u30F3\u30B4\u8A9E +loz=\u30ED\u30BA\u30A3\u8A9E +ltz=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30B0\u8A9E +lua=\u30EB\u30D0\u30FB\u30EB\u30EB\u30A2\u8A9E +lub=\u30EB\u30D0\u30FB\u30AB\u30BF\u30F3\u30AC\u8A9E +lug=\u30AC\u30F3\u30C0\u8A9E +lui=\u30EB\u30A4\u30BB\u30FC\u30CB\u30E7\u8A9E +lun=\u30EB\u30F3\u30C0\u8A9E +luo=\u30EB\u30AA\u8A9E +lus=\u30EB\u30B7\u30E3\u30A4\u8A9E +mac=\u30DE\u30B1\u30C9\u30CB\u30A2\u8A9E +mad=\u30E2\u30ED\u30C3\u30B3 \u30C7\u30A3\u30EB\u30CF\u30E0 +mag=\u30DE\u30AC\u30D2\u30FC\u8A9E +mah=\u30DE\u30FC\u30B7\u30E3\u30EB\u8A9E +mai=\u30DE\u30A4\u30C6\u30A3\u30EA\u30FC\u8A9E +mak=\u30DE\u30AB\u30C3\u30B5\u30EB\u8A9E +mal=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u8A9E +man=\u30DE\u30F3\u30C7\u30A3\u30F3\u30B4\u8A9E +mao=\u30DE\u30AA\u30EA\u8A9E +map=\u30AA\u30FC\u30B9\u30C8\u30ED\u30CD\u30B7\u30A2\u8AF8\u8A9E +mar=\u30DE\u30E9\u30C6\u30A3\u30FC\u8A9E +mas=\u30DE\u30B5\u30A4\u8A9E +may=\u30DE\u30EC\u30FC\u8A9E +mdf=\u30E2\u30AF\u30B7\u30E3\u8A9E +mdr=\u30DE\u30F3\u30C0\u30EB\u8A9E +men=\u30E1\u30F3\u30C7\u8A9E +mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB \u30A2\u30EA\u30A2\u30EA +mic=\u30DF\u30AF\u30DE\u30AF\u8A9E +min=\u30DF\u30CA\u30F3\u30AB\u30D0\u30A6\u8A9E +mis=\u305D\u306E\u4ED6\u306E\u8A00\u8A9E +mkh=\u30E2\u30F3\u30FB\u30AF\u30E1\u30FC\u30EB\u8AF8\u8A9E +mlg=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u8A9E +mlt=\u30DE\u30EB\u30BF\u8A9E +mnc=\u6E80\u5DDE\u8A9E +mni=\u30DE\u30CB\u30D7\u30EB\u8A9E +mno=\u30DE\u30CE\u30DC\u8A9E\u65CF +moh=\u30E2\u30FC\u30DB\u30FC\u30AF\u8A9E +mon=\u30E2\u30F3\u30B4\u30EB\u8A9E +mos=\u30E2\u30B7\u8A9E +mul=\u8907\u6570\u8A00\u8A9E +mun=\u30E0\u30F3\u30C0\u8A9E\u65CF +mus=\u30AF\u30EA\u30FC\u30AF\u8A9E +mwl=\u30DF\u30E9\u30F3\u30C0\u8A9E +mwr=\u30DE\u30FC\u30EB\u30EF\u30FC\u30EA\u30FC\u8A9E +myn=\u30DE\u30E4\u8A9E\u65CF +myv=\u30A8\u30EB\u30B8\u30E3\u8A9E +nah=\u30CA\u30EF\u30C8\u30EB\u8A9E +nai=\u5317\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E +nap=\u30CA\u30DD\u30EA\u8A9E +nau=\u30CA\u30A6\u30EB\u8A9E +nav=\u30CA\u30D0\u30DB\u8A9E +nbl=\u5357\u30F3\u30C7\u30D9\u30EC\u8A9E +nde=\u5317\u30F3\u30C7\u30D9\u30EC\u8A9E +ndo=\u30F3\u30C9\u30F3\u30AC\u8A9E +nds=\u4F4E\u5730\u30C9\u30A4\u30C4\u8A9E\u3001\u4F4E\u5730\u30B5\u30AF\u30BD\u30F3\u8A9E +nep=\u30CD\u30D1\u30FC\u30EB\u8A9E +new=\u30CD\u30EF\u30FC\u30EB\u8A9E +nia=\u30CB\u30A2\u30B9\u8A9E +nic=\u30CB\u30AB\u30E9\u30B0\u30A2 \u30B3\u30EB\u30C9\u30D0 +niu=\u30CB\u30A6\u30FC\u30A8\u30A4\u8A9E +nno=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30CB\u30FC\u30CE\u30B7\u30AF) +nob=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E(\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB) +nog=\u30CE\u30AC\u30A4\u8A9E +non=\u53E4\u30CE\u30EB\u30C9\u8A9E +nor=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E +nqo=\u30F3\u30B3\u8A9E +nso=\u5317\u90E8\u30BD\u30C8\u8A9E +nub=\u30CC\u30D3\u30A2\u8A9E\u65CF +nwc=\u53E4\u5178\u30CD\u30EF\u30FC\u30EB\u8A9E +nya=\u30C1\u30C1\u30A7\u30EF\u8A9E +nym=\u30CB\u30E3\u30E0\u30A6\u30A7\u30B8\u8A9E +nyn=\u30CB\u30E3\u30F3\u30B3\u30EC\u8A9E +nyo=\u30CB\u30E7\u30ED\u8A9E +nzi=\u30F3\u30BC\u30DE\u8A9E +oci=\u30AA\u30C3\u30AF\u8A9E(1500\u4EE5\u5F8C) +oji=\u30AA\u30B8\u30D6\u30EF\u8A9E +ori=\u30AA\u30EA\u30E4\u30FC\u8A9E +orm=\u30AA\u30ED\u30E2\u8A9E +osa=\u30AA\u30BB\u30FC\u30B8\u8A9E +oss=\u30AA\u30BB\u30C3\u30C8\u8A9E +ota=\u30AA\u30B9\u30DE\u30F3\u30C8\u30EB\u30B3\u8A9E +oto=\u30AA\u30C8\u30DF\u8A9E\u65CF +paa=\u30D1\u30D7\u30A2\u8AF8\u8A9E +pag=\u30D1\u30F3\u30AC\u30B7\u30CA\u30F3\u8A9E +pal=\u30D1\u30D5\u30E9\u30F4\u30A3\u8A9E +pam=\u30D1\u30F3\u30D1\u30F3\u30AC\u8A9E +pan=\u30D1\u30F3\u30B8\u30E3\u30D6\u8A9E +pap=\u30D1\u30D4\u30A2\u30E1\u30F3\u30C8\u8A9E +pau=\u30D1\u30E9\u30AA\u8A9E +peo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u8A9E +per=\u30DA\u30EB\u30B7\u30A2\u8A9E +phi=\u30D5\u30A3\u30EA\u30D4\u30F3\u8AF8\u8A9E +phn=\u30D5\u30A7\u30CB\u30AD\u30A2\u8A9E +pli=\u30D1\u30FC\u30EA\u8A9E +pol=\u30DD\u30FC\u30E9\u30F3\u30C9\u8A9E +pon=\u30DD\u30F3\u30DA\u30A4\u8A9E +por=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E +pra=\u30D7\u30E9\u30FC\u30AF\u30EA\u30C3\u30C8\u8A9E\u65CF +pro=\u53E4\u671F\u30D7\u30ED\u30D0\u30F3\u30B9\u8A9E +pus=\u30D7\u30B7\u30E5\u30C8\u30A5\u30FC\u8A9E\u3001\u30D1\u30B7\u30E5\u30C8\u30A5\u30FC\u8A9E +que=\u30B1\u30C1\u30E5\u30A2\u8A9E +raj=\u30E9\u30FC\u30B8\u30E3\u30B9\u30BF\u30FC\u30F3\u8A9E +rap=\u30E9\u30D1\u30CC\u30A4\u8A9E +rar=\u30E9\u30ED\u30C8\u30AC\u8A9E +roa=\u30ED\u30DE\u30F3\u30B9\u8AF8\u8A9E +roh=\u30ED\u30DE\u30F3\u30B7\u30E5\u8A9E +rom=\u30ED\u30DE\u30FC\u30CB\u30FC\u8A9E +rum=\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E +run=\u30EB\u30F3\u30C7\u30A3\u8A9E +rup=\u30A2\u30EB\u30FC\u30DE\u30CB\u30A2\u8A9E +rus=\u30ED\u30B7\u30A2\u8A9E +sad=\u30B5\u30F3\u30C0\u30A6\u30A7\u8A9E +sag=\u30B5\u30F3\u30B4\u8A9E +sah=\u30E4\u30AF\u30FC\u30C8\u8A9E +sai=\u5357\u7C73\u30A4\u30F3\u30C7\u30A3\u30A2\u30F3\u8AF8\u8A9E +sal=\u30BB\u30A4\u30EA\u30C3\u30B7\u30E5\u8A9E\u65CF +sam=\u30B5\u30DE\u30EA\u30A2\u30FB\u30A2\u30E9\u30E0\u8A9E +san=\u30B5\u30F3\u30B9\u30AF\u30EA\u30C3\u30C8\u8A9E +sas=\u30B5\u30B5\u30AF\u8A9E +sat=\u30B5\u30F3\u30BF\u30FC\u30EA\u30FC\u8A9E +scn=\u30B7\u30C1\u30EA\u30A2\u8A9E +sco=\u30B9\u30B3\u30C3\u30C8\u30E9\u30F3\u30C9\u8A9E +sel=\u30BB\u30EA\u30AF\u30D7\u8A9E +sem=\u30BB\u30E0\u8AF8\u8A9E +sga=\u53E4\u671F\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u8A9E +sgn=\u624B\u307E\u306D\u8A00\u8A9E +shn=\u30B7\u30E3\u30F3\u8A9E +sid=\u30B7\u30C0\u30E2\u8A9E +sin=\u30B7\u30F3\u30CF\u30E9\u8A9E +sio=\u30B9\u30FC\u8A9E\u65CF +sit=\u30B9\u30ED\u30D9\u30CB\u30A2 \u30C8\u30E9\u30FC\u30EB +sla=\u30B9\u30E9\u30D6\u8AF8\u8A9E +slo=\u30B9\u30ED\u30D0\u30AD\u30A2\u8A9E +slv=\u30B9\u30ED\u30D9\u30CB\u30A2\u8A9E +sma=\u5357\u30B5\u30FC\u30DF\u8A9E +sme=\u5317\u30B5\u30FC\u30DF\u8A9E +smi=\u30B5\u30FC\u30DF\u8AF8\u8A9E +smj=\u30EB\u30EC\u30FB\u30B5\u30FC\u30DF\u8A9E +smn=\u30A4\u30CA\u30EA\u30FB\u30B5\u30FC\u30DF\u8A9E +smo=\u30B5\u30E2\u30A2\u8A9E +sms=\u30B9\u30B3\u30EB\u30C8\u30FB\u30B5\u30FC\u30DF\u8A9E +sna=\u30B7\u30E7\u30CA\u8A9E +snd=\u30B7\u30F3\u30C9\u8A9E +snk=\u30BD\u30CB\u30F3\u30B1\u8A9E +sog=\u30BD\u30B0\u30C9\u8A9E +som=\u30BD\u30DE\u30EA\u8A9E +son=\u30BD\u30F3\u30AC\u30A4\u8A9E +sot=\u5357\u90E8\u30BD\u30C8\u8A9E +spa=\u30B9\u30DA\u30A4\u30F3\u8A9E +srd=\u30B9\u30EA\u30CA\u30E0 \u30C9\u30EB +srn=\u30B9\u30EA\u30CA\u30E0\u8A9E +srp=\u30BB\u30EB\u30D3\u30A2\u8A9E +srr=\u30BB\u30EC\u30EB\u8A9E +ssa=\u30CA\u30A4\u30EB\u30FB\u30B5\u30CF\u30E9\u8AF8\u8A9E +ssw=\u30B7\u30B9\u30EF\u30C6\u30A3\u8A9E +suk=\u30B9\u30AF\u30DE\u8A9E +sun=\u30B9\u30F3\u30C0\u8A9E +sus=\u30B9\u30B9\u8A9E +sux=\u30B7\u30E5\u30E1\u30FC\u30EB\u8A9E +swa=\u30B9\u30EF\u30D2\u30EA\u8A9E +swe=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u8A9E +syc=\u53E4\u5178\u30B7\u30EA\u30A2\u8A9E +syr=\u30B7\u30EA\u30A2\u8A9E +tah=\u30BF\u30D2\u30C1\u8A9E +tai=\u30BF\u30A4\u8AF8\u8A9E +tam=\u30BF\u30DF\u30EB\u8A9E +tat=\u30BF\u30BF\u30FC\u30EB\u8A9E +tel=\u30C6\u30EB\u30B0\u8A9E +tem=\u30C6\u30E0\u30CD\u8A9E +ter=\u30C6\u30EC\u30FC\u30CE\u8A9E +tet=\u30C6\u30C8\u30A5\u30F3\u8A9E +tgk=\u30BF\u30B8\u30AF\u8A9E +tgl=\u30BF\u30AC\u30ED\u30B0\u8A9E +tha=\u30BF\u30A4\u8A9E +tib=\u30C1\u30D9\u30C3\u30C8\u8A9E +tig=\u30C6\u30A3\u30B0\u30EC\u8A9E +tir=\u30C6\u30A3\u30B0\u30EA\u30CB\u30E3\u8A9E +tiv=\u30C6\u30A3\u30D6\u8A9E +tkl=\u30C8\u30B1\u30E9\u30A6\u8A9E +tlh=\u30AF\u30EA\u30F3\u30B4\u30F3\u8A9E +tli=\u30C8\u30EA\u30F3\u30AE\u30C3\u30C8\u8A9E +tmh=\u30BF\u30DE\u30B7\u30A7\u30AF\u8A9E +tog=\u30C8\u30F3\u30AC\u8A9E (\u30CB\u30A2\u30B5) +ton=\u30C8\u30F3\u30AC\u8A9E(\u30C8\u30F3\u30AC\u8AF8\u5CF6) +tpi=\u30C8\u30AF\u30FB\u30D4\u30B7\u30F3\u8A9E +tsi=\u30C1\u30E0\u30B7\u30E5\u8A9E +tsn=\u30C4\u30EF\u30CA\u8A9E +tso=\u30C4\u30A9\u30F3\u30AC\u8A9E +tuk=\u30C8\u30EB\u30AF\u30E1\u30F3\u8A9E +tum=\u30C8\u30A5\u30F3\u30D6\u30AB\u8A9E +tup=\u30C8\u30A5\u30D4\u8A9E\u65CF +tur=\u30C8\u30EB\u30B3\u8A9E +tut=\u30A2\u30EB\u30BF\u30A4\u8AF8\u8A9E +tvl=\u30C4\u30D0\u30EB\u8A9E +twi=\u30C8\u30A6\u30A3\u8A9E +tyv=\u30C8\u30A5\u30F4\u30A1\u8A9E +udm=\u30A6\u30C9\u30E0\u30EB\u30C8\u8A9E +uga=\u30A6\u30AC\u30EA\u30C8\u8A9E +uig=\u30A6\u30A4\u30B0\u30EB\u8A9E +ukr=\u30A6\u30AF\u30E9\u30A4\u30CA\u8A9E +umb=\u30A6\u30F3\u30D6\u30F3\u30C9\u30A5\u8A9E +und=\u975E\u78BA\u5B9A +urd=\u30A6\u30EB\u30C9\u30A5\u30FC\u8A9E +uzb=\u30A6\u30BA\u30D9\u30AF\u8A9E +vai=\u30F4\u30A1\u30A4\u8A9E +ven=\u30D9\u30F3\u30C0\u8A9E +vie=\u30D9\u30C8\u30CA\u30E0\u8A9E +vol=\u30F4\u30A9\u30E9\u30D4\u30E5\u30FC\u30AF\u8A9E +vot=\u30DC\u30FC\u30C8\u8A9E +wak=\u30EF\u30AB\u30B7\u8A9E\u65CF +wal=\u30EF\u30C3\u30E9\u30E2\u8A9E +war=\u30EF\u30E9\u30A4\u8A9E +was=\u30EF\u30B7\u30E7\u8A9E +wel=\u30A6\u30A7\u30FC\u30EB\u30BA\u8A9E +wen=\u30BD\u30EB\u30D3\u30A2\u8A9E\u65CF +wln=\u30EF\u30ED\u30F3\u8A9E +wol=\u30A6\u30A9\u30ED\u30D5\u8A9E +xal=\u30AB\u30EB\u30E0\u30A4\u30AF\u8A9E +xho=\u30B3\u30FC\u30B5\u8A9E +yao=\u30E4\u30AA\u8A9E +yap=\u30E4\u30C3\u30D7\u8A9E +yid=\u30A4\u30C7\u30A3\u30C3\u30B7\u30E5\u8A9E +yor=\u30E8\u30EB\u30D0\u8A9E +ypk=\u30E6\u30D4\u30C3\u30AF\u8A9E\u65CF +zap=\u30B6\u30DD\u30C6\u30C3\u30AF\u8A9E +zbl=\u30D6\u30EA\u30B9\u30B7\u30F3\u30DC\u30EB +zen=\u30BC\u30CA\u30AC\u8A9E +zha=\u30C1\u30E5\u30EF\u30F3\u8A9E +znd=\u30B6\u30F3\u30C7\u8A9E +zul=\u30BA\u30FC\u30EB\u30FC\u8A9E +zun=\u30BA\u30CB\u8A9E +zxx=\u8A00\u8A9E\u5185\u5BB9\u306A\u3057 +zza=\u30B6\u30B6\u8A9E + +# script names +# key is ISO 15924 script code + +Arab=\u30A2\u30E9\u30D3\u30A2\u6587\u5B57 +Armi=\u5E1D\u56FD\u30A2\u30E9\u30E0\u8A9E +Armn=\u30A2\u30EB\u30E1\u30CB\u30A2\u6587\u5B57 +Avst=\u30A2\u30F4\u30A7\u30B9\u30BF\u8A9E +Bali=\u30D0\u30EA\u6587\u5B57 +Bamu=\u30D0\u30E0\u30F3\u8A9E +Bass=\u30D0\u30B5\u8A9E(\u30D0\u30FC) +Batk=\u30D0\u30BF\u30AF\u6587\u5B57 +Beng=\u30D9\u30F3\u30AC\u30EB\u6587\u5B57 +Blis=\u30D6\u30EA\u30B9\u30B7\u30F3\u30DC\u30EB +Bopo=\u6CE8\u97F3\u5B57\u6BCD +Brah=\u30D6\u30E9\u30FC\u30D5\u30DF\u30FC\u6587\u5B57 +Brai=\u30D6\u30E9\u30A4\u30E6\u70B9\u5B57 +Bugi=\u30D6\u30AE\u30B9\u6587\u5B57 +Buhd=\u30D6\u30D2\u30C3\u30C9\u6587\u5B57 +Cakm=\u30C1\u30E3\u30AF\u30DE\u8A9E +Cans=\u7D71\u5408\u30AB\u30CA\u30C0\u5148\u4F4F\u6C11\u8A18\u53F7 +Cari=\u30AB\u30EA\u6587\u5B57 +Cham=\u30C1\u30E3\u30E0\u6587\u5B57 +Cher=\u30C1\u30A7\u30ED\u30AD\u30FC\u6587\u5B57 +Cirt=\u30AD\u30A2\u30B9\u6587\u5B57 +Copt=\u30B3\u30D7\u30C8\u6587\u5B57 +Cprt=\u30AD\u30D7\u30ED\u30B9\u6587\u5B57 +Cyrl=\u30AD\u30EA\u30EB\u6587\u5B57 +Cyrs=\u30AD\u30EA\u30EB\u6587\u5B57 (\u53E4\u4EE3\u6559\u4F1A\u30B9\u30E9\u30D6\u8A9E\u306E\u6587\u5B57) +Deva=\u30C7\u30FC\u30D0\u30CA\u30FC\u30AC\u30EA\u30FC\u6587\u5B57 +Dsrt=\u30C7\u30BB\u30EC\u30C3\u30C8\u6587\u5B57 +Dupl=\u30C7\u30E5\u30D7\u30ED\u30EF\u30A8\u5F0F\u901F\u8A18 +Egyd=\u30A8\u30B8\u30D7\u30C8\u6C11\u8846\u6587\u5B57 +Egyh=\u30A8\u30B8\u30D7\u30C8\u795E\u5B98\u6587\u5B57 +Egyp=\u30A8\u30B8\u30D7\u30C8\u8056\u523B\u6587\u5B57 +Elba=\u30A8\u30EB\u30D0\u30B5\u30F3\u6587\u5B57 +Ethi=\u30A8\u30C1\u30AA\u30D4\u30A2\u6587\u5B57 +Geok=\u30B0\u30EB\u30B8\u30A2\u6587\u5B57\uFF08\u30D5\u30C4\u30EA\uFF09 +Geor=\u30B0\u30EB\u30B8\u30A2\u6587\u5B57 +Glag=\u30B0\u30E9\u30B4\u30FC\u30EB\u6587\u5B57 +Goth=\u30B4\u30FC\u30C8\u6587\u5B57 +Gran=\u30B0\u30E9\u30F3\u30BF\u6587\u5B57 +Grek=\u30AE\u30EA\u30B7\u30E3\u6587\u5B57 +Gujr=\u30B0\u30B8\u30E3\u30E9\u30FC\u30C8\u6587\u5B57 +Guru=\u30B0\u30EB\u30E0\u30AD\u30FC\u6587\u5B57 +Hang=\u30CF\u30F3\u30B0\u30EB +Hani=\u6F22\u5B57 +Hano=\u30CF\u30CC\u30CE\u30AA\u6587\u5B57 +Hans=\u7C21\u4F53\u5B57 +Hant=\u7E41\u4F53\u5B57 +Hebr=\u30D8\u30D6\u30E9\u30A4\u6587\u5B57 +Hira=\u3072\u3089\u304C\u306A +Hmng=\u30D1\u30CF\u30A6\u30FB\u30D5\u30E2\u30F3\u6587\u5B57 +Hrkt=\u30AB\u30BF\u30AB\u30CA\u3068\u3072\u3089\u304C\u306A +Hung=\u53E4\u4EE3\u30CF\u30F3\u30AC\u30EA\u30FC\u6587\u5B57 +Inds=\u30A4\u30F3\u30C0\u30B9\u6587\u5B57 (\u30CF\u30E9\u30C3\u30D1\u6587\u5B57) +Ital=\u53E4\u4EE3\u30A4\u30BF\u30EA\u30A2\u306E\u6587\u5B57 +Java=\u30B8\u30E3\u30EF\u6587\u5B57 +Jpan=\u65E5\u672C\u8A9E\u306E\u6587\u5B57 +Kali=\u30AB\u30E4\u30FC\u6587\u5B57 +Kana=\u30AB\u30BF\u30AB\u30CA +Khar=\u30AB\u30ED\u30FC\u30B7\u30E5\u30C6\u30A3\u30FC\u6587\u5B57 +Khmr=\u30AF\u30E1\u30FC\u30EB\u6587\u5B57 +Knda=\u30AB\u30F3\u30CA\u30C0\u6587\u5B57 +Kore=\u97D3\u56FD\u8A9E\u306E\u6587\u5B57 +Kpel=\u30AF\u30DA\u30EC\u8A9E +Kthi=\u30AB\u30A4\u30C6\u30A3\u30FC\u6587\u5B57 +Lana=\u30BF\u30A4\u30FB\u30BF\u30E0\u6587\u5B57 +Laoo=\u30E9\u30AA\u6587\u5B57 +Latf=\u30E9\u30C6\u30F3\u6587\u5B57 (\u30C9\u30A4\u30C4\u6587\u5B57) +Latg=\u30E9\u30C6\u30F3\u6587\u5B57(\u30B2\u30FC\u30EB\u8A9E) +Latn=\u30E9\u30C6\u30F3\u6587\u5B57 +Lepc=\u30EC\u30D7\u30C1\u30E3\u6587\u5B57 (\u30ED\u30F3\u6587\u5B57) +Limb=\u30EA\u30F3\u30D6\u6587\u5B57 +Lina=\u7DDA\u6587\u5B57A +Linb=\u7DDA\u6587\u5B57B +Lisu=\u30EA\u30B9\u6587\u5B57 +Loma=\u30ED\u30DE\u6587\u5B57 +Lyci=\u30EA\u30E5\u30AD\u30A2\u6587\u5B57 +Lydi=\u30EA\u30C7\u30A3\u30A2\u6587\u5B57 +Mand=\u30DE\u30F3\u30C0\u6587\u5B57 +Mani=\u30DE\u30CB\u6587\u5B57 +Maya=\u30DE\u30E4\u8C61\u5F62\u6587\u5B57 +Mend=\u30E1\u30F3\u30C7\u8A9E +Merc=\u30E1\u30ED\u30A8\u6587\u5B57\u8349\u66F8\u4F53 +Mero=\u30E1\u30ED\u30A8\u6587\u5B57 +Mlym=\u30DE\u30E9\u30E4\u30FC\u30E9\u30E0\u6587\u5B57 +Mong=\u30E2\u30F3\u30B4\u30EB\u6587\u5B57 +Moon=\u30E0\u30FC\u30F3\u6587\u5B57 +Mtei=\u30E1\u30A4\u30C6\u30A4\u6587\u5B57 +Mymr=\u30DF\u30E3\u30F3\u30DE\u30FC\u6587\u5B57 +Narb=\u53E4\u4EE3\u5317\u30A2\u30E9\u30D3\u30A2\u8A9E +Nbat=\u30CA\u30D0\u30C6\u30A2\u8A9E +Nkgb=Nakhi Geba\u6587\u5B57 +Nkoo=\u30F3\u30B3\u6587\u5B57 +Ogam=\u30AA\u30AC\u30E0\u6587\u5B57 +Olck=\u30AA\u30EB\u30C1\u30AD\u6587\u5B57 +Orkh=\u30AA\u30EB\u30DB\u30F3\u6587\u5B57 +Orya=\u30AA\u30EA\u30E4\u30FC\u6587\u5B57 +Osma=\u30AA\u30B9\u30DE\u30CB\u30A2\u6587\u5B57 +Palm=\u30D1\u30EB\u30DF\u30E9\u6587\u5B57 +Perm=\u53E4\u30DA\u30EB\u30DF\u30C3\u30AF\u6587\u5B57 +Phag=\u30D1\u30B9\u30D1\u6587\u5B57 +Phli=\u7891\u6587\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57 +Phlp=\u8A69\u7BC7\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57 +Phlv=\u66F8\u7C4D\u306E\u30D1\u30D5\u30E9\u30F4\u30A3\u30FC\u6587\u5B57 +Phnx=\u30D5\u30A7\u30CB\u30AD\u30A2\u6587\u5B57 +Plrd=\u30DD\u30E9\u30FC\u30C9\u97F3\u58F0\u8A18\u53F7 +Prti=\u7891\u6587\u306E\u30D1\u30EB\u30C6\u30A3\u30A2\u6587\u5B57 +Rjng=\u30EC\u30B8\u30E3\u30F3\u8A9E +Roro=\u30ED\u30F3\u30B4\u30ED\u30F3\u30B4\u6587\u5B57 +Runr=\u30EB\u30FC\u30F3\u6587\u5B57 +Samr=\u30B5\u30DE\u30EA\u30A2\u8A9E +Sara=\u30B5\u30E9\u30C6\u30A3\u6587\u5B57 +Sarb=\u53E4\u4EE3\u5357\u30A2\u30E9\u30D3\u30A2\u8A9E +Saur=\u30B5\u30A4\u30E9\u30B7\u30E5\u30C8\u30E9\u8A9E +Sgnw=\u624B\u8A71\u8A18\u8FF0 +Shaw=\u30B7\u30E7\u30FC\u6587\u5B57 +Sind=\u30B7\u30F3\u30C9\u8A9E +Sinh=\u30B7\u30F3\u30CF\u30E9\u6587\u5B57 +Sund=\u30B9\u30F3\u30C0\u8A9E +Sylo=\u30B7\u30ED\u30C6\u30A3\u30FB\u30CA\u30B0\u30EA\u6587\u5B57 +Syrc=\u30B7\u30EA\u30A2\u6587\u5B57 +Syre=\u30B7\u30EA\u30A2\u6587\u5B57 (\u30A8\u30B9\u30C8\u30E9\u30F3\u30B2\u30ED\u6587\u5B57) +Syrj=\u30B7\u30EA\u30A2\u6587\u5B57 (\u897F\u65B9\u30B7\u30EA\u30A2\u6587\u5B57) +Syrn=\u30B7\u30EA\u30A2\u6587\u5B57 (\u6771\u65B9\u30B7\u30EA\u30A2\u6587\u5B57) +Tagb=\u30BF\u30B0\u30D0\u30F3\u30EF\u6587\u5B57 +Tale=\u30BF\u30A4\u30EC\u6587\u5B57 +Talu=\u65B0\u30BF\u30A4\u30FB\u30EB\u30FC\u6587\u5B57 +Taml=\u30BF\u30DF\u30FC\u30EB\u6587\u5B57 +Tavt=\u30BF\u30A4\u30FB\u30F4\u30A7\u30C8\u6587\u5B57 +Telu=\u30C6\u30EB\u30B0\u6587\u5B57 +Teng=\u30C6\u30F3\u30B0\u30EF\u30FC\u30EB\u6587\u5B57 +Tfng=\u30AF\u30E1\u30FC\u30EB\u8A9E +Tglg=\u30BF\u30AC\u30ED\u30B0\u6587\u5B57 +Thaa=\u30BF\u30FC\u30CA\u6587\u5B57 +Thai=\u30BF\u30A4\u6587\u5B57 +Tibt=\u30C1\u30D9\u30C3\u30C8\u6587\u5B57 +Ugar=\u30A6\u30AC\u30EA\u30C8\u6587\u5B57 +Vaii=\u30F4\u30A1\u30A4\u6587\u5B57 +Visp=\u8996\u8A71\u6CD5 +Wara=\u30EF\u30E9\u30F3\u30B0\u30FB\u30AF\u30B7\u30C6\u30A3\u6587\u5B57 +Xpeo=\u53E4\u4EE3\u30DA\u30EB\u30B7\u30A2\u6587\u5B57 +Xsux=\u30B7\u30E5\u30E1\u30FC\u30EB\uFF1D\u30A2\u30C3\u30AB\u30C9\u8A9E\u6954\u5F62\u6587\u5B57 +Yiii=\u30A4\u6587\u5B57 +Zinh=\u7D99\u627F\u7528\u5B57 +Zmth=\u6570\u5B66\u8A18\u53F7 +Zsym=\u8A18\u53F7 +Zxxx=\u53E3\u627F\u8A00\u8A9E\u306E\u30B3\u30FC\u30C9 +Zyyy=\u5171\u901A\u30B3\u30FC\u30C9 +Zzzz=\u7528\u5B57\u672A\u30B3\u30FC\u30C9\u5316 + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=\u5357\u30a2\u30d5\u30ea\u30ab ZM=\u30b6\u30f3\u30d3\u30a2 ZW=\u30b8\u30f3\u30d0\u30d6\u30a8 + +# territory names +# key is UN M.49 country and area code + +001=\u4E16\u754C +002=\u30A2\u30D5\u30EA\u30AB +003=\u5317\u7C73 +005=\u5357\u30A2\u30E1\u30EA\u30AB +009=\u30AA\u30BB\u30A2\u30CB\u30A2 +011=\u897F\u30A2\u30D5\u30EA\u30AB +013=\u4E2D\u592E\u30A2\u30E1\u30EA\u30AB +014=\u6771\u30A2\u30D5\u30EA\u30AB +015=\u5317\u30A2\u30D5\u30EA\u30AB +017=\u4E2D\u90E8\u30A2\u30D5\u30EA\u30AB +018=\u5357\u90E8\u30A2\u30D5\u30EA\u30AB +019=\u30A2\u30E1\u30EA\u30AB\u5927\u9678 +021=\u5317\u30A2\u30E1\u30EA\u30AB +029=\u30AB\u30EA\u30D6\u6D77 +030=\u6771\u30A2\u30B8\u30A2 +034=\u5357\u30A2\u30B8\u30A2 +035=\u6771\u5357\u30A2\u30B8\u30A2 +039=\u5357\u30E8\u30FC\u30ED\u30C3\u30D1 +053=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9 +054=\u30E1\u30E9\u30CD\u30B7\u30A2 +057=\u30DF\u30AF\u30ED\u30CD\u30B7\u30A2\u5730\u57DF +061=\u30DD\u30EA\u30CD\u30B7\u30A2 +142=\u30A2\u30B8\u30A2 +143=\u4E2D\u592E\u30A2\u30B8\u30A2 +145=\u897F\u30A2\u30B8\u30A2 +150=\u30E8\u30FC\u30ED\u30C3\u30D1 +151=\u6771\u30E8\u30FC\u30ED\u30C3\u30D1 +154=\u5317\u30E8\u30FC\u30ED\u30C3\u30D1 +155=\u897F\u30E8\u30FC\u30ED\u30C3\u30D1 +419=\u30E9\u30C6\u30F3\u30A2\u30E1\u30EA\u30AB\u30FB\u30AB\u30EA\u30D6\u5730\u57DF diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_ko.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=\uc911\uad6d\uc5b4 zu=\uc904\ub8e8\uc5b4 +# key is ISO 639.2 language code +aar=\uC544\uD30C\uB974\uC5B4 +abk=\uC544\uBE0C\uD558\uC988\uC5B4 +ace=\uC544\uCCB4\uC5B4 +ach=\uC544\uCF5C\uB9AC\uC5B4 +ada=\uC544\uB2F9\uBA54\uC5B4 +ady=\uC544\uB2E5\uD5E4\uC5B4 +afa=\uC544\uD504\uAC00\uB2C8(1927-2002) +afh=\uC544\uD504\uB9AC\uD788\uB9AC\uC5B4 +afr=\uB0A8\uC544\uACF5 \uACF5\uC6A9\uC5B4 +ain=\uC544\uC774\uB204\uC5B4 +aka=\uC544\uCE78\uC5B4 +akk=\uC544\uCE74\uB4DC\uC5B4 +alb=\uC54C\uBC14\uB2C8\uC544\uC5B4 +ale=\uC54C\uB958\uD2B8\uC5B4 +alg=\uC54C\uACF5\uD0A8\uC5B4\uC871 +alt=\uB0A8\uBD80 \uC54C\uD0C0\uC774\uC81C\uC5B4 +amh=\uC554\uD558\uB77C\uC5B4 +ang=\uB124\uB35C\uB780\uB4DC\uB839 \uC548\uD2F8\uB808\uC2A4 \uAE38\uB354 +anp=\uC559\uAC00\uC5B4 +apa=\uC544\uD30C\uCE58\uC5B4 +ara=\uC544\uB78D\uC5B4 +arc=\uC544\uB78C\uC5B4 +arg=\uC544\uB77C\uACE4\uC5B4 +arm=\uC544\uB974\uBA54\uB2C8\uC544\uC5B4 +arn=\uC544\uB77C\uC6B0\uCE78\uC5B4 +arp=\uC544\uB77C\uD30C\uD638\uC5B4 +art=\uAE30\uACC4\uC5B4(\uAE30\uD0C0) +arw=\uC544\uB77C\uC640\uD06C\uC5B4 +asm=\uC544\uC0D8\uC5B4 +ast=\uC544\uC2A4\uD22C\uB9AC\uC544\uC5B4 +ath=\uC544\uD0C0\uD30C\uC2A4\uCE74\uC5B4\uAD70 +aus=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544\uC5B4\uC871 +ava=\uC544\uBC14\uB974\uC5B4 +ave=\uC544\uBCA0\uC2A4\uD0C0\uC5B4 +awa=\uC544\uC640\uD788\uC5B4 +aym=\uC544\uC774\uB9C8\uB77C\uC5B4 +aze=\uC544\uC81C\uB974\uBC14\uC774\uC794\uC5B4 +bad=\uBCF4\uC2A4\uB2C8\uC544-\uD5E4\uB974\uCCB4\uACE0\uBE44\uB098 \uB514\uB098\uB974 +bai=\uBC14\uBC00\uB808\uCF00\uC5B4\uC871 +bak=\uBC14\uC288\uD0A4\uB974\uC5B4 +bal=\uBC1C\uB8E8\uCE58\uC5B4 +bam=\uBC24\uBC14\uB77C\uC5B4 +ban=\uBC1C\uB9AC\uC5B4 +baq=\uBC14\uC2A4\uD06C\uC5B4 +bas=\uBC14\uC0AC\uC5B4 +bat=\uBC1C\uD2B8\uC5B4(\uAE30\uD0C0) +bej=\uBCA0\uC790\uC5B4 +bel=\uBCA8\uB77C\uB8E8\uC2A4\uC5B4 +bem=\uBCB0\uBC14\uC5B4 +ben=\uBCB5\uACE8\uC5B4 +ber=\uBCA0\uB974\uBCA0\uB974\uC5B4 +bho=\uD638\uC988\uD478\uB9AC\uC5B4 +bih=\uBE44\uD558\uB974\uC5B4 +bik=\uBE44\uCF5C\uC5B4 +bin=\uBE44\uB2C8\uC5B4 +bis=\uBE44\uC2AC\uB77C\uB9C8\uC5B4 +bla=\uC2DD\uC2DC\uCE74\uC5B4 +bnt=\uBC18\uD22C\uC5B4 +bos=\uBCF4\uC2A4\uB2C8\uC544\uC5B4 +bra=\uBE0C\uB77C\uC9C0\uC5B4 +bre=\uBE0C\uB77C\uC9C8 \uD06C\uB8E8\uC81C\uC774\uB8E8 (1990-1993) +btk=\uBC14\uD0C0\uD06C\uC5B4 +bua=\uBD80\uB9AC\uC544\uD0C0 +bug=\uBD80\uAE30\uC5B4 +bul=\uBD88\uAC00\uB9AC\uC544\uC5B4 +bur=\uBC84\uB9C8\uC5B4 +byn=\uBE0C\uB9B0\uC5B4 +cad=\uCE74\uB3C4\uC5B4 +cai=\uC911\uC559 \uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC548\uC5B4(\uAE30\uD0C0) +car=\uCE74\uB9AC\uBE0C\uC5B4 +cat=\uCE74\uD0C8\uB85C\uB2C8\uC544\uC5B4 +cau=\uCE74\uD504\uCE74\uC2A4\uC5B4(\uAE30\uD0C0) +ceb=\uC138\uBD80\uC544\uB178\uC5B4 +cel=\uCF08\uD2B8\uC5B4(\uAE30\uD0C0) +cha=\uCC28\uBAA8\uB85C\uC5B4 +chb=\uCE58\uBE0C\uCC28\uC5B4 +che=\uCCB4\uCCB8\uC5B4 +chg=\uCC28\uAC00\uD0C0\uC774\uC5B4 +chi=\uC911\uAD6D\uC5B4 +chk=\uCD94\uD06C\uC5B4 +chm=\uB9C8\uB9AC\uC5B4 +chn=\uCE58\uB204\uD06C\uC5B4\uC640 \uC601\uC5B4 \uD504\uB791\uC2A4\uC5B4\uC758 \uD63C\uC131\uC5B4 +cho=\uCD09\uD1A0\uC5B4 +chp=\uCE58\uD398\uC6B0\uC580 +chr=\uCCB4\uB85C\uD0A4 \uBB38\uC790 +chu=\uAD50\uD68C \uC2AC\uB77C\uBE0C\uC5B4 +chv=\uCD94\uBC14\uC26C\uC5B4 +chy=\uC0E4\uC774\uC5D4\uC5B4 +cmc=\uCC38\uC5B4\uAD70 +cop=\uCF65\uD2B8 \uBB38\uC790 +cor=\uCF58\uC6D4\uC5B4 +cos=\uCF54\uB974\uC2DC\uCE74\uC5B4 +cpe=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uC601\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0) +cpf=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uD504\uB791\uC2A4\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0) +cpp=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4(\uD3EC\uB974\uD22C\uCE7C\uC5B4\uB97C \uAE30\uBC18\uC73C\uB85C \uD55C \uAE30\uD0C0) +cre=\uD06C\uB9AC\uC5B4 +crh=\uD06C\uB9AC\uBBFC \uD130\uD0A4\uC5B4; \uD06C\uB9AC\uBBFC \uD0C0\uD0C0\uB974\uC5B4 +crp=\uD06C\uB9AC\uC62C\uC5B4 \uBC0F \uD53C\uC9C4\uC5B4 (\uAE30\uD0C0) +csb=\uCE74\uC288\uBE44\uC544\uC5B4 +cus=\uCFE0\uC2DC\uC5B4\uC871 +cze=\uCCB4\uCF54\uC5B4 +dak=\uB2E4\uCF54\uD0C0\uC5B4 +dan=\uB374\uB9C8\uD06C\uC5B4 +dar=\uB2E4\uB974\uADF8\uC640\uC5B4 +day=\uB2E4\uC57C\uD06C\uC5B4 +del=\uB378\uB77C\uC6E8\uC5B4\uC5B4 +den=\uC2AC\uB77C\uBE0C\uC5B4 +dgr=\uB3C4\uADF8\uB9AC\uBE0C\uC5B4 +din=\uB529\uCE74\uC5B4 +div=\uB514\uBCA0\uD788\uC5B4 +doi=\uB3C4\uADF8\uB9AC\uC5B4 +dra=\uB4DC\uB77C\uBE44\uB2E4\uC5B4 (\uAE30\uD0C0) +dsb=\uC800\uC9C0 \uC18C\uB974\uBE44\uC544\uC5B4 +dua=\uB4DC\uC640\uB77C\uC5B4 +dum=\uC911\uC138 \uB124\uB35C\uB780\uB4DC\uC5B4 +dut=\uB124\uB35C\uB780\uB4DC\uC5B4 +dyu=\uB4DC\uC728\uB77C\uC5B4 +dzo=\uBD80\uD0C4\uC5B4 +efi=\uC774\uD53D\uC5B4 +egy=\uC774\uC9D1\uD2B8\uC5B4 (\uACE0\uB300) +eka=\uC774\uCE74\uC8FD\uC5B4 +elx=\uC5D8\uB78C\uC5B4 +eng=\uC601\uC5B4 +enm=\uC601\uC5B4, \uC911\uC138(1100 - 1500) +epo=\uC5D0\uC2A4\uD398\uB780\uD1A0\uC5B4 +est=\uC5D0\uC2A4\uD1A0\uB2C8\uC544\uC5B4 +ewe=\uC5D0\uC6E8\uC5B4 +ewo=\uC774\uC6D0\uB3C4\uC5B4 +fan=\uD321\uADF8\uC5B4 +fao=\uD398\uB85C\uC2A4\uC5B4 +fat=\uD310\uD2F0\uC5B4 +fij=\uD53C\uC9C0\uC5B4 +fil=\uD544\uB9AC\uD540\uC5B4 +fin=\uD540\uB780\uB4DC\uC5B4 +fiu=\uD53C\uB178\uC6B0\uADF8\uB9AC\uC544\uC5B4(\uAE30\uD0C0) +fon=\uD3F0\uC5B4 +fre=\uD504\uB791\uC2A4\uC5B4 +frm=\uC911\uC138 \uD504\uB791\uC2A4\uC5B4 +fro=\uACE0\uB300 \uD504\uB791\uC2A4\uC5B4 +frr=\uBD81\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4 +frs=\uB3D9\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4 +fry=\uC11C\uBD80 \uD504\uB9AC\uC2AC\uB780\uB4DC\uC5B4 +ful=\uD480\uB77C\uB2C8\uC5B4 +fur=\uD504\uB9AC\uC6B0\uB9AC\uC548\uC5B4 +gaa=\uAC00\uC5B4 +gay=\uAC00\uC694\uC5B4 +gba=\uADF8\uBC14\uC57C\uC5B4 +gem=\uB3C5\uC77C\uC5B4(\uAE30\uD0C0) +geo=\uADF8\uB8E8\uC9C0\uC57C\uC5B4 +ger=\uB3C5\uC77C\uC5B4 +gez=\uAC8C\uC774\uC988\uC5B4 +gil=\uD0A4\uB9AC\uBC14\uC2DC\uC5B4 +gla=\uAC8C\uC77C\uC5B4 +gle=\uC544\uC77C\uB79C\uB4DC\uC5B4 +glg=\uAC08\uB9AC\uC2DC\uC544\uC5B4 +glv=\uB9F9\uD06C\uC2A4\uC5B4 +gmh=\uC911\uC138 \uACE0\uC9C0 \uB3C5\uC77C\uC5B4 +goh=\uACE0\uB300 \uACE0\uC9C0 \uB3C5\uC77C\uC5B4 +gon=\uACE4\uB514\uC5B4 +gor=\uACE0\uB860\uD0C8\uB85C\uC5B4 +got=\uACE0\uD2B8\uC5B4 +grb=\uAC8C\uB974\uBCF4\uC5B4 +grc=\uADF8\uB9AC\uC2A4\uC5B4, \uACE0\uB300 (1453\uB144\uAE4C\uC9C0) +gre=\uADF8\uB9AC\uC2A4\uC5B4, \uADFC\uC138(1453\uB144\uBD80\uD130) +grn=\uAD6C\uC544\uB77C\uB2C8\uC5B4 +gsw=\uB3C5\uC77C\uC5B4(\uC2A4\uC704\uC2A4) +guj=\uAD6C\uC790\uB77C\uD2B8\uC5B4 +gwi=\uADF8\uC704\uCE5C\uC5B4 +hai=\uD558\uC774\uB2E4\uC5B4 +hat=\uC544\uC774\uD2F0\uC5B4 +hau=\uD558\uC6B0\uC790\uC5B4 +haw=\uD558\uC640\uC774\uC5B4 +heb=\uD788\uBE0C\uB9AC \uBB38\uC790 +her=\uD5E4\uB808\uB85C\uC5B4 +hil=\uD5E4\uB9AC\uAC00\uB1EC\uC5B4 +him=\uD788\uB9C8\uCC28\uB9AC\uC5B4 +hin=\uD78C\uB514\uC5B4 +hit=\uD558\uD0C0\uC774\uD2B8\uC5B4 +hmn=\uD788\uBAB8\uC5B4 +hmo=\uD788\uB9AC\uBAA8\uD22C\uC5B4 +hrv=\uD06C\uB85C\uC544\uD2F0\uC544\uC5B4 +hsb=\uACE0\uC9C0 \uC18C\uB974\uBE44\uC544\uC5B4 +hun=\uD5DD\uAC00\uB9AC\uC5B4 +hup=\uD6C4\uD30C\uC5B4 +iba=\uC774\uBC18\uC5B4 +ibo=\uC774\uADF8\uBCF4\uC5B4 +ice=\uC544\uC774\uC2AC\uB780\uB4DC\uC5B4 +ido=\uC774\uB3C4\uC5B4 +iii=\uC4F0\uCD28 \uC774\uC5B4 +ijo=\uC774\uC870\uC5B4 +iku=\uC774\uB205\uD2F0\uD22C\uD2B8\uC5B4 +ile=\uC778\uD130\uB9C1\uAC8C\uC5B4 +ilo=\uC774\uB85C\uCF54\uC5B4 +ina=\uC778\uD130\uB9C1\uAC70(\uAD6D\uC81C \uBCF4\uC870 \uC5B8\uC5B4 \uD611\uD68C) +inc=\uC778\uB3C4\uC5B4(\uAE30\uD0C0) +ind=\uC778\uB3C4\uB124\uC2DC\uC544\uC5B4 +ine=\uC778\uB3C4\uC720\uB7FD\uC5B4(\uAE30\uD0C0) +inh=\uC778\uADC0\uC2DC\uC5B4 +ipk=\uC774\uB204\uD53C\uC544\uD06C\uC5B4 +ira=\uC774\uB780\uC5B4 [ira] +iro=\uC774\uB7EC\uCFFC\uC774\uC5B4 +ita=\uC774\uD0C8\uB9AC\uC544\uC5B4 +jav=\uC790\uBC14\uC5B4 +jbo=\uB85C\uBC18\uC5B4 +jpn=\uC77C\uBCF8\uC5B4 +jpr=\uC720\uB300-\uD398\uB974\uC2DC\uC544\uC5B4 +jrb=\uC720\uB300-\uC544\uB77C\uBE44\uC544\uC5B4 +kaa=\uCE74\uB77C\uCE7C\uD30C\uD06C\uC5B4 +kab=\uCEE4\uBC14\uC77C\uC5B4 +kac=\uCE74\uCE5C\uC5B4 +kal=\uCE7C\uB784\uB9AC\uC218\uD2B8 +kam=\uCE84\uBC14\uC5B4 +kan=\uCE78\uB098\uB2E4 \uBB38\uC790 +kar=\uCE74\uB80C\uC5B4 +kas=\uCE74\uC288\uBBF8\uB974\uC5B4 +kau=\uCE74\uB204\uB9AC\uC5B4 +kaw=\uCE74\uC704\uC5B4 +kaz=\uCE74\uC790\uD750\uC5B4 +kbd=\uCE74\uBC14\uB974\uB514\uC5B4 +kha=\uCE74\uC2DC\uC5B4 +khi=\uCF54\uC774\uC0B0\uC5B4 +khm=\uC911\uC559 \uD06C\uBA54\uB974 \uBB38\uC790 +kho=\uD638\uD0C4\uC5B4 +kik=\uD0A4\uCFE0\uC720\uC5B4 +kin=\uBC18\uD22C\uC5B4(\uB8E8\uC644\uB2E4) +kir=\uD0A4\uB974\uAE30\uC2A4\uC5B4 +kmb=\uD0B4\uBD84\uB450\uC5B4 +kok=\uCF54\uCE74\uB2C8\uC5B4 +kom=\uCF54\uBBF8\uC5B4 +kon=\uCF69\uACE0\uC5B4 +kor=\uD55C\uAD6D\uC5B4 +kos=\uCF54\uC2A4\uB77C\uC774\uC5D4\uC5B4 +kpe=\uD06C\uD3A0\uB808\uC5B4 +krc=\uCE74\uB77C\uCC60\uC774-\uBC1C\uCE74\uB974\uC5B4 +krl=\uCE74\uB810\uB9AC\uC57C\uC5B4 +kro=\uD06C\uB8E8\uC5B4 +kru=\uCFE0\uB974\uD06C\uC5B4 +kua=\uCFE0\uC548\uC57C\uB9C8\uC5B4 +kum=\uCFE0\uBBF9\uC5B4 +kur=\uD06C\uB974\uB4DC\uC5B4 +kut=\uCFE0\uD14C\uB124\uC5B4 +lad=\uB77C\uB514\uB178\uC5B4 +lah=\uB77C\uD55C\uB2E4\uC5B4 +lam=\uB78C\uBC14\uC5B4 +lao=\uB77C\uC624\uC5B4 +lat=\uB77C\uD2F4\uC5B4 +lav=\uB77C\uD2B8\uBE44\uC544\uC5B4 +lez=\uB808\uC988\uAE30\uC548\uC5B4 +lim=\uB9BC\uBC84\uADF8\uC5B4 +lin=\uB9C1\uAC08\uB77C\uC5B4 +lit=\uB9AC\uD22C\uC544\uB2C8\uC544\uC5B4 +lol=\uBABD\uAD6C\uC5B4 +loz=\uB85C\uC9C0\uC5B4 +ltz=\uB8E9\uC148\uBD80\uB974\uD06C\uC5B4 +lua=\uB8E8\uBC14-\uB8F0\uB8E8\uC544\uC5B4 +lub=\uB8E8\uBC14\uC5B4(\uCE74\uD0D5\uAC00) +lug=\uAC04\uB2E4\uC5B4 +lui=\uB8E8\uC774\uC138\uB178\uC5B4 +lun=\uB8EC\uB2E4\uC5B4 +luo=\uB8E8\uC624\uC5B4 +lus=\uB8E8\uC0E4\uC774\uC5B4 +mac=\uB9C8\uCF00\uB3C4\uB2C8\uC544\uC5B4 +mad=\uBAA8\uB85C\uCF54 \uB514\uB818 +mag=\uB9C8\uAC00\uD788 +mah=\uB9D0\uC0B4\uB808\uC2A4\uC5B4 +mai=\uB9C8\uC774\uD2F8\uB9AC +mak=\uB9C8\uCE74\uC0AC\uC5B4 +mal=\uB9D0\uB77C\uC584\uB78C\uC5B4 +man=\uB9CC\uB529\uACE0\uC5B4 +mao=\uB9C8\uC624\uB9AC\uC5B4 +map=\uB0A8\uB3C4\uC5B4 +mar=\uB9C8\uB77C\uD2F0\uC5B4 +mas=\uB9C8\uC0AC\uC774\uC5B4 +may=\uB9D0\uB808\uC774\uC5B4 +mdf=\uBAA8\uD06C\uC0E4\uC5B4 +mdr=\uB9CC\uB2E4\uB974\uC5B4 +men=\uBA58\uB370\uC5B4 +mga=\uC544\uC77C\uB79C\uB4DC\uC5B4, \uC911\uC138(900 - 1200\uB144) +mic=\uBBF8\uD06C\uB9E5\uC5B4 +min=\uBBF8\uB0AD\uCE74\uBC14\uC6B0 +mis=\uAE30\uD0C0 \uC5B8\uC5B4 +mkh=\uBAAC\uD06C\uBA54\uB974\uC5B4 (\uAE30\uD0C0) +mlg=\uB9C8\uB2E4\uAC00\uC2A4\uCE74\uB974\uC5B4 +mlt=\uBAB0\uD0C0\uC5B4 +mnc=\uB9CC\uC8FC\uC5B4 +mni=\uB9C8\uB2C8\uD478\uB9AC\uC5B4 +mno=\uB9C8\uB178\uBCF4\uC5B4 +moh=\uBAA8\uD638\uD06C\uC5B4 +mon=\uBABD\uACE8\uC5B4 +mos=\uBAA8\uC2DC\uC5B4 +mul=\uB2E4\uC911 \uC5B8\uC5B4 +mun=\uBB38\uB2E4\uC5B4 +mus=\uD06C\uB9AC\uD06C\uC5B4 +mwl=\uBBF8\uB780\uB370\uC5B4 +mwr=\uB9C8\uB974\uC640\uB9AC\uC5B4 +myn=\uB9C8\uC57C\uC5B4 +myv=\uC5D8\uC988\uC57C\uC5B4 +nah=\uB098\uC6B0\uC544\uD2C0\uC5B4 +nai=\uBD81\uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC5B8\uC5B4 (\uAE30\uD0C0) +nap=\uB098\uD3F4\uB9AC\uC5B4 +nau=\uB098\uC6B0\uB8E8\uC5B4 +nav=\uB098\uBC14\uD638\uC5B4 +nbl=\uB370\uBCA0\uB808\uC5B4, \uB0A8\uBD80 +nde=\uB370\uBCA0\uB808\uC5B4, \uBD81\uBD80 +ndo=\uC740\uB3D9\uAC00\uC5B4 +nds=\uC800\uC9C0 \uB3C5\uC77C\uC5B4 +nep=\uB124\uD314\uC5B4 +new=\uB124\uC640\uB974\uC5B4 +nia=\uB2C8\uC544\uC2A4\uC5B4 +nic=\uB2C8\uCE74\uB77C\uACFC \uCF54\uB974\uB3C4\uBC14 +niu=\uB2C8\uC6E8\uC5B8\uC5B4 +nno=\uB178\uB974\uC6E8\uC774\uC5B4(\uB2C8\uB178\uB974\uC2A4\uD06C) +nob=\uB178\uB974\uC6E8\uC774\uC5B4(\uBD81\uBAB0) +nog=\uB178\uAC00\uC774\uC5B4 +non=\uB178\uB974\uC6E8\uC774, \uACE0\uB300 +nor=\uB178\uB974\uC6E8\uC774\uC5B4 +nqo=\uC751\uCF54\uC5B4 +nso=\uC18C\uD1A0\uC5B4(\uBD81\uBD80) +nub=\uB204\uBE44\uC548\uC5B4 +nwc=\uB124\uC640\uB974\uC5B4 (\uACE0\uC804) +nya=\uCE58\uCCB4\uC640\uC5B4 +nym=\uB2C8\uC554\uC6E8\uC9C0\uC5B4 +nyn=\uB2C8\uC548\uCF5C\uC5B4 +nyo=\uB274\uB85C\uC5B4 +nzi=\uB290\uC9C0\uB9C8\uC5B4 +oci=\uC625\uC2DC\uD2B8\uC5B4(1500\uB144 \uC774\uD6C4) +oji=\uC624\uC9C0\uBE0C\uC640\uC5B4 +ori=\uC624\uB9AC\uC57C\uC5B4 +orm=\uC624\uB85C\uBAA8\uC5B4 +osa=\uC624\uC138\uC774\uC9C0\uC5B4 +oss=\uC624\uC138\uD2F0\uC548\uC5B4 +ota=\uD130\uD0A4\uC5B4, \uC624\uC2A4\uB9CC(1500-1928) +oto=\uC624\uD1A0\uBBF8\uC548\uC5B4 +paa=\uD30C\uD478\uC544\uC5B4(\uAE30\uD0C0) +pag=\uD310\uAC00\uC2DC\uB09C\uC5B4 +pal=\uD314\uB808\uBE44\uC5B4 +pam=\uD31C\uD321\uAC00\uC5B4 +pan=\uD380\uC7A1\uC5B4 +pap=\uD30C\uD53C\uC544\uBA3C\uD1A0\uC5B4 +pau=\uD30C\uB77C\uC6B0\uC548\uC5B4 +peo=\uACE0\uB300 \uD398\uB974\uC2DC\uC544\uC5B4 +per=\uD398\uB974\uC2DC\uC544\uC5B4 +phi=\uD544\uB9AC\uD540\uC5B4(\uAE30\uD0C0) +phn=\uD398\uB2C8\uD0A4\uC544\uC5B4 +pli=\uD314\uB9AC\uC5B4 +pol=\uD3F4\uB780\uB4DC\uC5B4 +pon=\uD3FC\uD398\uC774\uC5B4 +por=\uD3EC\uB974\uD22C\uCE7C\uC5B4 +pra=\uD504\uB77C\uD06C\uB9AC\uD2B8\uC5B4 +pro=\uACE0\uB300 \uD504\uB85C\uBC29\uC2A4\uC5B4 +pus=\uD30C\uC288\uD1A0(\uD30C\uC288\uD1A0\uC5B4) +que=\uCF00\uCD94\uC544\uC5B4 +raj=\uB77C\uC790\uC2A4\uD0C4\uC5B4 +rap=\uB77C\uD30C\uB274\uC774 +rar=\uB77C\uB85C\uD1B5\uAC00\uC5B4 +roa=\uB85C\uB9DD\uC2A4\uC5B4(\uAE30\uD0C0) +roh=\uB85C\uB9DD\uC288\uC5B4 +rom=\uC9D1\uC2DC\uC5B4 +rum=\uB8E8\uB9C8\uB2C8\uC544\uC5B4 +run=\uB8EC\uB514\uC5B4 +rup=\uC544\uB85C\uB9C8\uB2C8\uC544\uC5B4 +rus=\uB7EC\uC2DC\uC544\uC5B4 +sad=\uC0B0\uB2E4\uC6E8\uC5B4 +sag=\uC0B0\uACE0\uC5B4 +sah=\uC57C\uD050\uD2B8\uC5B4 +sai=\uB0A8\uC544\uBA54\uB9AC\uCE74 \uC778\uB514\uC5B8\uC5B4 (\uAE30\uD0C0) +sal=\uC0D0\uB9AC\uC2DC\uC5B4\uC5B4 +sam=\uC0AC\uB9C8\uB9AC\uC544 \uC544\uB78D\uC5B4 +san=\uC0B0\uC2A4\uD06C\uB9AC\uD2B8\uC5B4 +sas=\uC0AC\uC0AC\uD06C\uC5B4 +sat=\uC0B0\uD0C8\uB9AC\uC5B4 +scn=\uC2DC\uCE60\uB9AC\uC544\uC5B4 +sco=\uC2A4\uCF54\uD2C0\uB79C\uB4DC\uC5B4 +sel=\uC140\uCFE0\uD504\uC5B4 +sem=\uC148\uC5B4(\uAE30\uD0C0) +sga=\uC544\uC77C\uB79C\uB4DC, \uACE0\uB300 (900\uB144\uAE4C\uC9C0) +sgn=\uC218\uD654 +shn=\uC0E8\uC5B4 +sid=\uC2DC\uB2E4\uBAA8\uC5B4 +sin=\uC2A4\uB9AC\uB791\uCE74\uC5B4 +sio=\uC218\uC871\uC5B4 +sit=\uC2AC\uB85C\uBCA0\uB2C8\uC544 \uD1A8\uB77C\uB974 +sla=\uC2AC\uB77C\uBE0C\uC5B4 +slo=\uC2AC\uB85C\uBC14\uD0A4\uC544\uC5B4 +slv=\uC2AC\uB85C\uBCA0\uB2C8\uC544\uC5B4 +sma=\uB0A8\uBD80 \uC0AC\uBBF8\uC5B4 +sme=\uBD81\uBD80 \uC0AC\uBBF8\uC5B4 +smi=\uC0AC\uBBF8\uC5B4 (\uAE30\uD0C0) +smj=\uB8F0\uB808 \uC0AC\uBBF8\uC5B4 +smn=\uC774\uB098\uB9AC \uC0AC\uBBF8\uC5B4 +smo=\uC0AC\uBAA8\uC544\uC5B4 +sms=\uC2A4\uCF5C\uD2B8 \uC0AC\uBBF8\uC5B4 +sna=\uC1FC\uB098\uC5B4 +snd=\uC2E0\uB514\uC5B4 +snk=\uC18C\uB2CC\uCF00\uC5B4 +sog=\uC18C\uADF8\uB514\uC5D4\uC5B4 +som=\uC18C\uB9D0\uB9AC\uC544\uC5B4 +son=\uC1A1\uAC00\uC774\uC871\uC5B4 +sot=\uC18C\uD1A0\uC5B4, \uB0A8\uBD80 +spa=\uC2A4\uD398\uC778\uC5B4 +srd=\uC0AC\uB974\uB514\uB2C8\uC544\uC5B4 +srn=\uC2A4\uB77C\uB09C \uD1B5\uAC00\uC5B4 +srp=\uC138\uB974\uBE44\uC544\uC5B4 +srr=\uC138\uB808\uB974\uC5B4 +ssa=\uB2C8\uB85C-\uC0AC\uD558\uB78C\uC5B4 (\uAE30\uD0C0) +ssw=\uC2DC\uC2A4\uC640\uD2F0\uC5B4 +suk=\uC218\uCFE0\uB9C8\uC871\uC5B4 +sun=\uC21C\uB2E8\uC5B4 +sus=\uC218\uC218\uC5B4 +sux=\uC218\uBA54\uB974\uC5B4 +swa=\uC2A4\uC640\uD790\uB9AC\uC5B4 +swe=\uC2A4\uC6E8\uB374\uC5B4 +syc=\uC2DC\uB9AC\uC544\uC5B4(\uACE0\uC804) +syr=\uC2DC\uB9AC\uC544\uC5B4 +tah=\uD0C0\uD788\uD2F0\uC548\uC5B4 +tai=\uD0DC\uAD6D\uC5B4(\uAE30\uD0C0) +tam=\uD0C0\uBC00\uC5B4 +tat=\uD0C0\uD0C0\uB974\uC5B4 +tel=\uD154\uB8E8\uAD6C\uC5B4 +tem=\uD300\uB2C8\uC5B4 +ter=\uD14C\uB808\uB178\uC5B4 +tet=\uD14C\uD23C\uC5B4 +tgk=\uD0C0\uC9C0\uD0A4\uC2A4\uD0C4\uC5B4 +tgl=\uD0C0\uAC08\uB85C\uADF8\uC5B4 +tha=\uD0DC\uAD6D\uC5B4 +tib=\uD2F0\uBCA0\uD2B8\uC5B4 +tig=\uD2F0\uADF8\uB808\uC5B4 +tir=\uD2F0\uADF8\uB9AC\uB0D0\uC5B4 +tiv=\uD2F0\uBE44\uC5B4 +tkl=\uD1A0\uCF08\uB77C\uC6B0\uC81C\uB3C4 +tlh=\uD074\uB9C1\uC628\uC5B4 +tli=\uD2C0\uB9C1\uAE43\uC871\uC5B4 +tmh=\uD0C0\uB9C8\uC139\uC5B4 +tog=\uD1B5\uAC00\uC5B4(\uB2C8\uC544\uC0B4\uB79C\uB4DC) +ton=\uD1B5\uAC00\uC5B4(\uD1B5\uAC00 \uC12C) +tpi=\uD1A0\uD06C \uD53C\uC2E0\uC5B4 +tsi=\uD2B8\uC2EC\uC2DC\uC548\uC5B4 +tsn=\uC138\uCE20\uC640\uB098\uC5B4 +tso=\uD1B5\uAC00\uC5B4 +tuk=\uD22C\uB974\uD06C\uBA58\uC5B4 +tum=\uD23C\uBD80\uCE74\uC5B4 +tup=\uD22C\uD53C\uC5B4 +tur=\uD130\uD0A4\uC5B4 +tut=\uC54C\uD0C0\uC774\uC81C\uC5B4 (\uAE30\uD0C0) +tvl=\uD22C\uBC1C\uB8E8\uC5B4 +twi=\uD2B8\uC704\uC5B4 +tyv=\uD22C\uBE44\uB2C8\uC548\uC5B4 +udm=\uC6B0\uB4DC\uB9D0\uD2B8\uC5B4 +uga=\uC6B0\uAC00\uB9AC\uD2B8 \uBB38\uC790 +uig=\uC704\uAD6C\uB974\uC5B4 +ukr=\uC6B0\uD06C\uB77C\uC774\uB098\uC5B4 +umb=\uC724\uBC88\uB450\uC5B4 +und=\uACB0\uC815\uB418\uC9C0\uC54A\uC74C +urd=\uC6B0\uB974\uB450\uC5B4 +uzb=\uC6B0\uC988\uBCA0\uD06C\uC5B4 +vai=\uBC14\uC774 \uBB38\uC790 +ven=\uBCA4\uB2E4\uC5B4 +vie=\uBCA0\uD2B8\uB0A8\uC5B4 +vol=\uBCFC\uB77C\uD4CC\uD06C\uC5B4 +vot=\uBCF4\uD2F1\uC5B4 +wak=\uC640\uCE74\uC0E8\uC5B4 +wal=\uC640\uB77C\uBAA8\uC5B4 +war=\uC640\uB77C\uC774\uC5B4 +was=\uC640\uC1FC\uC5B4 +wel=\uC6E8\uC77C\uC2A4\uC5B4 +wen=\uC18C\uB974\uBE0C\uC5B4 +wln=\uC648\uB8EC\uC5B4 +wol=\uC62C\uB85C\uD504\uC5B4 +xal=\uCE7C\uBBF8\uD06C\uC5B4 +xho=\uBC18\uD22C\uC5B4(\uB0A8\uC544\uD504\uB9AC\uCE74) +yao=\uC57C\uC624\uC871\uC5B4 +yap=\uC58D\uD398\uC138\uC5B4 +yid=\uC774\uB514\uC2DC\uC5B4 +yor=\uC694\uB8E8\uBC14\uC5B4 +ypk=\uC57C\uD53D\uC5B4 +zap=\uC0AC\uD3EC\uD14C\uD06C\uC5B4 +zbl=\uBE14\uB9AC\uC2A4\uAE30\uD638 \uBB38\uC790 +zen=\uC81C\uB098\uAC00\uC5B4 +zha=\uC8FC\uC559\uC5B4 +znd=\uC544\uC794\uB370\uC871\uC5B4 +zul=\uC904\uB8E8\uC5B4 +zun=\uC8FC\uB2C8\uC5B4 +zxx=\uC5B8\uC5B4 \uCF58\uD150\uCE20 \uC5C6\uC74C +zza=\uC790\uC790\uC5B4 + +# script names +# key is ISO 15924 script code + +Arab=\uC544\uB78D \uBB38\uC790 +Armi=\uC81C\uAD6D \uC544\uB78C\uC5B4 +Armn=\uC544\uB974\uBA54\uB2C8\uC544 \uBB38\uC790 +Avst=\uC544\uBCA0\uC2A4\uD0C0\uC5B4 +Bali=\uBC1C\uB9AC \uBB38\uC790 +Bamu=\uBC14\uBB44\uC5B4 +Bass=\uBC14\uC0AC\uC5B4 +Batk=\uBC14\uD0C0\uD06C \uBB38\uC790 +Beng=\uBCB5\uACE8 \uBB38\uC790 +Blis=\uBE14\uB9AC\uC2A4\uAE30\uD638 \uBB38\uC790 +Bopo=\uC8FC\uC74C\uBD80\uD638 +Brah=\uBE0C\uB77C\uBBF8 +Brai=\uBE0C\uB77C\uC720 \uC810\uC790 +Bugi=\uBD80\uAE30 \uBB38\uC790 +Buhd=\uBD80\uD788\uB4DC \uBB38\uC790 +Cakm=\uCC28\uD06C\uB9C8\uC5B4 +Cans=\uD1B5\uD569 \uCE90\uB098\uB2E4 \uD1A0\uCC29\uC5B4 +Cari=\uCE74\uB9AC \uBB38\uC790 +Cham=\uCE78 \uACE0\uC5B4 +Cher=\uCCB4\uB85C\uD0A4 \uBB38\uC790 +Cirt=\uD0A4\uB974\uC4F0 +Copt=\uCF65\uD2B8 \uBB38\uC790 +Cprt=\uD0A4\uD504\uB85C\uC2A4 \uBB38\uC790 +Cyrl=\uD0A4\uB9B4 \uBB38\uC790 +Cyrs=\uACE0\uB300\uAD50\uD68C\uC2AC\uB77C\uBE0C\uC5B4 \uD0A4\uB9B4\uBB38\uC790 +Deva=\uB370\uBC14\uB098\uAC00\uB9AC \uBB38\uC790 +Dsrt=\uB514\uC800\uB81B \uBB38\uC790 +Dupl=\uB4C0\uD50C\uB85C\uC774\uC548 \uC18D\uAE30 +Egyd=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uBBFC\uC911\uBB38\uC790 +Egyh=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uC2E0\uAD00\uBB38\uC790 +Egyp=\uACE0\uB300 \uC774\uC9D1\uD2B8 \uC2E0\uC131\uBB38\uC790 +Elba=\uC5D8\uBC14\uC0B0\uC5B4 +Ethi=\uC5D0\uD2F0\uC624\uD53C\uC544 \uBB38\uC790 +Geok=\uCFE0\uCD94\uB9AC\uC5B4 +Geor=\uADF8\uB8E8\uC9C0\uC57C \uBB38\uC790 +Glag=\uAE00\uB77C\uACE8 \uBB38\uC790 +Goth=\uACE0\uD2B8 \uBB38\uC790 +Gran=\uADF8\uB780\uD0C0\uC5B4 +Grek=\uADF8\uB9AC\uC2A4 \uBB38\uC790 +Gujr=\uAD6C\uC790\uB77C\uD2B8 \uBB38\uC790 +Guru=\uAD6C\uB974\uBB34\uD0A4 \uBB38\uC790 +Hang=\uD55C\uAE00 +Hani=\uD55C\uC790 +Hano=\uD558\uB204\uB204 \uBB38\uC790 +Hans=\uD55C\uC790(\uAC04\uCCB4) +Hant=\uD55C\uC790(\uBC88\uCCB4) +Hebr=\uD788\uBE0C\uB9AC \uBB38\uC790 +Hira=\uD788\uB77C\uAC00\uB098 +Hmng=\uD30C\uD654 \uD750\uBABD +Hrkt=\uAC00\uD0C0\uCE74\uB098/\uD788\uB77C\uAC00\uB098 +Hung=\uACE0\uB300 \uD5DD\uAC00\uB9AC \uBB38\uC790 +Inds=\uC778\uB354\uC2A4 \uBB38\uC790 +Ital=\uACE0\uB300 \uC774\uD0C8\uB9AC\uC544 \uBB38\uC790 +Java=\uC790\uBC14 \uBB38\uC790 +Jpan=\uC77C\uBCF8 \uBB38\uC790 +Kali=\uCE74\uC57C \uB9AC \uBB38\uC790 +Kana=\uAC00\uD0C0\uCE74\uB098 +Khar=\uCE74\uB85C\uC288\uD2F0 \uBB38\uC790 +Khmr=\uD06C\uBA54\uB974 \uBB38\uC790 +Knda=\uCE78\uB098\uB2E4 \uBB38\uC790 +Kore=\uD55C\uAD6D\uC5B4 +Kpel=\uD06C\uD3A0\uB808\uC5B4 +Kthi=\uCE74\uC774\uD2F0\uC5B4 +Lana=\uB780\uB098 \uBB38\uC790 +Laoo=\uB77C\uC624 \uBB38\uC790 +Latf=\uB3C5\uC77C\uC2DD \uB85C\uB9C8\uC790 +Latg=\uC544\uC77C\uB79C\uB4DC\uC2DD \uB85C\uB9C8\uC790 +Latn=\uB85C\uB9C8\uC790 +Lepc=\uB819\uCC28 \uBB38\uC790 +Limb=\uB9BC\uBD80 \uBB38\uC790 +Lina=\uC120\uD615 \uBB38\uC790 A +Linb=\uC120\uD615 \uBB38\uC790 B +Lisu=\uB9AC\uC218\uC5B4 +Loma=\uB85C\uB9C8\uC5B4 +Lyci=\uB9AC\uD0A4\uC544 \uBB38\uC790 +Lydi=\uB9AC\uB514\uC544 \uBB38\uC790 +Mand=\uB9CC\uB2E4\uC774\uC544 \uBB38\uC790 +Mani=\uB9C8\uB2C8\uC5B4 +Maya=\uB9C8\uC57C \uC0C1\uD615 \uBB38\uC790 +Mend=\uBA58\uB370\uC5B4 +Merc=\uBA54\uB85C\uC5D0 \uBB38\uC790 \uD758\uB9BC +Mero=\uBA54\uB85C\uC5D0 \uBB38\uC790 +Mlym=\uB9D0\uB77C\uC584\uB78C \uBB38\uC790 +Mong=\uBABD\uACE8 \uBB38\uC790 +Moon=\uBB38\uC2DD \uC120\uBB38\uC790 +Mtei=\uBA54\uC774\uD14C\uC774\uC5B4 +Mymr=\uBBF8\uC580\uB9C8 \uBB38\uC790 +Narb=\uACE0\uB300 \uBD81\uC544\uB77C\uBE44\uC544\uC5B4 +Nbat=\uB098\uBC14\uD2F0\uC544\uC5B4 +Nkgb=\uB098\uC2DC \uAC8C\uBC14\uC5B4 +Nkoo=\uC751\uCF54\uC5B4 +Ogam=\uC624\uAC80 \uBB38\uC790 +Olck=\uC62C\uCE58\uD0A4\uC5B4 +Orkh=\uC624\uB974\uD63C\uC5B4 +Orya=\uC624\uB9AC\uC57C \uBB38\uC790 +Osma=\uC624\uC2A4\uB9C8\uB2C8\uC544 \uBB38\uC790 +Palm=\uD314\uBBF8\uB77C\uC5B4 +Perm=\uACE0\uB300 \uD398\uB984 \uBB38\uC790 +Phag=\uD30C\uC2A4\uD30C\uC5B4 +Phli=\uCD08\uAE30 \uD314\uB808\uBE44\uC5B4 +Phlp=\uC911\uAE30 \uD314\uB808\uBE44\uC5B4 +Phlv=\uD6C4\uAE30 \uD314\uB808\uBE44\uC5B4 +Phnx=\uD398\uB2C8\uD0A4\uC544\uC5B4 +Plrd=\uBA00\uC624\uC5B4 +Prti=\uD30C\uB974\uD2F0\uC544 \uBB38\uC790 +Rjng=\uB808\uC7A5\uC5B4 +Roro=\uB871\uACE0\uB871\uACE0\uC5B4 +Runr=\uB8EC \uBB38\uC790 +Samr=\uC0AC\uB9C8\uB9AC\uC544\uC5B4 +Sara=\uC0AC\uB77C\uD2F0\uC5B4 +Sarb=\uACE0\uB300 \uB0A8\uC544\uB77C\uBE44\uC544\uC5B4 +Saur=\uC0AC\uC6B0\uB77C\uC288\uD2B8\uB77C\uC5B4 +Sgnw=\uC218\uD654 \uBB38\uC790 +Shaw=\uC0E4\uBE44\uC548 \uBB38\uC790 +Sind=\uC2E0\uB514\uC5B4 +Sinh=\uC2A4\uB9AC\uB791\uCE74\uC5B4 +Sund=\uC21C\uB2E8\uC5B4 +Sylo=\uC2E4\uD5E4\uD2F0 \uB098\uAC00\uB9AC +Syrc=\uC2DC\uB9AC\uC544 \uBB38\uC790 +Syre=\uC5D0\uC2A4\uD2B8\uB791\uAC94\uB85C\uC2DD \uC2DC\uB9AC\uC544 \uBB38\uC790 +Syrj=\uC11C\uBD80 \uC2DC\uB9AC\uC544 \uBB38\uC790 +Syrn=\uB3D9\uBD80 \uC2DC\uB9AC\uC544 \uBB38\uC790 +Tagb=\uD0C0\uADF8\uBC18\uC640 \uBB38\uC790 +Tale=\uD0C0\uC774 \uB808 \uBB38\uC790 +Talu=\uC2E0 \uD0C0\uC774 \uB8E8\uC5D0 +Taml=\uD0C0\uBC00 \uBB38\uC790 +Tavt=\uD0C0\uC774 \uBE44\uC5E3\uC5B4 +Telu=\uD154\uB8E8\uAD6C \uBB38\uC790 +Teng=\uD161\uACFC\uB974 \uBB38\uC790 +Tfng=\uD2F0\uD53C\uB098\uADF8 \uBB38\uC790 +Tglg=\uD0C0\uAC08\uB85C\uADF8 \uBB38\uC790 +Thaa=\uD0C0\uB098 \uBB38\uC790 +Thai=\uD0C0\uC774 \uBB38\uC790 +Tibt=\uD2F0\uBCA0\uD2B8 \uBB38\uC790 +Ugar=\uC6B0\uAC00\uB9AC\uD2B8 \uBB38\uC790 +Vaii=\uBC14\uC774 \uBB38\uC790 +Visp=\uC2DC\uD654 \uBB38\uC790 +Wara=\uC640\uB8FD \uC2DC\uD2F0\uC5B4 +Xpeo=\uACE0\uB300 \uD398\uB974\uC2DC\uC544 \uBB38\uC790 +Xsux=\uC218\uBA54\uB974-\uC544\uCE74\uB4DC \uC124\uD615 \uBB38\uC790 +Yiii=\uC774 \uBB38\uC790 +Zinh=\uC0C1\uC18D \uBB38\uC790 +Zmth=\uC218\uD559 \uD45C\uAE30 +Zsym=\uAE30\uD638 +Zxxx=\uC791\uC131\uB418\uC9C0 \uC54A\uC74C +Zyyy=\uC77C\uBC18 \uBB38\uC790 +Zzzz=\uAE30\uB85D\uB418\uC9C0 \uC54A\uC740 \uBB38\uC790(\uAD6C\uC804) + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=\ub0a8\uc544\ud504\ub9ac\uce74 ZM=\uc7a0\ube44\uc544 ZW=\uc9d0\ubc14\ube0c\uc6e8 + +# territory names +# key is UN M.49 country and area code + +001=\uC138\uACC4 +002=\uC544\uD504\uB9AC\uCE74 +003=\uBD81\uC544\uBA54\uB9AC\uCE74 +005=\uB0A8\uC544\uBA54\uB9AC\uCE74[\uB0A8\uBBF8] +009=\uC624\uC138\uC544\uB2C8\uC544, \uB300\uC591\uC8FC +011=\uC11C\uC544\uD504\uB9AC\uCE74 +013=\uC911\uC559 \uC544\uBA54\uB9AC\uCE74 +014=\uB3D9\uBD80 \uC544\uD504\uB9AC\uCE74 +015=\uBD81\uBD80 \uC544\uD504\uB9AC\uCE74 +017=\uC911\uBD80 \uC544\uD504\uB9AC\uCE74 +018=\uB0A8\uBD80 \uC544\uD504\uB9AC\uCE74 +019=\uC544\uBA54\uB9AC\uCE74 \uB300\uB959 +021=\uBD81\uBD80 \uC544\uBA54\uB9AC\uCE74 +029=\uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4 +030=\uB3D9\uC544\uC2DC\uC544 +034=\uB0A8\uC544\uC2DC\uC544 +035=\uB3D9\uB0A8 \uC544\uC2DC\uC544 +039=\uB0A8\uC720\uB7FD +053=\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544\uC640 \uB274\uC9C8\uB79C\uB4DC +054=\uBA5C\uB77C\uB124\uC2DC\uC544 +057=\uB9C8\uC774\uD06C\uB85C\uB124\uC2DC\uC544 \uC9C0\uC5ED +061=\uD3F4\uB9AC\uB124\uC2DC\uC544 +142=\uC544\uC2DC\uC544 +143=\uC911\uC559 \uC544\uC2DC\uC544 +145=\uC11C\uC544\uC2DC\uC544 +150=\uC720\uB7FD +151=\uB3D9\uC720\uB7FD +154=\uBD81\uC720\uB7FD +155=\uC11C\uC720\uB7FD +419=\uB77C\uD2F4 \uC544\uBA54\uB9AC\uCE74 \uBC0F \uCE74\uB9AC\uBE0C \uD574 \uC81C\uB3C4 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,6 +227,643 @@ zh=kinesiska zu=zulu +# key is ISO 639.2 language code +aar=Afar +abk=Abchasiska +ace=Acehnesiska +ach=Acoli +ada=Adangme +ady=Adygeiska +afa=Afroasiatiskt spr\u00E5k +afh=Afrihili +afr=Afrikaans +ain=Ainu +aka=Akan +akk=Akkadiska +alb=Albanska +ale=Aleutiska +alg=Algonkinska +alt=Sydaltaiska +amh=Amhariska +ang=Fornengelska (ca.450-1100) +anp=Angika +apa=Apache +ara=Arabiska +arc=Officiell arameiska (700-300 f.Kr.) +arg=Aragonsk spanska +arm=Armeniska +arn=Mapudungun +arp=Arapaho +art=Artificiellt +arw=Arawakiska +asm=Assamesiska +ast=Asturiska +ath=Athabaskiska +aus=Australiska +ava=Avariskt spr\u00E5k +ave=Avestiska +awa=Awadhi +aym=Aymara +aze=Azerbajdzjanska +bad=Banda +bai=Bamileke +bak=Basjkiriska +bal=Baluchi +bam=Bambara +ban=Balinesiska +baq=Baskiska +bas=Basa +bat=Baltiskt spr\u00E5k +bej=Beyja +bel=Vitryska +bem=Bemba +ben=Bengali +ber=Berberspr\u00E5k +bho=Bhojpuri +bih=Bihari +bik=Bikol +bin=(Edo) Bini +bis=Bislama +bla=Svartfotindianernas spr\u00E5k (Siksika) +bnt=Bantuspr\u00E5k +bos=Bosniska +bra=Braj +bre=Bretonska +btk=Batak +bua=Burjatiska +bug=Buginesiska +bul=Bulgariska +bur=Burmesiska +byn=Blin +cad=Caddo +cai=Centralamerikanskt indianspr\u00E5k +car=Galibi Carib +cat=Katalanska +cau=Kaukasiskt spr\u00E5k +ceb=Cebuano +cel=Keltiskt spr\u00E5k +cha=Chamorro +chb=Chibcha +che=Tjetjenska +chg=Chagatai +chi=Kinesiska +chk=Truk +chm=Mari (Tjeremissiska) +chn=Chinook +cho=Choctaw +chp=Chopi +chr=Cherokesiska +chu=Kyrkoslaviska +chv=Tjuvasjiska +chy=Cheyenne +cmc=Chamic +cop=Koptiska +cor=Korniska +cos=Korsikanska +cpe=Kreol-/Pidginspr\u00E5k, engelskbaserade +cpf=Kreol-/Pidginspr\u00E5k, franskbaserade +cpp=Kreol-/Pidginspr\u00E5k, portugisiskbaserade +cre=Cree +crh=Krimtatariska +crp=Kreol-/Pidginspr\u00E5k +csb=Kashubiska +cus=Kusjitiskt spr\u00E5k +cze=Tjeckiska +dak=Dakota +dan=Danska +dar=Darginska +day=Land Dayak +del=Delaware +den=Slave (Athapaskiska) +dgr=Dogrib +din=Dinka +div=Divehi +doi=Dogri +dra=Dravidiskt spr\u00E5k +dsb=L\u00E5gsorbiska +dua=Duala +dum=Medelnederl\u00E4ndska (ca.1050-1350) +dut=Nederl\u00E4ndska +dyu=Dyula +dzo=Bhutanesiska (Dzongkha) +efi=Efik +egy=Fornegyptiska +eka=Ekajuk +elx=Elamitiska +eng=Engelska +enm=Medelengelska (1100-1500) +epo=Esperanto +est=Estniska +ewe=Ewe +ewo=Ewondo +fan=Fang +fao=F\u00E4r\u00F6iska +fat=Fanti +fij=Fidjianska +fil=Filipino +fin=Finska +fiu=Finsk-ugriskt spr\u00E5k +fon=Fon +fre=Franska +frm=Medelfranska (ca.1400-1600) +fro=Fornfranska (842-ca.1400) +frr=Nordfrisiska +frs=\u00D6stfrisiska +fry=V\u00E4stfrisiska +ful=Fulani +fur=Friuliska +gaa=Ga +gay=Gayo +gba=Gbaya +gem=Germanska +geo=Georgiska +ger=Tyska +gez=Geez +gil=Gilbertesiska +gla=Gaeliska +gle=Iriska +glg=Galiciska +glv=Manx +gmh=Medelh\u00F6gtyska (ca.1050-1500) +goh=Fornh\u00F6gtyska (ca.750-1050) +gon=Gondi +gor=Gorontalo +got=Gotiska +grb=Grebo +grc=Grekiska, klassisk (-1453) +gre=Nygrekiska (1453-) +grn=Guarani +gsw=Schweizertyska +guj=Gujarati +gwi=Gwichin +hai=Haida +hat=Haitiska +hau=Haussa +haw=Hawaiian +heb=Hebreiska +her=Herero +hil=Hiligaynon +him=Pahari (Himachali) +hin=Hindi +hit=Hettitiskt spr\u00E5k +hmn=Hmongspr\u00E5k +hmo=Hirimotu +hrv=Kroatiska +hsb=H\u00F6gsorbiska +hun=Ungerska +hup=Hupa +iba=Iban +ibo=Ibo (Igbo) +ice=Isl\u00E4ndska +ido=Ido +iii=Sichuan Yi +ijo=Ijo +iku=Inuktitut +ile=Interlingue +ilo=Iloko +ina=Interlingua (International Auxiliary Language Association) +inc=Indo-ariskt spr\u00E5k +ind=Indonesiska +ine=Indoeuropeiskt spr\u00E5k +inh=Ingusj +ipk=Inupiaq +ira=Iranska +iro=Irokesiska spr\u00E5k +ita=Italienska +jav=Javanesiska +jbo=Lojban +jpn=Japanska +jpr=Judepersiska +jrb=Judearabiska +kaa=Karakalpakiska +kab=Kabyliska +kac=Kachin +kal=Kalaallisut +kam=Kamba +kan=Kannada +kar=Karen +kas=Kashmiri +kau=Kanuri +kaw=Fornjavanska (Kawi) +kaz=Kazakiska +kbd=Kabardinska (\u00D6sttjerkessiska) +kha=Khasi +khi=Khoisanspr\u00E5k +khm=Central-Khmer +kho=Sakiska (Khotanesiska) +kik=Kikuyu +kin=Rwanda +kir=Kirgisiska +kmb=Mbundu (Kimbundu) +kok=Konkani +kom=Komi +kon=Kikongo +kor=Koreanska +kos=Kusaie +kpe=Kpelle +krc=Karachay-Balkar +krl=Karelska +kro=Kru-spr\u00E5k +kru=Kurukh +kua=Ovambo +kum=Kumyk +kur=Kurdiska +kut=Kutenai +lad=Ladino +lah=Lahnda +lam=Lamba +lao=Laotiska +lat=Latin +lav=Lettiska +lez=Lezginska +lim=Limburgisch +lin=Lingala +lit=Litauiska +lol=Lolo (Mongo) +loz=Lozi +ltz=Luxemburgiska +lua=Luba-Lulua +lub=Luba-Katanga +lug=Luganda +lui=Luiseno +lun=Lunda +luo=Luo (Kenya och Tanzania) +lus=Lushai +mac=Makedonska +mad=Madurese +mag=Magahi +mah=Marshallesiska +mai=Maithili +mak=Makasar +mal=Malayalam +man=Mande +mao=Maori +map=Austronesiskt spr\u00E5k +mar=Marathi +mas=Massajiska +may=Malajiska +mdf=Moksja +mdr=Mandar +men=Mende +mga=Medeliriska (900-1200) +mic=Mi'kmaq +min=Minangkabau +mis=Okodat +mkh=Mon-khmerspr\u00E5k +mlg=Malagassiska +mlt=Maltesiska +mnc=Manchu +mni=Manipuri +mno=Manobo +moh=Mohawk +mon=Mongoliska +mos=Mossi +mul=Flera +mun=Munda +mus=Muskogee +mwl=Mirandesiska +mwr=Marwari +myn=Maya-spr\u00E5k +myv=Erzya +nah=Nahuatl +nai=Nordamerikanskt indianspr\u00E5k +nap=Neapolitansk italienska +nau=Nauru +nav=Navajo +nbl=Ndebele (syd) +nde=Ndebele (nord) +ndo=Ndonga +nds=L\u00E5gtyska +nep=Nepali +new=Newari +nia=Nias +nic=Niger-/Kongospr\u00E5k +niu=Niuiska +nno=Norska (Nynorska) +nob=Bokm\u00E5l, norska +nog=Nogaiska +non=Fornisl\u00E4ndska +nor=Norska +nqo=N'Ko +nso=Pedi +nub=Nubiska +nwc=Klassisk newari +nya=Chichewa +nym=Nyamwezi +nyn=Nyankole +nyo=Nyoro +nzi=Nzima +oci=Occitanska (efter 1500) +oji=Odjibwa (Chippewa) +ori=Oriya +orm=Oromo +osa=Osage +oss=Ossetiska +ota=Ottomanska (1500-1928) +oto=Otomi +paa=Papuanskt spr\u00E5k +pag=Pangasinan +pal=Pahlavi (Medelpersiska) +pam=Pampanga +pan=Panjabi +pap=Papiamento +pau=Palauan +peo=Fornpersiska (ca.600-400 fK) +per=Persiska +phi=Filippinska +phn=Feniciska +pli=Pali +pol=Polska +pon=Pohnpeiska +por=Portugisiska +pra=Prakrit +pro=Fornprovensalska (-1500) +pus=Pashto +que=Quechua +raj=Rajasthani +rap=Rapanui +rar=Rarotongan +roa=Romanska +roh=R\u00E4toromanska +rom=Romani +rum=Rum\u00E4nska +run=Rundi +rup=Arumanska +rus=Ryska +sad=Sandawe +sag=Sango +sah=Jakutiska +sai=Sydamerikanskt indianspr\u00E5k +sal=Saliska +sam=Samaritanska +san=Sanskrit +sas=Sasak +sat=Santali +scn=Sicilianska +sco=Skotsk gaeliska +sel=Selkup +sem=Semitiskt spr\u00E5k +sga=Forniriska (-900) +sgn=Teckenspr\u00E5k +shn=Shan +sid=Sidami +sin=Singalesiska +sio=Sioux-spr\u00E5k +sit=Sino-tibetanskt spr\u00E5k +sla=Slaviskt spr\u00E5k +slo=Slovakiska +slv=Slovenska +sma=Sydsamiska +sme=Nordsamiska +smi=Samiska +smj=Lulesamiska +smn=Enaresamiska +smo=Samoanska +sms=Skoltsamiska +sna=Shona +snd=Sindhi +snk=Soninke +sog=Sogdiska +som=Somaliska +son=Songhai +sot=Sotho, syd- +spa=Spanska +srd=Sardiska +srn=Sranan tongo +srp=Serbiska +srr=Serer +ssa=Nilo-sahariskt spr\u00E5k +ssw=Swazi +suk=Sukuma +sun=Sundanesiska +sus=Susu +sux=Sumeriska +swa=Swahili +swe=Svenska +syc=Klassisk syriska +syr=Syriska +tah=Tahitiska +tai=Thaispr\u00E5k +tam=Tamil +tat=Tatariska +tel=Telugo +tem=Temne +ter=Tereno +tet=Tetum +tgk=Tadzjikiska +tgl=Tagalog +tha=Thail\u00E4ndska +tib=Tibetanska +tig=Tigr\u00E9 +tir=Tigrinja +tiv=Tivi +tkl=Tokelau\u00F6arna +tlh=Klingon +tli=Tlingit +tmh=Tamashek +tog=Tonga (Nyasa) +ton=Tonga (Tonga\u00F6arna) +tpi=Tok Pisin +tsi=Tsimshian +tsn=Tswana +tso=Tsonga +tuk=Turkmeniska +tum=Tumbuka +tup=Tupi +tur=Turkiska +tut=Altaiskt spr\u00E5k +tvl=Tuvalu +twi=Twi +tyv=Tuvinska +udm=Udmurtiska (Votjakiska) +uga=Ugaritiska +uig=Uiguriska +ukr=Ukrainska +umb=Umbundu +und=Obest\u00E4md +urd=Urdu +uzb=Uzbekiska +vai=Vai +ven=Venda +vie=Vietnamesiska +vol=Volap\u00FCk +vot=Votiska +wak=Wakusjiska +wal=Wolaitta +war=Waray +was=Washo +wel=Kymriska +wen=Sorbiska +wln=Vallonska +wol=Wolof +xal=Kalmuckiska +xho=Xhosa +yao=Yao +yap=Yap +yid=Jiddisch +yor=Yoruba +ypk=Yupik +zap=Zapotek +zbl=Blissymboler +zen=Zenaga +zha=Zhuang +znd=Zande +zul=Zulu +zun=Zuni +zxx=Icke-spr\u00E5kligt medium +zza=Zaza + +# script names +# key is ISO 15924 script code + +Arab=Arabiska +Armi=Riksarameiska +Armn=Armeniska +Avst=Avestiska +Bali=Balinesiska +Bamu=Bamum +Bass=Bassa vah +Batk=Batak +Beng=Bengali +Blis=Blissymboler +Bopo=Bopomofo +Brah=Brahmi +Brai=Braille-skrift +Bugi=Buginesiska +Buhd=Buhid +Cakm=Chakma +Cans=Unified Canadian Aboriginal Syllabics +Cari=Kariska +Cham=Cham +Cher=Cherokesiska +Cirt=Cirth +Copt=Koptiska +Cprt=Cypriotiska +Cyrl=Kyrilliska +Cyrs=Fornkyrkoslaviska +Deva=Devanagari +Dsrt=Deseret +Dupl=Duployan-stenografi +Egyd=Egyptisk demotisk +Egyh=Egyptisk hieratisk +Egyp=Egyptiska hieroglyfer +Elba=Elbasiska +Ethi=Etiopiska +Geok=Khutsuri +Geor=Georgiska +Glag=Glagolitiska +Goth=Gotiska +Gran=Grantha +Grek=Grekiska +Gujr=Gujarati +Guru=Gurmukhi +Hang=Hangul +Hani=Han +Hano=Hanunoo +Hans=F\u00F6renklad han +Hant=Traditionell han +Hebr=Hebreiska +Hira=Hiragana +Hmng=Pahawh hmong +Hrkt=Katakana eller hiragana +Hung=Ungerska runor +Inds=Indusskrift +Ital=Etruskiska +Java=Javanesiska +Jpan=Japanska +Kali=Kayah Li +Kana=Katakana +Khar=Kharoshthi +Khmr=Kambodjanska (Khmer) +Knda=Kannada +Kore=Koreanska +Kpel=Kpelle +Kthi=Kaithi +Lana=Tai tham +Laoo=Laotiska +Latf=Frakturlatin +Latg=Gaelisk latin +Latn=Latin +Lepc=Lepcha +Limb=Limbu +Lina=Linear A +Linb=Linear B +Lisu=Lisu +Loma=Loma +Lyci=Lykiska +Lydi=Lydiska +Mand=Mandeiska +Mani=Manikeiska +Maya=Mayaskrift +Mend=Mende +Merc=Meroitisk skrift +Mero=Meroitisk +Mlym=Malayalam +Mong=Mongoliska +Moon=M\u00E5nspr\u00E5k +Mtei=Meitei mayek +Mymr=Myanmar +Narb=Nordlig fornarabiska +Nbat=Nabataeiska +Nkgb=Nakhi geba +Nkoo=N'Ko +Ogam=Ogham +Olck=Ol chiki +Orkh=Orkhon +Orya=Oriya +Osma=Osmanya +Palm=Palmyreniska +Perm=Fornpermiska +Phag=Phags-pa +Phli=Pahlavi (Medelpersiska) +Phlp=Psalter pahlavi +Phlv=Bok-pahlavi +Phnx=Feniciska +Plrd=Miao +Prti=Partiska +Rjng=Rejang +Roro=Rongorongo +Runr=Runor +Samr=Samaritanska +Sara=Sarati +Sarb=Sydlig fornarabiska +Saur=Saurashtra +Sgnw=Teckenskrift +Shaw=Shavian +Sind=Sindhi +Sinh=Singalesiska +Sund=Sundanesiska +Sylo=Syloti nagri +Syrc=Syriska +Syre=Estrangelo-syriska +Syrj=V\u00E4stsyriska +Syrn=\u00D6stsyriska +Tagb=Tagbanwa +Tale=Tai le +Talu=Ny tai l\u00FC +Taml=Tamil +Tavt=Tai viet +Telu=Telugo +Teng=Tengwar +Tfng=Tifinagh +Tglg=Tagalog +Thaa=Thaana +Thai=Thail\u00E4ndska +Tibt=Tibetanska +Ugar=Ugaritiska +Vaii=Vai +Visp=Visible speech +Wara=Varang kshiti +Xpeo=Fornpersiska +Xsux=Sumerisk-akkadisk kilskrift +Yiii=Yi +Zinh=\u00C4rvd skrift +Zmth=Matematisk notation +Zsym=Symboler +Zxxx=Oskrivna +Zyyy=Inte fastst\u00E4lld skrift +Zzzz=Okodad skrift + # country names # key is ISO 3166 country code @@ -472,3 +1109,37 @@ ZA=Sydafrika ZM=Zambia ZW=Zimbabwe + +# territory names +# key is UN M.49 country and area code + +001=V\u00E4rlden +002=Afrika +003=Nordamerika +005=Sydamerika +009=Oceanien +011=V\u00E4stafrika +013=Centralamerika +014=\u00D6stafrika +015=Nordafrika +017=Mellanafrika +018=S\u00F6dra Afrika +019=Nord-/Sydamerika +021=Norra Amerika +029=Karibiska \u00F6v\u00E4rlden +030=\u00D6stra Asien +034=S\u00F6dra Asien +035=Syd\u00F6stra Asien +039=S\u00F6dra Europa +053=Australien och Nya Zeeland +054=Melanesien +057=Mikronesiska regionen +061=Polynesien +142=Asien +143=Centralasien +145=V\u00E4stra Asien +150=Europa +151=\u00D6stra Europa +154=Norra Europa +155=V\u00E4stra Europa +419=Latinamerika och Karibien diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,11 +227,642 @@ zh=\u4e2d\u6587 zu=\u7956\u9c81\u6587 +# key is ISO 639.2 language code +aar=\u963F\u6CD5\u5C14\u6587 +abk=\u963F\u5E03\u54C8\u897F\u4E9A\u6587 +ace=\u4E9A\u9F50\u6587 +ach=\u963F\u4E54\u5229\u6587 +ada=\u963F\u5F53\u6885\u6587 +ady=\u963F\u8FEA\u4F55\u6587 +afa=\u4E9A\u975E\u8BF8\u8BED\u8A00 +afh=\u963F\u5F17\u91CC\u5E0C\u5229\u6587 +afr=\u5357\u975E\u8377\u5170\u6587 +ain=\u963F\u4F0A\u52AA\u6587 +aka=\u5E93\u963F\u6587 +akk=\u963F\u5361\u5FB7\u6587 +alb=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u6587 +ale=\u963F\u7559\u7533\u6587 +alg=\u5176\u4ED6\u963F\u5C14\u8D21\u8BED\u7CFB +alt=\u5357\u963F\u5C14\u6CF0\u6587 +amh=\u963F\u59C6\u54C8\u62C9\u6587 +ang=\u53E4\u82F1\u6587 +anp=\u6602\u52A0\u8BED +apa=\u963F\u5E15\u5207\u6587 +ara=\u963F\u62C9\u4F2F\u6587 +arc=\u963F\u62C9\u7C73\u6587 +arg=\u963F\u62C9\u8D21\u6587 +arm=\u4E9A\u7F8E\u5C3C\u4E9A\u6587 +arn=\u9A6C\u666E\u5207\u6587 +arp=\u963F\u62C9\u5E15\u970D\u6587 +art=\u5176\u4ED6\u4EBA\u5DE5\u8BED\u7CFB +arw=\u963F\u62C9\u74E6\u514B\u6587 +asm=\u963F\u8428\u59C6\u6587 +ast=\u963F\u65AF\u56FE\u91CC\u4E9A\u601D\u7279\u6587 +ath=\u963F\u8428\u5E15\u65AF\u574E\u8BED\u7CFB +aus=\u6FB3\u5927\u5229\u4E9A\u8BED\u7CFB +ava=\u963F\u74E6\u5C14\u6587 +ave=\u963F\u7EF4\u65AF\u9640\u6587 +awa=\u963F\u74E6\u4E54\u6587 +aym=\u827E\u9A6C\u62C9\u6587 +aze=\u963F\u585E\u62DC\u7586\u6587 +bad=\u73ED\u8FBE\u6587 +bai=\u5DF4\u7C73\u7D2F\u514B\u8BED\u7CFB +bak=\u5DF4\u4EC0\u5BA2\u5C14\u6587 +bal=\u4FFE\u8DEF\u652F\u6587 +bam=\u73ED\u5DF4\u62C9\u6587 +ban=\u5DF4\u5398\u8BED +baq=\u5DF4\u65AF\u514B\u6587 +bas=\u5DF4\u8428\u6587 +bat=\u5176\u4ED6\u6CE2\u7F57\u7684\u8BED\u7CFB +bej=\u522B\u672D\u6587 +bel=\u767D\u4FC4\u7F57\u65AF\u6587 +bem=\u522B\u59C6\u5DF4\u6587 +ben=\u5B5F\u52A0\u62C9\u6587 +ber=\u67CF\u67CF\u5C14\u6587 +bho=\u535A\u6770\u666E\u5C14\u6587 +bih=\u6BD4\u54C8\u5C14\u6587 +bik=\u6BD5\u5E93\u5C14\u6587 +bin=\u6BD4\u5C3C\u6587 +bis=\u6BD4\u65AF\u62C9\u9A6C\u6587 +bla=\u53F8\u514B\u53F8\u5361\u6587 +bnt=\u73ED\u56FE\u6587 +bos=\u6CE2\u65AF\u5C3C\u4E9A\u6587 +bra=\u5E03\u62C9\u6770\u6587 +bre=\u5E03\u91CC\u591A\u5C3C\u6587 +btk=\u5DF4\u5854\u514B\u8BED +bua=\u5E03\u91CC\u4E9A\u7279\u6587 +bug=\u5E03\u5409\u8BED +bul=\u4FDD\u52A0\u5229\u4E9A\u6587 +bur=\u7F05\u7538\u6587 +byn=\u5E03\u6797\u6587 +cad=\u5361\u591A\u6587 +cai=\u5176\u4ED6\u4E2D\u7F8E\u5370\u7B2C\u5B89\u8BED\u7CFB +car=\u5DF4\u52D2\u6BD4\u6587 +cat=\u52A0\u6CF0\u7F57\u5C3C\u4E9A\u6587 +cau=\u5176\u4ED6\u9AD8\u52A0\u7D22\u8BED\u7CFB +ceb=\u5BBF\u52A1\u6587 +cel=\u5176\u4ED6\u51EF\u5C14\u7279\u8BED\u7CFB +cha=\u67E5\u83AB\u7F57\u6587 +chb=\u5951\u5E03\u5361\u6587 +che=\u8F66\u81E3\u6587 +chg=\u67E5\u52A0\u6587 +chi=\u4E2D\u6587 +chk=\u695A\u543E\u514B\u6587 +chm=\u9A6C\u91CC\u6587 +chn=\u5951\u52AA\u514B\u6587 +cho=\u4E54\u514B\u6258\u6587 +chp=\u4F69\u74E6\u626C\u6587 +chr=\u5F7B\u7F57\u57FA\u6587 +chu=\u6559\u4F1A\u65AF\u62C9\u592B\u6587 +chv=\u695A\u74E6\u4EC0\u6587 +chy=\u590F\u5EF6\u6587 +cmc=\u67E5\u7C73\u514B\u6587 +cop=\u79D1\u666E\u7279\u6587 +cor=\u5EB7\u6C83\u5C14\u6587 +cos=\u79D1\u897F\u5609\u6587 +cpe=\u5176\u4ED6\u4EE5\u82F1\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +cpf=\u5176\u4ED6\u4EE5\u6CD5\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +cpp=\u5176\u4ED6\u4EE5\u8461\u8404\u7259\u6587\u4E3A\u57FA\u7840\u7684\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +cre=\u514B\u91CC\u6587 +crh=\u514B\u91CC\u7C73\u4E9A\u5854\u5854\u6587 +crp=\u5176\u4ED6\u514B\u91CC\u5965\u5C14\u6DF7\u5408\u8BED\u7CFB +csb=\u5361\u8212\u6587 +cus=\u5176\u4ED6\u5E93\u65BD\u7279\u8BED\u7CFB +cze=\u6377\u514B\u6587 +dak=\u8FBE\u79D1\u4ED6\u6587 +dan=\u4E39\u9EA6\u6587 +dar=\u8FBE\u5C14\u683C\u74E6\u6587 +day=\u8FBE\u96C5\u514B\u6587 +del=\u7279\u62C9\u534E\u6587 +den=\u53F8\u96F7\u592B\u6587 (\u963F\u8428\u5E15\u65AF\u574E\u8BF8\u8BED\u8A00) +dgr=\u591A\u683C\u91CC\u5E03\u6587 +din=\u4E01\u5361\u6587 +div=\u8FEA\u7EF4\u5E0C\u6587 +doi=\u591A\u683C\u62C9\u6587 +dra=\u5176\u4ED6\u5FB7\u62C9\u7EF4\u8BED\u7CFB +dsb=\u4E0B\u7D22\u5E03\u6587 +dua=\u90FD\u963F\u62C9\u6587 +dum=\u4E2D\u53E4\u8377\u5170\u6587 +dut=\u8377\u5170\u6587 +dyu=\u8FEA\u5C24\u62C9\u6587 +dzo=\u4E0D\u4E39\u6587 +efi=\u57C3\u83F2\u514B\u6587 +egy=\u53E4\u57C3\u53CA\u6587 +eka=\u57C3\u514B\u4E18\u514B\u6587 +elx=\u827E\u62C9\u7C73\u7279\u6587 +eng=\u82F1\u6587 +enm=\u4E2D\u53E4\u82F1\u6587 +epo=\u4E16\u754C\u6587 +est=\u7231\u6C99\u5C3C\u4E9A\u6587 +ewe=\u57C3\u7EF4\u6587 +ewo=\u65FA\u675C\u6587 +fan=\u82B3\u683C\u6587 +fao=\u6CD5\u7F57\u6587 +fat=\u82B3\u8482\u6587 +fij=\u6590\u6D4E\u6587 +fil=\u83F2\u5F8B\u5BBE\u6587 +fin=\u82AC\u5170\u6587 +fiu=\u5176\u4ED6\u82AC\u5170\u4E4C\u6208\u5C14\u8BED\u7CFB +fon=\u4E30\u6587 +fre=\u6CD5\u6587 +frm=\u4E2D\u53E4\u6CD5\u6587 +fro=\u53E4\u6CD5\u6587 +frr=\u5317\u5F17\u91CC\u897F\u4E9A\u8BED +frs=\u4E1C\u5F17\u91CC\u897F\u4E9A\u6587 +fry=\u897F\u5F17\u91CC\u65AF\u5170\u8BED +ful=\u5BCC\u62C9\u6587 +fur=\u5F17\u7559\u5229\u6587 +gaa=\u52A0\u6587 +gay=\u8FE6\u7EA6\u6587 +gba=\u845B\u5DF4\u4E9A\u6587 +gem=\u5176\u4ED6\u65E5\u5C14\u66FC\u8BED\u7CFB +geo=\u683C\u9C81\u5409\u4E9A\u6587 +ger=\u5FB7\u6587 +gez=\u5409\u5179\u6587 +gil=\u5409\u5C14\u4F2F\u7279\u65AF\u6587 +gla=\u76D6\u5C14\u8BED +gle=\u7231\u5C14\u5170\u6587 +glg=\u52A0\u5229\u897F\u4E9A\u6587 +glv=\u9A6C\u6069\u6587 +gmh=\u4E2D\u53E4\u9AD8\u5730\u5FB7\u6587 +goh=\u53E4\u9AD8\u5730\u5FB7\u6587 +gon=\u5C97\u5FB7\u6587 +gor=\u79D1\u6D1B\u6D85\u8FBE\u7F57\u6587 +got=\u54E5\u7279\u6587 +grb=\u683C\u5217\u535A\u6587 +grc=\u53E4\u5E0C\u814A\u6587 +gre=\u5E0C\u814A\u8BED, \u73B0\u4EE3 (1453-) +grn=\u74DC\u62C9\u5C3C\u6587 +gsw=\u745E\u58EB\u5FB7\u6587 +guj=\u53E4\u52A0\u62C9\u63D0\u6587 +gwi=\u5409\u7EF4\u514B\u7434\u6587 +hai=\u6D77\u8FBE\u6587 +hat=\u6D77\u5730\u6587 +hau=\u8C6A\u6492\u6587 +haw=\u590F\u5A01\u5937\u6587 +heb=\u5E0C\u4F2F\u6765\u6587 +her=\u8D6B\u96F7\u7F57\u6587 +hil=\u5E0C\u5229\u76D6\u519C\u6587 +him=\u8D6B\u9A6C\u67E5\u5229\u6587 +hin=\u5370\u5730\u6587 +hit=\u8D6B\u68AF\u6587 +hmn=\u8D6B\u8499\u6587 +hmo=\u65B0\u91CC\u6728\u6258\u6587 +hrv=\u514B\u7F57\u5730\u4E9A\u6587 +hsb=\u4E0A\u7D22\u5E03\u6587 +hun=\u5308\u7259\u5229\u6587 +hup=\u80E1\u5E15\u6587 +iba=\u4F0A\u73ED\u6587 +ibo=\u4F0A\u535A\u6587 +ice=\u51B0\u5C9B\u6587 +ido=\u4F0A\u591A\u6587 +iii=\u56DB\u5DDD\u5F5D\u6587 +ijo=\u4F0A\u4E54\u6587 +iku=\u7231\u65AF\u57FA\u6469\u6587 +ile=\u62C9\u4E01\u56FD\u9645\u6587 +ilo=\u4F0A\u6D1B\u5E72\u8BFA\u6587 +ina=\u62C9\u4E01\u56FD\u9645\u8BED (\u56FD\u9645\u8F85\u52A9\u8BED\u8054\u76DF) +inc=\u5176\u4ED6\u5370\u5EA6\u8BED\u7CFB +ind=\u5370\u5EA6\u5C3C\u897F\u4E9A\u6587 +ine=\u5176\u4ED6\u5370\u6B27\u8BED\u7CFB +inh=\u5370\u53E4\u4EC0\u6587 +ipk=\u4F9D\u5974\u76AE\u7EF4\u514B\u6587 +ira=\u4F0A\u6717\u6587 +iro=\u4F0A\u6D1B\u9B41\u8BED\u7CFB +ita=\u610F\u5927\u5229\u6587 +jav=\u722A\u54C7\u6587 +jbo=\u903B\u8F91\u6587 +jpn=\u65E5\u6587 +jpr=\u72B9\u592A\u6CE2\u65AF\u6587 +jrb=\u72B9\u592A\u963F\u62C9\u4F2F\u6587 +kaa=\u5361\u62C9\u5361\u5C14\u5E15\u514B\u6587 +kab=\u5361\u6BD4\u5C14\u6587 +kac=\u5361\u7434\u6587 +kal=\u683C\u9675\u5170\u6587 +kam=\u5361\u59C6\u5DF4\u6587 +kan=\u5361\u7EB3\u5854\u514B\u8BED +kar=\u5580\u4F26\u6587 +kas=\u514B\u4EC0\u7C73\u5C14\u6587 +kau=\u5361\u52AA\u91CC\u6587 +kaw=\u5361\u5A01\u6587 +kaz=\u54C8\u8428\u514B\u6587 +kbd=\u5361\u5DF4\u5C14\u8FBE\u6587 +kha=\u5361\u897F\u6587 +khi=\u5176\u4ED6\u79D1\u4F0A\u6851\u8BED\u7CFB +khm=\u4E2D\u9AD8\u68C9\u8BED +kho=\u548C\u7530\u6587 +kik=\u5409\u5E93\u5C24\u6587 +kin=\u5362\u65FA\u8FBE\u6587 +kir=\u5409\u5C14\u5409\u65AF\u6587 +kmb=\u91D1\u90A6\u675C\u6587 +kok=\u521A\u5361\u5C3C\u6587 +kom=\u79D1\u7C73\u6587 +kon=\u521A\u679C\u6587 +kor=\u671D\u9C9C\u6587 +kos=\u79D1\u65AF\u62C9\u4F0A\u6587 +kpe=\u514B\u4F69\u52D2\u8BED +krc=\u5361\u62C9\u6070\u4F0A\u5DF4\u5C14\u5361\u5C14\u6587 +krl=\u5361\u7D2F\u5229\u963F\u6587 +kro=\u514B\u9C81\u6587 +kru=\u5E93\u9C81\u514B\u6587 +kua=\u5BBD\u4E9A\u739B\u8BED +kum=\u5E93\u6885\u514B\u6587 +kur=\u5E93\u5C14\u5FB7\u6587 +kut=\u5E93\u7279\u5185\u6587 +lad=\u62C9\u8FEA\u8BFA\u6587 +lah=\u62C9\u4EA8\u8FBE\u6587 +lam=\u5170\u5DF4\u6587 +lao=\u8001\u631D\u6587 +lat=\u62C9\u4E01\u6587 +lav=\u62C9\u6258\u7EF4\u4E9A\u6587 (\u5217\u6258) +lez=\u83B1\u5179\u4F9D\u6602\u6587 +lim=\u6797\u5821\u6587 +lin=\u6797\u52A0\u62C9\u6587 +lit=\u7ACB\u9676\u5B9B\u6587 +lol=\u8292\u6208\u6587 +loz=\u6D1B\u5179\u6587 +ltz=\u5362\u68EE\u5821\u6587 +lua=\u9C81\u5DF4\u9C81\u74E6\u6587 +lub=\u5362\u5DF4-\u52A0\u4E39\u52A0\u6587 +lug=\u5E72\u8FBE\u6587 +lui=\u8DEF\u6613\u585E\u8BFA\u6587 +lun=\u9686\u8FBE\u6587 +luo=\u5362\u5965\u6587 +lus=\u5362\u6652\u6587 +mac=\u9A6C\u5176\u987F\u6587 +mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6 +mag=\u9A6C\u52A0\u4F0A\u6587 +mah=\u9A6C\u7ECD\u5C14\u6587 +mai=\u8FC8\u8482\u5229\u6587 +mak=\u671B\u52A0\u9521\u6587 +mal=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587 +man=\u66FC\u4E01\u54E5\u6587 +mao=\u6BDB\u5229\u6587 +map=\u6FB3\u65AF\u7279\u7F57\u5C3C\u897F\u4E9A\u8BED\u7CFB +mar=\u9A6C\u62C9\u5730\u6587 +mas=\u8428\u4F0A\u8BED +may=\u9A6C\u6765\u6587 +mdf=\u83AB\u514B\u6C99\u6587 +mdr=\u66FC\u8FBE\u5C14 +men=\u95E8\u8FEA\u6587 +mga=\u4E2D\u53E4\u7231\u5C14\u5170\u6587 +mic=\u7C73\u514B\u9A6C\u514B\u6587 +min=\u7C73\u5357\u5361\u4FDD\u6587 +mis=\u5404\u79CD\u4E0D\u540C\u8BED\u7CFB +mkh=\u5176\u4ED6\u5B5F\u9AD8\u68C9\u8BED\u7CFB +mlg=\u9A6C\u5C14\u52A0\u4EC0\u6587 +mlt=\u9A6C\u8033\u4ED6\u6587 +mnc=\u6EE1\u6587 +mni=\u66FC\u5C3C\u666E\u91CC\u6587 +mno=\u9A6C\u8BFA\u535A\u8BED\u7CFB +moh=\u6469\u970D\u514B\u6587 +mon=\u8499\u53E4\u6587 +mos=\u83AB\u897F\u6587 +mul=\u591A\u79CD\u8BED\u7CFB +mun=\u8499\u8FBE\u8BED\u7CFB +mus=\u514B\u91CC\u514B\u6587 +mwl=\u7C73\u5170\u5FB7\u65AF\u6587 +mwr=\u9A6C\u5C14\u74E6\u5229\u6587 +myn=\u739B\u96C5\u8BED\u7CFB +myv=\u4FC4\u65E5\u4E9A\u6587 +nah=\u7EB3\u74E6\u7279\u5C14\u6587 +nai=\u5176\u4ED6\u5317\u7F8E\u5370\u7B2C\u5B89\u8BED\u7CFB +nap=\u62FF\u6CE2\u91CC\u6587 +nau=\u7459\u9C81\u6587 +nav=\u7EB3\u74E6\u970D\u6587 +nbl=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5357\u90E8 +nde=\u6069\u5FB7\u8D1D\u52D2\u8BED, \u5317\u90E8 +ndo=\u6069\u4E1C\u52A0\u6587 +nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u900A\u6587 +nep=\u5C3C\u6CCA\u5C14\u6587 +new=\u5C3C\u74E6\u5C14\u6587 +nia=\u5C3C\u4E9A\u65AF\u6587 +nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4 +niu=\u7EBD\u57C3\u6587 +nno=\u632A\u5A01\u5C3C\u8BFA\u65AF\u514B\u6587 +nob=\u632A\u5A01\u535A\u514B\u9A6C\u5C14\u8BED +nog=\u8BFA\u76D6\u6587 +non=\u53E4\u8BFA\u5C14\u65AF\u6587 +nor=\u632A\u5A01\u6587 +nqo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00) +nso=\u5317\u7D22\u6258\u6587 +nub=\u52AA\u6BD4\u4E9A\u8BED\u7CFB +nwc=\u5C3C\u74E6\u5C14\u6587 +nya=\u9F50\u5207\u74E6\u8BED +nym=\u5C3C\u4E9A\u59C6\u97E6\u9F50\u6587 +nyn=\u5C3C\u6602\u79D1\u52D2\u6587 +nyo=\u5C3C\u7EA6\u7F57\u6587 +nzi=\u6069\u6D4E\u9A6C\u6587 +oci=\u5965\u897F\u5766\u6587 (1500 \u540E) +oji=\u5965\u5409\u5E03\u74E6\u6587 +ori=\u6B27\u91CC\u4E9A\u6587 +orm=\u963F\u66FC\u6587 +osa=\u5965\u8428\u683C\u8BED +oss=\u5965\u585E\u68AF\u6587 +ota=\u5965\u6258\u66FC\u571F\u8033\u5176\u6587 +oto=\u5965\u6258\u7C73\u8BED\u7CFB +paa=\u5176\u4ED6\u5DF4\u5E03\u4E9A\u6587 +pag=\u90A6\u963F\u897F\u6960\u8BED +pal=\u5E15\u62C9\u7EF4\u6587 +pam=\u90A6\u677F\u7259\u6587 +pan=\u65C1\u906E\u666E\u6587 +pap=\u5E15\u76AE\u4E9A\u95E8\u6258\u6587 +pau=\u5E15\u52B3\u6587 +peo=\u53E4\u8001\u6CE2\u65AF\u8BED +per=\u6CE2\u65AF\u6587 +phi=\u5176\u4ED6\u83F2\u5F8B\u5BBE\u8BED\u7CFB +phn=\u8153\u5C3C\u57FA\u6587 +pli=\u5DF4\u5229\u6587 +pol=\u6CE2\u5170\u6587 +pon=\u6CE2\u7EB3\u4F69\u6587 +por=\u8461\u8404\u7259\u6587 +pra=\u666E\u62C9\u514B\u91CC\u7279\u8BF8\u8BED\u8A00 +pro=\u666E\u7F57\u6587\u65AF\u6587 +pus=\u666E\u4EC0\u56FE\u6587 +que=\u76D6\u4E18\u4E9A\u6587 +raj=\u62C9\u8D3E\u65AF\u5766\u6587 +rap=\u62C9\u5E15\u52AA\u4F0A\u6587 +rar=\u62C9\u7F57\u6C64\u52A0\u6587 +roa=\u5176\u4ED6\u62C9\u4E01\u8BED\u7CFB +roh=\u7F57\u66FC\u4EC0\u8BED +rom=\u5409\u666E\u8D5B\u6587 +rum=\u7F57\u9A6C\u5C3C\u4E9A\u6587 +run=\u57FA\u9686\u8FEA\u6587 +rup=\u4E9A\u7F8E\u5C3C\u4E9A\u6587 +rus=\u4FC4\u6587 +sad=\u6563\u8FBE\u7EF4\u6587 +sag=\u6851\u6208\u6587 +sah=\u96C5\u5E93\u7279\u6587 +sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587 +sal=\u8428\u5229\u4EC0\u6587 +sam=\u8428\u739B\u5229\u4E9A\u6587 +san=\u68B5\u6587 +sas=\u8428\u8428\u514B\u6587 +sat=\u6851\u5854\u5229\u6587 +scn=\u897F\u897F\u91CC\u6587 +sco=\u82CF\u683C\u5170\u6587 +sel=\u585E\u5C14\u5E93\u666E\u6587 +sem=\u5176\u4ED6\u95EA\u65CF\u8BED\u7CFB +sga=\u53E4\u7231\u5C14\u5170\u6587 +sgn=\u624B\u8BED +shn=\u63B8\u6587 +sid=\u6089\u8FBE\u6469\u6587 +sin=\u8F9B\u54C8\u62C9\u8BED +sio=\u82CF\u8BED\u8BF8\u8BED\u8A00 +sit=\u6C49\u85CF\u8BF8\u8BED\u8A00 +sla=\u5176\u4ED6\u65AF\u62C9\u592B\u8BED\u7CFB +slo=\u65AF\u6D1B\u4F10\u514B\u6587 +slv=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6587 +sma=\u5357\u8428\u7C73\u6587 +sme=\u5317\u6C99\u5BC6\u6587 +smi=\u5176\u4ED6\u8428\u7C73\u6587 +smj=\u5F8B\u52D2\u6B27\u8428\u83AB\u65AF\u8BED +smn=\u4F0A\u7EB3\u91CC\u8428\u7C73\u8BED +smo=\u8428\u6469\u4E9A\u6587 +sms=\u65AF\u79D1\u7279\u8428\u7C73\u6587 +sna=\u4FEE\u7EB3\u6587 +snd=\u4FE1\u5FB7\u6587 +snk=\u7D22\u5C3C\u57FA\u6587 +sog=\u53E4\u7C9F\u7279\u8BED +som=\u7D22\u9A6C\u91CC\u6587 +son=\u6851\u6D77\u6587 +sot=\u7D22\u6258\u8BED, \u5357\u90E8 +spa=\u897F\u73ED\u7259\u6587 +srd=\u6492\u4E01\u6587 +srn=Sranan Tongo (\u6E90\u4E8E\u514B\u91CC\u5965\u5C14\u8BED) +srp=\u585E\u5C14\u7EF4\u4E9A\u6587 +srr=\u8C22\u5217\u5C14\u6587 +ssa=\u975E\u6D32\u6492\u54C8\u62C9\u6C99\u6F20\u8FB9\u7F18\u5730\u5E26\u8BED\u8A00 +ssw=\u65AF\u74E6\u7279\u6587 +suk=\u82CF\u5E93\u9A6C\u6587 +sun=\u5DFD\u4ED6\u6587 +sus=\u82CF\u82CF\u6587 +sux=\u82CF\u9A6C\u6587 +swa=\u65AF\u74E6\u5E0C\u91CC\u6587 +swe=\u745E\u5178\u6587 +syc=\u53E4\u5178\u53D9\u5229\u4E9A\u8BED +syr=\u53D9\u5229\u4E9A\u8BED +tah=\u5854\u5E0C\u63D0\u6587 +tai=\u50A3\u8BED\u8BF8\u8BED\u8A00 (\u5176\u4ED6) +tam=\u6CF0\u7C73\u5C14\u6587 +tat=\u9791\u977C\u6587 +tel=\u6CF0\u5362\u56FA\u6587 +tem=\u6ED5\u5185\u8BED +ter=\u7279\u5217\u7EB3\u6587 +tet=\u7279\u5854\u59C6\u6587 +tgk=\u5854\u5409\u514B\u6587 +tgl=\u5854\u52A0\u8DEF\u65CF\u6587 +tha=\u6CF0\u6587 +tib=\u897F\u85CF\u6587 +tig=\u63D0\u683C\u96F7\u6587 +tir=\u63D0\u683C\u91CC\u5C3C\u4E9A\u6587 +tiv=\u8482\u592B\u6587 +tkl=\u6258\u514B\u52B3\u6587 +tlh=\u514B\u6797\u8D21\u6587 +tli=\u7279\u6797\u5409\u7279\u6587 +tmh=\u5854\u9A6C\u5947\u514B\u6587 +tog=\u6C64\u52A0\u6587 (\u5C3C\u4E9A\u8428\u5730\u533A) +ton=\u6C64\u52A0\u8BED (\u6C64\u52A0\u5C9B) +tpi=\u6258\u514B\u76AE\u8F9B\u6587 +tsi=\u8482\u59C6\u897F\u4E9A\u6587 +tsn=\u7A81\u5C3C\u65AF\u6587 +tso=\u7279\u677E\u52A0\u6587 +tuk=\u571F\u5E93\u66FC\u6587 +tum=\u901A\u5E03\u5361\u6587 +tup=\u56FE\u76AE\u8BED\u7CFB +tur=\u571F\u8033\u5176\u6587 +tut=\u963F\u5C14\u6CF0\u8BF8\u8BED\u8A00 (\u5176\u4ED6) +tvl=\u56FE\u74E6\u5362\u6587 +twi=\u5951\u7EF4\u6587 +tyv=\u56FE\u74E6\u6587 +udm=\u4E4C\u5FB7\u7A46\u5C14\u7279\u6587 +uga=\u4E4C\u52A0\u91CC\u7279\u6587 +uig=\u7EF4\u543E\u5C14\u6587 +ukr=\u4E4C\u514B\u5170\u6587 +umb=\u7FC1\u672C\u675C\u6587 +und=\u672A\u5B9A\u8BED\u79CD +urd=\u4E4C\u5C14\u90FD\u6587 +uzb=\u4E4C\u5179\u522B\u514B\u6587 +vai=\u74E6\u4F0A\u6587 +ven=\u6587\u8FBE\u6587 +vie=\u8D8A\u5357\u6587 +vol=\u6C83\u62C9\u666E\u514B\u6587 +vot=\u6C83\u63D0\u514B\u6587 +wak=\u74E6\u5361\u4EC0\u8BF8\u8BED\u8A00 +wal=\u74E6\u62C9\u83AB\u6587 +war=\u74E6\u8D56\u6587 +was=\u74E6\u7ECD\u6587 +wel=\u5A01\u5C14\u58EB\u6587 +wen=\u7D22\u5E03\u8BF8\u8BED\u8A00 +wln=\u74E6\u9F99\u6587 +wol=\u6C83\u5C14\u592B\u6587 +xal=\u5361\u5C14\u6885\u514B\u6587 +xho=\u73ED\u56FE\u6587 +yao=\u7476\u65CF\u6587 +yap=\u96C5\u6D66\u6587 +yid=\u4F9D\u5730\u6587 +yor=\u7EA6\u9C81\u5DF4\u6587 +ypk=\u5C24\u76AE\u514B\u8BF8\u8BED\u8A00 +zap=\u8428\u6CE2\u8482\u514B\u6587 +zbl=\u5E03\u5217\u65AF\u7B26\u53F7 +zen=\u6CFD\u7EB3\u52A0\u6587 +zha=\u58EE\u6587 +znd=\u8D5E\u5FB7\u6587 +zul=\u7956\u9C81\u6587 +zun=\u7956\u5C3C\u8BED +zxx=\u65E0\u8BED\u8A00\u5185\u5BB9 +zza=\u624E\u624E\u8BED + # script names # key is ISO 15924 script code -Hans=\u7b80\u4f53\u4e2d\u6587 -Hant=\u7e41\u4f53\u4e2d\u6587 +Arab=\u963F\u62C9\u4F2F\u6587 +Armi=\u7687\u5BB6\u4E9A\u62C9\u59C6\u8BED +Armn=\u4E9A\u7F8E\u5C3C\u4E9A\u6587 +Avst=\u963F\u7EF4\u65AF\u9640\u8BED +Bali=\u5DF4\u91CC\u6587 +Bamu=\u5DF4\u59C6\u7A46\u8BED +Bass=\u5DF4\u8428\u74E6\u8D6B\u8BED +Batk=\u5DF4\u5854\u514B\u6587 +Beng=\u5B5F\u52A0\u62C9\u6587 +Blis=\u5E03\u5217\u65AF\u7B26\u53F7 +Bopo=\u6C49\u8BED\u62FC\u97F3 +Brah=\u5A46\u7F57\u7C73\u6587\u5B57 +Brai=\u5E03\u83B1\u53F6\u76F2\u6587 +Bugi=\u5E03\u5409\u6587 +Buhd=\u5E03\u5E0C\u5FB7\u8BED +Cakm=\u67E5\u514B\u9A6C\u8BED +Cans=\u52A0\u62FF\u5927\u571F\u8457\u7EDF\u4E00\u7B26\u53F7\u8BED +Cari=\u5361\u91CC\u4E9A\u8BED +Cham=\u5360\u8BED +Cher=\u5F7B\u7F57\u57FA\u6587 +Cirt=\u8272\u65AF\u6587 +Copt=\u514B\u666E\u7279\u8BED +Cprt=\u585E\u6D66\u8DEF\u65AF\u8BED +Cyrl=\u897F\u91CC\u5C14\u8BED +Cyrs=\u897F\u91CC\u5C14\u6587\u5B57 (\u53E4\u6559\u4F1A\u65AF\u62C9\u592B\u8BED\u7684\u53D8\u4F53) +Deva=\u68B5\u6587 +Dsrt=\u5FB7\u585E\u83B1\u7279\u6587 +Dupl=Duployan \u901F\u8BB0 +Egyd=\u540E\u671F\u57C3\u53CA\u8BED +Egyh=\u53E4\u57C3\u53CA\u50E7\u4FA3\u4E66\u5199\u4F53 +Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587 +Elba=\u7231\u5C14\u5DF4\u6851 +Ethi=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u8BED +Geok=\u52AA\u65AF\u514B\u80E1\u91CC\u6587 +Geor=\u683C\u9C81\u5409\u4E9A\u6587 +Glag=\u683C\u62C9\u54E5\u91CC\u8BED +Goth=\u54E5\u7279\u6587 +Gran=\u5404\u5170\u7279\u54C8\u6587\u5B57 +Grek=\u5E0C\u814A\u6587 +Gujr=\u53E4\u52A0\u62C9\u63D0\u6587 +Guru=\u679C\u9C81\u7A46\u5947\u8BED +Hang=\u97E9\u6587 +Hani=\u6C49\u8BED +Hano=\u6C49\u5974\u7F57\u8BED +Hans=\u7B80\u4F53\u4E2D\u6587 +Hant=\u7E41\u4F53\u4E2D\u6587 +Hebr=\u5E0C\u4F2F\u6765\u6587 +Hira=\u5E73\u5047\u540D +Hmng=\u6768\u677E\u5F55\u82D7\u6587 +Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D +Hung=\u53E4\u5308\u7259\u5229\u8BED +Inds=\u5370\u5EA6\u6CB3\u6587\u5B57 +Ital=\u53E4\u610F\u5927\u5229\u8BED +Java=\u722A\u54C7\u6587 +Jpan=\u65E5\u6587 +Kali=\u514B\u8036\u674E\u6587\u5B57 +Kana=\u7247\u5047\u540D +Khar=\u5361\u7F57\u987B\u63D0\u6587 +Khmr=\u67EC\u57D4\u5BE8\u6587 +Knda=\u57C3\u7EB3\u5FB7\u6587 +Kore=\u97E9\u6587 +Kpel=\u514B\u4F69\u5217\u6587 +Kthi=\u5361\u7F57\u987B\u63D0\u8BED +Lana=\u5170\u62FF\u8BED +Laoo=\u8001\u631D\u8BED +Latf=\u62C9\u4E01\u6587 (\u54E5\u7279\u5F0F\u5B57\u4F53\u53D8\u4F53) +Latg=\u62C9\u4E01\u6587 (\u76D6\u5C14\u8BED\u53D8\u4F53) +Latn=\u62C9\u4E01\u6587 +Lepc=\u96F7\u5E03\u67E5\u8BED +Limb=\u6797\u5E03\u8BED +Lina=\u7EBF\u5F62\u6587\u5B57 A +Linb=\u7EBF\u5F62\u6587\u5B57 B +Lisu=\u5088\u50F3\u8BED +Loma=\u6D1B\u9A6C\u8BED +Lyci=\u5229\u897F\u4E9A\u8BED +Lydi=\u5415\u5E95\u4E9A\u8BED +Mand=\u66FC\u8FBE\u6587 +Mani=\u6469\u5C3C\u6559\u6587 +Maya=\u739B\u96C5\u5723\u7B26\u6587 +Mend=\u95E8\u8FEA\u6587 +Merc=\u9EA6\u82E5\u63D0\u514B\u6587\u8349\u4F53 +Mero=\u9EA6\u82E5\u63D0\u514B\u6587 +Mlym=\u9A6C\u6765\u4E9A\u62C9\u59C6\u6587 +Mong=\u8499\u53E4\u6587 +Moon=\u6708\u4EAE\u4F53 +Mtei=\u66FC\u5C3C\u666E\u5C14\u8BED +Mymr=\u7F05\u7538 +Narb=\u53E4\u5317\u963F\u62C9\u4F2F\u8BED +Nbat=\u7EB3\u5DF4\u6CF0\u8BED +Nkgb=\u7EB3\u897F\u54E5\u5DF4\u8BED +Nkoo=N\u2019Ko (\u897F\u975E\u4E66\u9762\u8BED\u8A00) +Ogam=\u6B27\u7518\u8BED +Olck=\u6851\u5854\u5229\u6587 +Orkh=\u9102\u5C14\u6D51\u6587 +Orya=\u5965\u8428\u683C\u6587 +Osma=\u5965\u65AF\u66FC\u4E9A\u8BED +Palm=\u5E15\u5C14\u8FC8\u62C9\u8BED +Perm=\u53E4\u5F7C\u5C14\u59C6\u8BF8\u8BED +Phag=\u516B\u601D\u5DF4\u6587 +Phli=\u7891\u94ED\u4F53\u5DF4\u5217\u7EF4\u8BED +Phlp=\u8BD7\u4F53\u5DF4\u5217\u7EF4\u8BED +Phlv=\u4E66\u4F53\u5DF4\u5217\u7EF4\u8BED +Phnx=\u8153\u5C3C\u57FA\u6587 +Plrd=\u82D7\u6587 +Prti=\u7891\u94ED\u4F53\u5E15\u63D0\u4E9A\u8BED +Rjng=\u62C9\u8BA9\u8BED +Roro=\u6717\u683C\u6717\u683C\u6587 +Runr=\u53E4\u4EE3\u5317\u6B27\u6587 +Samr=\u6492\u739B\u5229\u4E9A\u8BED +Sara=\u6C99\u62C9\u5824\u6587 +Sarb=\u53E4\u5357\u963F\u62C9\u4F2F\u8BED +Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u8BED +Sgnw=\u4E66\u5199\u7B26\u53F7 +Shaw=\u8427\u4F2F\u7EB3\u5F0F\u8BED +Sind=\u4FE1\u5FB7\u6587 +Sinh=\u8F9B\u54C8\u62C9\u8BED +Sund=\u5DFD\u4ED6\u6587 +Sylo=Syloti Nagri \u4E66\u5199\u4F53 +Syrc=\u53D9\u5229\u4E9A\u6587 +Syre=\u798F\u97F3\u4F53\u53D9\u5229\u4E9A\u6587 +Syrj=\u897F\u53D9\u5229\u4E9A\u8BED +Syrn=\u4E1C\u53D9\u5229\u4E9A\u8BED +Tagb=\u5854\u683C\u73ED\u74E6\u8BED +Tale=\u6CF0\u4E50\u8BED +Talu=\u65B0\u50A3\u6587 +Taml=\u6CF0\u7C73\u5C14\u6587 +Tavt=\u8D8A\u5357\u50A3\u8BED +Telu=\u6CF0\u5362\u56FA\u6587 +Teng=\u817E\u683C\u74E6\u6587\u5B57 +Tfng=\u63D0\u975E\u7EB3\u6587 +Tglg=\u5854\u52A0\u8DEF\u65CF\u6587 +Thaa=\u5854\u5B89\u5A1C\u8BED +Thai=\u6CF0\u6587 +Tibt=\u897F\u85CF\u6587 +Ugar=\u4E4C\u52A0\u91CC\u7279\u6587 +Vaii=\u74E6\u4F9D\u8BED +Visp=\u53EF\u89C1\u8BED\u8A00 +Wara=Warang Citi +Xpeo=\u53E4\u6CE2\u65AF\u8BED +Xsux=\u82CF\u7F8E\u5C14-\u963F\u5361\u5FB7\u6954\u5F62\u6587\u5B57 +Yiii=\u5F5D\u8BED +Zinh=\u9057\u4F20\u5B66\u672F\u8BED +Zmth=\u6570\u5B66\u8BB0\u53F7 +Zsym=\u7B26\u53F7 +Zxxx=\u64A4\u9500\u5199\u5165 +Zyyy=\u901A\u7528 +Zzzz=\u811A\u672C\u672A\u77E5\u6216\u8005\u65E0\u6548 # country names # key is ISO 3166 country code @@ -478,3 +1109,37 @@ ZA=\u5357\u975e ZM=\u8d5e\u6bd4\u4e9a ZW=\u6d25\u5df4\u5e03\u97e6 + +# territory names +# key is UN M.49 country and area code + +001=\u4E16\u754C +002=\u975E\u6D32 +003=\u5317\u7F8E\u6D32 +005=\u5357\u7F8E\u6D32 +009=\u5927\u6D0B\u6D32 +011=\u897F\u975E +013=\u4E2D\u7F8E\u6D32 +014=\u4E1C\u975E +015=\u5317\u975E +017=\u4E2D\u975E +018=\u5357\u90E8\u975E\u6D32 +019=\u7F8E\u6D32 +021=\u7F8E\u6D32\u5317\u90E8 +029=\u52A0\u52D2\u6BD4\u6D77 +030=\u4E1C\u4E9A +034=\u5357\u4E9A +035=\u4E1C\u5357\u4E9A +039=\u5357\u6B27 +053=\u6FB3\u5927\u5229\u4E9A\u548C\u65B0\u897F\u5170 +054=\u7F8E\u62C9\u5C3C\u897F\u4E9A +057=\u5BC6\u514B\u7F57\u5C3C\u897F\u4E9A\u5730\u533A +061=\u6CE2\u5229\u5C3C\u897F\u4E9A +142=\u4E9A\u6D32 +143=\u4E2D\u4E9A +145=\u897F\u4E9A +150=\u6B27\u6D32 +151=\u4E1C\u6B27 +154=\u5317\u6B27 +155=\u897F\u6B27 +419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties --- a/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -227,11 +227,642 @@ zh=\u4e2d\u6587 zu=\u7956\u9b6f\u6587 +# key is ISO 639.2 language code +aar=\u963F\u6CD5\u6587 +abk=\u963F\u5E03\u54C8\u897F\u4E9E\u6587 +ace=\u4E9E\u9F4A\u6587 +ach=\u963F\u50D1\u5229\u6587 +ada=\u963F\u7576\u83AB\u6587 +ady=\u963F\u8FEA\u5404\u6587 +afa=\u4E9E\u975E\u8A9E\u7CFB +afh=\u963F\u5F17\u91CC\u5E0C\u5229\u6587 +afr=\u5357\u975E\u8377\u862D\u6587 +ain=\u963F\u4F0A\u52AA\u6587 +aka=\u963F\u5BD2\u6587 +akk=\u963F\u5361\u5FB7\u6587 +alb=\u963F\u723E\u5DF4\u5C3C\u4E9E\u6587 +ale=\u963F\u7559\u7533\u6587 +alg=\u963F\u723E\u5CA1\u6606\u8AF8\u8A9E\u8A00 +alt=\u5357\u963F\u723E\u6CF0\u6587 +amh=\u8863\u7D22\u6BD4\u4E9E\u6587 +ang=\u53E4\u82F1\u6587 (\u7D04\u897F\u5143 450-1100) +anp=\u6602\u52A0\u6587 +apa=\u963F\u5E15\u5207\u8AF8\u8A9E\u8A00 +ara=\u963F\u62C9\u4F2F\u6587 +arc=\u963F\u62C9\u7C73\u6587 (700-300 BCE) +arg=\u4E9E\u62C9\u5CA1\u6587 +arm=\u4E9E\u7F8E\u5C3C\u4E9E\u6587 +arn=\u963F\u52DE\u574E\u6587 +arp=\u963F\u62C9\u5E15\u970D\u6587 +art=\u4EBA\u5DE5\u8A9E\u8A00 +arw=\u963F\u62C9\u74E6\u514B\u6587 +asm=\u963F\u85A9\u59C6\u6587 +ast=\u963F\u65AF\u5716\u91CC\u4E9E\u6587 +ath=\u963F\u85A9\u5E15\u65AF\u574E\u8AF8\u8A9E\u8A00 +aus=\u6FB3\u6D32\u8AF8\u8A9E\u8A00 +ava=\u963F\u74E6\u96F7\u6587 +ave=\u963F\u672A\u65AF\u5854\u6587 +awa=\u963F\u74E6\u6587 +aym=\u4E9E\u6469\u62C9\u6587 +aze=\u4E9E\u585E\u62DC\u7136\u6587 +bad=\u73ED\u9054\u6587 +bai=\u5DF4\u7C73\u7D2F\u514B\u8AF8\u8A9E\u8A00 +bak=\u5DF4\u4EC0\u5580\u723E\u6587 +bal=\u4FFE\u8DEF\u652F\u6587 +bam=\u73ED\u5DF4\u62C9\u6587 +ban=\u5CC7\u91CC\u6587 +baq=\u5DF4\u65AF\u514B\u6587 +bas=\u5DF4\u85A9\u6587 +bat=\u6CE2\u7F85\u7684\u6D77\u8AF8\u8A9E\u8A00 +bej=\u8C9D\u624E\u6587 +bel=\u767D\u4FC4\u7F85\u65AF\u6587 +bem=\u5225\u59C6\u5DF4\u6587 +ben=\u5B5F\u52A0\u62C9\u6587 +ber=\u67CF\u67CF\u723E\u6587 +bho=\u535A\u5091\u666E\u723E\u6587 +bih=\u6BD4\u54C8\u723E\u6587 +bik=\u6BD4\u79D1\u723E\u6587 +bin=\u6BD4\u5C3C\u6587 +bis=\u6BD4\u65AF\u62C9\u99AC\u6587 +bla=\u932B\u514B\u932B\u5361\u6587 +bnt=\u73ED\u5716\u8AF8\u8A9E\u8A00 +bos=\u6CE2\u58EB\u5C3C\u4E9E\u6587 +bra=\u5E03\u62C9\u6770\u6587 +bre=\u4E0D\u5217\u5854\u5C3C\u6587 +btk=\u5DF4\u5854\u514B\u6587 +bua=\u5E03\u91CC\u963F\u7279\u6587 +bug=\u5E03\u5409\u65AF\u6587 +bul=\u4FDD\u52A0\u5229\u4E9E\u6587 +bur=\u7DEC\u7538\u6587 +byn=\u5E03\u6797\u6587 +cad=\u5361\u591A\u6587 +cai=\u4E2D\u7F8E\u5370\u7B2C\u5B89\u8AF8\u8A9E\u8A00 +car=\u5DF4\u52D2\u6BD4\u6587 +cat=\u5609\u6CF0\u7F85\u5C3C\u4E9E\u6587 +cau=\u9AD8\u52A0\u7D22\u8AF8\u8A9E\u8A00 +ceb=\u5BBF\u9727\u6587 +cel=\u51F1\u723E\u7279\u8AF8\u8A9E\u8A00 +cha=\u67E5\u6469\u6D1B\u6587 +chb=\u5947\u5E03\u67E5\u6587 +che=\u8ECA\u81E3\u6587 +chg=\u67E5\u52A0\u6587 +chi=\u4E2D\u6587 +chk=\u8655\u5947\u65AF\u6587 +chm=\u99AC\u91CC\u6587 +chn=\u5951\u5974\u514B\u6587 +cho=\u55AC\u514B\u6258\u6587 +chp=\u5947\u4F69\u74E6\u63DA\u6587 +chr=\u67F4\u7F85\u57FA\u6587 +chu=\u6559\u6703\u65AF\u62C9\u592B\u6587 +chv=\u695A\u74E6\u58EB\u6587 +chy=\u6C99\u4F0A\u5B89\u6587 +cmc=\u67E5\u7C73\u514B\u6587 +cop=\u79D1\u666E\u7279\u6587 +cor=\u5EB7\u74E6\u8033\u6587 +cos=\u79D1\u897F\u5609\u6587 +cpe=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u82F1\u6587\u7684(\u5176\u4ED6) +cpf=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u6CD5\u6587\u7684(\u5176\u4ED6) +cpp=\u6B50\u6D32\u8154\u8ABF\u548C\u6D0B\u6D87\u6FF1\uFF0C\u6E90\u81EA\u8461\u8404\u7259\u6587\u7684(\u5176\u4ED6) +cre=\u514B\u91CC\u6587 +crh=\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u571F\u8033\u5176\u6587\uFF1B\u514B\u91CC\u7C73\u4E9E\u534A\u5CF6\u7684\u5854\u5854\u723E\u6587 +crp=\u5176\u4ED6\u514B\u91CC\u5967\u723E\u6DF7\u548C\u8A9E\u7CFB +csb=\u5361\u8212\u5E03\u6587 +cus=\u5EAB\u65BD\u7279\u8AF8\u8A9E\u8A00 +cze=\u6377\u514B\u6587 +dak=\u9054\u79D1\u4ED6\u6587 +dan=\u4E39\u9EA5\u6587 +dar=\u9054\u723E\u683C\u74E6\u6587 +day=\u8FEA\u96C5\u514B\u6587 +del=\u5FB7\u62C9\u74E6\u6587 +den=\u65AF\u62C9\u592B +dgr=\u591A\u683C\u91CC\u5E03\u6587 +din=\u4E01\u5361\u6587 +div=\u8FEA\u7DAD\u897F\u6587 +doi=\u591A\u683C\u4F86\u6587 +dra=\u5FB7\u62C9\u5A01\u8AF8\u8A9E\u8A00 +dsb=\u4E0B\u7D22\u5E03\u6587 +dua=\u675C\u4E9E\u62C9\u6587 +dum=\u4E2D\u53E4\u8377\u862D\u6587 (\u7D04 1050-1350) +dut=\u8377\u862D\u6587 +dyu=\u8FEA\u5C24\u62C9\u6587 +dzo=\u4E0D\u4E39\u6587 +efi=\u57C3\u83F2\u514B\u6587 +egy=\u53E4\u57C3\u53CA\u6587 +eka=\u827E\u5361\u6731\u514B\u6587 +elx=\u827E\u62C9\u7C73\u7279\u6587 +eng=\u82F1\u6587 +enm=\u4E2D\u53E4\u82F1\u6587 (1100-1500) +epo=\u4E16\u754C\u6587 +est=\u611B\u6C99\u5C3C\u4E9E\u6587 +ewe=\u57C3\u7DAD\u6587 +ewo=\u4F9D\u6C6A\u90FD\u6587 +fan=\u82B3\u65CF\u6587 +fao=\u6CD5\u7F85\u6587 +fat=\u82B3\u8482\u6587 +fij=\u6590\u6FDF\u6587 +fil=\u83F2\u5F8B\u8CD3\u6587 +fin=\u82AC\u862D\u6587 +fiu=\u82AC\u70CF\u8AF8\u8A9E\u8A00 +fon=\u8C50\u6587 +fre=\u6CD5\u6587 +frm=\u4E2D\u53E4\u6CD5\u6587 (\u7D04 1400-1600) +fro=\u53E4\u6CD5\u6587 (842-\u7D04 1400) +frr=\u5317\u5F17\u91CC\u897F\u4E9E\u6587 +frs=\u6771\u5F17\u91CC\u897F\u4E9E\u6587 +fry=\u897F\u5F17\u91CC\u897F\u4E9E\u6587 +ful=\u5BCC\u62C9\u6587 +fur=\u5F17\u7559\u5229\u6587 +gaa=\u52A0\u65CF\u6587 +gay=\u52A0\u7D04\u6587 +gba=\u845B\u5DF4\u4E9E\u6587 +gem=\u5176\u4ED6\u65E5\u8033\u66FC\u8A9E\u7CFB +geo=\u55AC\u6CBB\u4E9E\u6587 +ger=\u5FB7\u6587 +gez=\u5409\u8332\u6587 +gil=\u5409\u723E\u4F2F\u7279\u7FA4\u5CF6\u6587 +gla=\u84CB\u723E\u6587 +gle=\u611B\u723E\u862D\u6587 +glg=\u52A0\u91CC\u897F\u4E9E\u6587 +glv=\u66FC\u5CF6\u6587 +gmh=\u4E2D\u53E4\u9AD8\u5730\u5FB7\u6587 (\u7D04 1050-1500) +goh=\u53E4\u9AD8\u5730\u5FB7\u6587 (\u7D04 750-1050) +gon=\u5CA1\u5FB7\u6587 +gor=\u79D1\u9686\u9054\u7F85\u6587 +got=\u54E5\u5FB7\u6587 +grb=\u683C\u5217\u535A\u6587 +grc=\u53E4\u5E0C\u81D8\u6587 (\u76F4\u5230 1453) +gre=\u4E2D\u53E4\u5E0C\u81D8\u6587 (1453-) +grn=\u74DC\u62C9\u5C3C\u6587 +gsw=\u5FB7\u6587 (\u745E\u58EB) +guj=\u53E4\u5409\u62C9\u7279\u6587 +gwi=\u572D\u5951\u6587 +hai=\u6D77\u9054\u6587 +hat=\u6D77\u5730\u6587 +hau=\u8C6A\u85A9\u6587 +haw=\u590F\u5A01\u5937\u6587 +heb=\u5E0C\u4F2F\u4F86\u6587 +her=\u8D6B\u96F7\u7F85\u6587 +hil=\u5E0C\u5229\u84CB\u8FB2\u6587 +him=\u8D6B\u99AC\u67E5\u5229\u6587 +hin=\u5317\u5370\u5EA6\u6587 +hit=\u8D6B\u68AF\u6587 +hmn=\u5B5F\u6587 +hmo=\u65B0\u91CC\u6728\u6258\u6587 +hrv=\u514B\u7F85\u57C3\u897F\u4E9E\u6587 +hsb=\u4E0A\u7D22\u5E03\u6587 +hun=\u5308\u7259\u5229\u6587 +hup=\u80E1\u5E15\u6587 +iba=\u4F0A\u73ED\u6587 +ibo=\u4F0A\u5E03\u6587 +ice=\u51B0\u5CF6\u6587 +ido=\u4F0A\u591A\u6587 +iii=\u56DB\u5DDD\u5937\u6587 +ijo=\u4F0A\u55AC\u6587 +iku=\u4F0A\u52AA\u4F0A\u7279\u6587 +ile=\u4EBA\u5DE5\u570B\u969B\u6587 +ilo=\u4F0A\u6D1B\u95CA\u6587 +ina=\u4EBA\u5DE5\u570B\u969B\u6587 (\u570B\u969B\u8F14\u52A9\u8A9E\u8A00\u5354\u6703) +inc=\u5370\u5EA6\u8AF8\u8A9E\u8A00 +ind=\u5370\u5C3C\u6587 +ine=\u5370\u6B50\u8AF8\u8A9E\u8A00 +inh=\u5370\u53E4\u4EC0\u6587 +ipk=\u4F9D\u5974\u76AE\u7DAD\u514B\u6587 +ira=\u4F0A\u6717\u8AF8\u8A9E\u8A00 +iro=\u6613\u6D1B\u9B41\u6587 +ita=\u7FA9\u5927\u5229\u6587 +jav=\u722A\u54C7\u6587 +jbo=\u908F\u8F2F\u6587 +jpn=\u65E5\u6587 +jpr=\u7336\u592A\u6559-\u6CE2\u65AF\u6587 +jrb=\u7336\u592A\u963F\u62C9\u4F2F\u6587 +kaa=\u5361\u62C9\u5361\u723E\u5E15\u514B\u6587 +kab=\u5361\u6BD4\u723E\u6587 +kac=\u5361\u7434\u6587 +kal=\u683C\u9675\u862D\u6587 +kam=\u5361\u59C6\u5DF4\u6587 +kan=\u574E\u90A3\u9054\u6587 +kar=\u514B\u502B\u6587 +kas=\u5580\u4EC0\u7C73\u723E\u6587 +kau=\u5361\u52AA\u91CC\u6587 +kaw=\u5361\u5A01\u6587 +kaz=\u54C8\u85A9\u514B\u6587 +kbd=\u5361\u5DF4\u723E\u9054\u6587 +kha=\u5361\u897F\u6587 +khi=\u79D1\u4F9D\u6851\u8AF8\u8A9E\u8A00 +khm=\u4E2D\u592E\u67EC\u57D4\u5BE8\u6587 +kho=\u548C\u95D0\u6587 +kik=\u57FA\u5EAB\u7336\u6587 +kin=\u91D1\u63DA\u842C\u7B54\u6587 +kir=\u5409\u723E\u5409\u65AF\u6587 +kmb=\u91D1\u90A6\u675C\u6587 +kok=\u8CA2\u6839\u6587 +kom=\u79D1\u5BC6\u6587 +kon=\u525B\u679C\u6587 +kor=\u97D3\u6587 +kos=\u79D1\u65AF\u96F7\u6069\u6587 +kpe=\u514B\u4F69\u5217\u6587 +krc=\u5361\u62C9\u67F4-\u5305\u723E\u5361\u723E\u6587 +krl=\u5361\u7D2F\u5229\u963F\u6587 +kro=\u514B\u9B6F\u6587 +kru=\u5EAB\u9B6F\u79D1\u6587 +kua=\u95DC\u4E9E\u99AC\u6587 +kum=\u5EAB\u5BC6\u514B\u6587 +kur=\u5EAB\u5FB7\u6587 +kut=\u5EAB\u7279\u5948\u6587 +lad=\u62C9\u8FEA\u8AFE\u6587 +lah=\u62C9\u4EA8\u9054\u6587 +lam=\u862D\u5DF4\u6587 +lao=\u5BEE\u6587 +lat=\u62C9\u4E01\u6587 +lav=\u62C9\u812B\u7DAD\u4E9E\u6587 (\u5217\u7279\u6587) +lez=\u83DC\u8332\u4F9D\u6602\u6587 +lim=\u5229\u535A\u574E\u6587 +lin=\u9675\u52A0\u62C9\u6587 +lit=\u7ACB\u9676\u5B9B\u6587 +lol=\u8292\u6208\u6587 +loz=\u6D1B\u9F4A\u6587 +ltz=\u76E7\u68EE\u5821\u6587 +lua=\u9B6F\u5DF4\u9B6F\u9B6F\u4E9E\u6587 +lub=\u76E7\u5DF4-\u52A0\u4E39\u52A0\u6587 +lug=\u5E72\u9054\u6587 +lui=\u8DEF\u6613\u585E\u8AFE\u6587 +lun=\u76E7\u6069\u9054\u6587 +luo=\u76E7\u5967\u6587 (\u80AF\u4E9E\u8207\u5766\u5C1A\u5C3C\u4E9E) +lus=\u76E7\u6652\u6587 +mac=\u99AC\u5176\u9813\u6587 +mad=\u99AC\u90FD\u62C9\u6587 +mag=\u99AC\u52A0\u4F0A\u6587 +mah=\u99AC\u7D39\u723E\u7FA4\u5CF6\u6587 +mai=\u9081\u8482\u5229\u6587 +mak=\u671B\u52A0\u932B\u6587 +mal=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587 +man=\u66FC\u4E01\u54E5\u6587 +mao=\u6BDB\u5229\u6587 +map=\u5357\u5CF6\u8AF8\u8A9E\u8A00 +mar=\u99AC\u62C9\u5730\u6587 +mas=\u99AC\u8CFD\u6587 +may=\u99AC\u4F86\u6587 +mdf=\u83AB\u514B\u6C99\u6587 +mdr=\u66FC\u9054\u6587 +men=\u9580\u5FB7\u6587 +mga=\u4E2D\u53E4\u611B\u723E\u862D\u6587 (900-1200) +mic=\u7C73\u514B\u99AC\u514B\u6587 +min=\u7C73\u5357\u5361\u5821\u6587 +mis=\u6DF7\u96DC\u8A9E\u8AF8\u8A9E\u8A00 +mkh=\u5B5F\u9AD8\u68C9\u8AF8\u8A9E\u8A00 +mlg=\u99AC\u62C9\u52A0\u897F\u6587 +mlt=\u99AC\u723E\u4ED6\u6587 +mnc=\u6EFF\u65CF\u6587 +mni=\u66FC\u5C3C\u666E\u88E1\u6587 +mno=\u99AC\u8AFE\u535A\u8AF8\u8A9E\u8A00 +moh=\u83AB\u970D\u514B\u6587 +mon=\u8499\u53E4\u6587 +mos=\u83AB\u897F\u6587 +mul=\u591A\u7A2E\u8A9E\u8A00 +mun=\u8499\u9054\u8AF8\u8A9E\u8A00 +mus=\u514B\u91CC\u514B\u6587 +mwl=\u7C73\u862D\u5FB7\u65AF\u6587 +mwr=\u99AC\u723E\u5C3C\u88E1\u6587 +myn=\u99AC\u96C5\u8AF8\u8A9E\u8A00 +myv=\u5384\u723E\u8332\u4E9E\u6587 +nah=\u7D0D\u74E6\u7279\u6587 +nai=\u5317\u7F8E\u5370\u7B2C\u5B89\u8AF8\u8A9E\u8A00 +nap=\u62FF\u6CE2\u91CC\u6587 +nau=\u8AFE\u9B6F\u6587 +nav=\u7D0D\u74E6\u8377\u6587 +nbl=\u5357\u6069\u5FB7\u6BD4\u5229\u6587 +nde=\u5317\u6069\u5FB7\u6BD4\u5229\u6587 +ndo=\u6069\u6771\u52A0\u6587 +nds=\u4F4E\u5730\u5FB7\u6587; \u4F4E\u5730\u6492\u514B\u905C\u6587 +nep=\u5C3C\u6CCA\u723E\u6587 +new=\u5C3C\u74E6\u723E\u6587 +nia=\u5C3C\u4E9E\u65AF\u6587 +nic=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4 +niu=\u7D10\u57C3\u6587 +nno=\u632A\u5A01\u8010\u8AFE\u65AF\u514B\u6587 +nob=\u535A\u514B\u99AC\u723E\u6587\uFF0C\u632A\u5A01 +nog=\u8AFE\u84CB\u6587 +non=\u53E4\u8AFE\u723E\u65AF\u6587 +nor=\u632A\u5A01\u6587 +nqo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko) +nso=\u5317\u7D22\u6258\u6587 +nub=\u52AA\u6BD4\u4E9E\u8AF8\u8A9E\u8A00 +nwc=\u53E4\u5C3C\u74E6\u723E\u6587 +nya=\u9F4A\u5207\u74E6\u6587 +nym=\u5C3C\u63DA\u97CB\u9F4A\u6587 +nyn=\u5C3C\u63DA\u79D1\u840A\u6587 +nyo=\u5C3C\u5967\u56C9\u6587 +nzi=\u5C3C\u8332\u99AC\u6587 +oci=\u6B50\u897F\u5766\u6587 (\u524D 1500) +oji=\u5967\u6770\u5E03\u97CB\u6587 +ori=\u6B50\u5229\u4E9E\u6587 +orm=\u5967\u7F85\u8499\u6587 +osa=\u6B50\u585E\u5947\u6587 +oss=\u5967\u585E\u68AF\u6587 +ota=\u9102\u5716\u66FC\u571F\u8033\u5176\u6587 (1500-1928) +oto=\u5967\u6258\u7C73\u8AF8\u8A9E\u8A00 +paa=\u5DF4\u5E03\u4E9E\u8AF8\u8A9E\u8A00 +pag=\u6F58\u52A0\u8F9B\u6587 +pal=\u5DF4\u5217\u7DAD\u6587 +pam=\u6F58\u5E15\u5609\u6587 +pan=\u65C1\u906E\u666E\u6587 +pap=\u5E15\u76AE\u963F\u9580\u6258\u6587 +pau=\u5E1B\u7409\u6587 +peo=\u53E4\u6CE2\u65AF\u6587 (ca.600-400 B.C.) +per=\u6CE2\u65AF\u6587 +phi=\u83F2\u5F8B\u8CD3\u8AF8\u8A9E\u8A00 +phn=\u8153\u5C3C\u57FA\u6587 +pli=\u5E15\u91CC\u6587 +pol=\u6CE2\u862D\u6587 +pon=\u6CE2\u90A3\u8C9D\u6587 +por=\u8461\u8404\u7259\u6587 +pra=\u666E\u62C9\u514B\u91CC\u7279\u8AF8\u8A9E\u8A00 +pro=\u53E4\u666E\u7F85\u6587\u65AF\u6587 (\u76F4\u5230 1500) +pus=\u666E\u4EC0\u5716\u6587 +que=\u84CB\u695A\u74E6\u6587 +raj=\u62C9\u8CC8\u65AF\u5766\u8AF8\u6587 +rap=\u5FA9\u6D3B\u5CF6\u6587 +rar=\u62C9\u7F85\u901A\u52A0\u6587 +roa=\u7F85\u66FC\u8AF8\u8A9E\u8A00 +roh=\u7F85\u66FC\u4EC0\u6587 +rom=\u5409\u666E\u8CFD\u6587 +rum=\u7F85\u99AC\u5C3C\u4E9E\u6587 +run=\u79D1\u9686\u5730\u6587 +rup=\u7F85\u99AC\u5C3C\u4E9E\u8A9E\u7CFB +rus=\u4FC4\u6587 +sad=\u6851\u9054\u97CB\u6587 +sag=\u6851\u6208\u8A9E +sah=\u96C5\u5EAB\u7279\u6587 +sai=\u5176\u4ED6\u5357\u7F8E\u5370\u7B2C\u5B89\u6587 +sal=\u85A9\u5229\u4EC0\u8AF8\u8A9E\u8A00 +sam=\u85A9\u746A\u5229\u4E9E\u963F\u62C9\u59C6\u6587 +san=\u68B5\u6587\u5B57\u6BCD +sas=\u6492\u6492\u514B\u6587 +sat=\u6563\u5854\u5229\u6587 +scn=\u897F\u897F\u91CC\u6587 +sco=\u8607\u683C\u862D\u6587 +sel=\u745F\u723E\u5361\u666E\u6587 +sem=\u9583\u8A9E\u8AF8\u8A9E\u8A00 +sga=\u53E4\u611B\u723E\u862D\u6587 (\u81F3 900) +sgn=\u624B\u8A9E +shn=\u64A3\u6587 +sid=\u5E0C\u9054\u6469\u6587 +sin=\u932B\u862D\u6587 +sio=\u8607\u8A9E\u8AF8\u8A9E\u8A00 +sit=\u6F22\u85CF\u8A9E\u7CFB +sla=\u65AF\u62C9\u592B\u8AF8\u8A9E\u8A00 +slo=\u65AF\u6D1B\u4F10\u514B\u6587 +slv=\u65AF\u6D1B\u7DAD\u5C3C\u4E9E\u8A9E +sma=\u5357\u85A9\u7C73\u6587 +sme=\u5317\u6C99\u5BC6\u6587 +smi=\u85A9\u7C73\u8AF8\u8A9E\u8A00 +smj=\u9B6F\u52D2\u85A9\u7C73\u6587 +smn=\u4F0A\u7D0D\u88E1\u85A9\u7C73\u6587 +smo=\u85A9\u6469\u4E9E\u6587 +sms=\u65AF\u79D1\u7279\u85A9\u7C73\u6587 +sna=\u980C\u54C8\u6587 +snd=\u4FE1\u5FB7\u6587 +snk=\u7D22\u5C3C\u57FA\u6587 +sog=\u7D22\u683C\u5E95\u4E9E\u7D0D\u6587 +som=\u7D22\u99AC\u5229\u6587 +son=\u6851\u6D77\u6587 +sot=\u7D22\u6258\u6587, \u5357\u90E8 +spa=\u897F\u73ED\u7259\u6587 +srd=\u85A9\u4E01\u5C3C\u4E9E\u6587 +srn=Sranan Tongo (\u6E90\u65BC\u514B\u91CC\u5967\u723E\u8A9E) +srp=\u585E\u723E\u7DAD\u4E9E\u6587 +srr=\u585E\u96F7\u723E\u6587 +ssa=\u5C3C\u7F85\u6492\u54C8\u62C9\u8AF8\u8A9E\u8A00 +ssw=\u897F\u65AF\u74E6\u63D0\u6587 +suk=\u8607\u5EAB\u99AC\u6587 +sun=\u5DFD\u4E39\u6587 +sus=\u8607\u8607\u6587 +sux=\u8607\u7F8E\u6587 +swa=\u53F2\u74E6\u897F\u91CC\u6587 +swe=\u745E\u5178\u6587 +syc=\u53E4\u6558\u5229\u4E9E\u6587 +syr=\u6558\u5229\u4E9E\u6587 +tah=\u5927\u6EAA\u5730\u6587 +tai=\u50A3\u8A9E\u8AF8\u8A9E\u8A00 +tam=\u5766\u7C73\u723E\u6587 +tat=\u97C3\u977C\u6587 +tel=\u7279\u62C9\u53E4\u6587 +tem=\u63D0\u59C6\u6587 +ter=\u6CF0\u96F7\u8AFE\u6587 +tet=\u6CF0\u9813\u6587 +tgk=\u5854\u5409\u514B\u6587 +tgl=\u5854\u52A0\u62C9\u65CF\u6587 +tha=\u6CF0\u6587 +tib=\u897F\u85CF\u6587 +tig=\u8482\u683C\u96F7\u6587 +tir=\u63D0\u683C\u5229\u5C3C\u4E9E\u6587 +tiv=\u63D0\u592B\u6587 +tkl=\u6258\u514B\u52DE\u6587 +tlh=\u514B\u6797\u8CA2\u6587 +tli=\u7279\u6797\u57FA\u7279\u6587 +tmh=\u5854\u99AC\u5947\u514B\u6587 +tog=\u6771\u52A0\u6587(\u5C3C\u4E9E\u85A9\u6587) +ton=\u6771\u52A0\u6587 (\u6771\u52A0\u7FA4\u5CF6) +tpi=\u6258\u6BD4\u8F9B\u6587 +tsi=\u6B3D\u897F\u5B89\u6587 +tsn=\u585E\u8332\u74E6\u7D0D\u6587 +tso=\u980C\u52A0\u6587 +tuk=\u571F\u5EAB\u66FC\u6587 +tum=\u5716\u59C6\u5E03\u5361\u6587 +tup=\u5716\u76AE\u8AF8\u8A9E\u8A00 +tur=\u571F\u8033\u5176\u6587 +tut=\u963F\u723E\u6CF0\u8AF8\u8A9E\u8A00 (\u5176\u4ED6) +tvl=\u5410\u74E6\u9B6F\u6587 +twi=\u5951\u7DAD\u6587 +tyv=\u571F\u51E1\u6587 +udm=\u6C83\u8482\u827E\u514B\u6587 +uga=\u70CF\u52A0\u5217\u6587 +uig=\u7DAD\u543E\u723E\u6587 +ukr=\u70CF\u514B\u862D\u6587 +umb=\u59C6\u672C\u675C\u6587 +und=\u672A\u78BA\u5B9A\u7684 +urd=\u70CF\u90FD\u6587 +uzb=\u70CF\u8332\u5225\u514B\u6587 +vai=\u8D8A\u5357\u6587 Vai +ven=\u6587\u9054\u6587 +vie=\u8D8A\u5357\u6587 +vol=\u6C83\u62C9\u666E\u514B\u6587 +vot=\u6C83\u63D0\u514B\u6587 +wak=\u74E6\u5361\u4EC0\u8AF8\u8A9E\u8A00 +wal=\u74E6\u62C9\u83AB\u6587 +war=\u74E6\u745E\u6587 +was=\u74E6\u7D39\u6587 +wel=\u5A01\u723E\u65AF\u6587 +wen=\u7D22\u5E03\u8AF8\u8A9E\u8A00 +wln=\u83EF\u9686\u6587 +wol=\u6C83\u6D1B\u592B\u6587 +xal=\u5361\u723E\u6885\u514B\u6587 +xho=\u5ED3\u85A9\u6587 +yao=\u7464\u6587 +yap=\u96C5\u6D66\u6587 +yid=\u610F\u7B2C\u7DD2\u6587 +yor=\u512A\u9B6F\u5DF4\u6587 +ypk=\u5C24\u76AE\u514B\u8AF8\u8A9E\u8A00 +zap=\u85A9\u6CE2\u7279\u514B\u6587 +zbl=\u5E03\u5217\u65AF\u7B26\u865F +zen=\u6FA4\u7D0D\u52A0\u6587 +zha=\u58EF\u6587 +znd=\u8D0A\u5FB7\u6587 +zul=\u7956\u9B6F\u6587 +zun=\u7956\u5C3C\u6587 +zxx=\u7121\u8A9E\u8A00\u5167\u5BB9 +zza=\u624E\u624E\u6587 + # script names # key is ISO 15924 script code -Hans=\u7c21\u9ad4\u4e2d\u6587 -Hant=\u7e41\u9ad4\u4e2d\u6587 +Arab=\u963F\u62C9\u4F2F\u6587 +Armi=\u7687\u5BA4\u4E9E\u7F8E\u5C3C\u4E9E\u6587 +Armn=\u4E9E\u7F8E\u5C3C\u4E9E\u6587 +Avst=\u963F\u672A\u65AF\u5854\u6587 +Bali=\u5CC7\u91CC\u6587 +Bamu=\u5DF4\u66FC\u6587 +Bass=\u5DF4\u85A9\u4F10\u6587 +Batk=\u5DF4\u5854\u514B\u6587 +Beng=\u5B5F\u52A0\u62C9\u6587 +Blis=\u5E03\u5217\u65AF\u7B26\u865F +Bopo=\u6CE8\u97F3\u7B26\u865F +Brah=\u5A46\u7F85\u7C73\u6587 +Brai=\u76F2\u4EBA\u7528\u9EDE\u5B57\u6CD5 +Bugi=\u5E03\u5409\u65AF\u6587 +Buhd=\u5E03\u5E0C\u5FB7\u6587 +Cakm=\u67E5\u514B\u99AC\u6587 +Cans=\u52A0\u62FF\u5927\u539F\u4F4F\u6C11\u901A\u7528\u5B57\u7B26 +Cari=\u5361\u91CC\u4E9E\u6587 +Cham=\u5360\u6587 +Cher=\u67F4\u7F85\u57FA\u6587 +Cirt=\u8272\u65AF\u6587 +Copt=\u79D1\u666E\u7279\u6587 +Cprt=\u585E\u6D66\u8DEF\u65AF\u6587 +Cyrl=\u897F\u91CC\u4FC4\u8A9E +Cyrs=\u897F\u91CC\u723E\u6587 (\u53E4\u6559\u6703\u65AF\u62C9\u592B\u6587\u8B8A\u9AD4) +Deva=\u68B5\u6587 +Dsrt=\u5FB7\u745F\u96F7\u7279\u6587 +Dupl=Duployan \u901F\u8A18\u6CD5 +Egyd=\u53E4\u57C3\u53CA\u4E16\u4FD7\u9AD4 +Egyh=\u53E4\u57C3\u53CA\u50E7\u4FB6\u9AD4 +Egyp=\u53E4\u57C3\u53CA\u8C61\u5F62\u6587\u5B57 +Elba=\u611B\u723E\u5DF4\u6851\u6587 +Ethi=\u8863\u7D22\u5339\u4E9E\u6587 +Geok=\u683C\u9B6F\u5409\u4E9E\u8A9E\u7CFB (\u963F\u7D22\u4ED6\u8DEF\u91CC\u548C\u52AA\u65AF\u514B\u80E1\u91CC\u6587) +Geor=\u55AC\u6CBB\u4E9E\u6587 +Glag=\u683C\u62C9\u54E5\u91CC\u6587 +Goth=\u54E5\u5FB7\u6587 +Gran=\u683C\u862D\u85A9\u6587 +Grek=\u5E0C\u81D8\u6587 +Gujr=\u53E4\u5409\u62C9\u7279\u6587 +Guru=\u53E4\u723E\u7A46\u5947\u6587 +Hang=\u8AFA\u6587 +Hani=\u6F22\u8A9E +Hano=\u54C8\u52AA\u8AFE\u6587 +Hans=\u7C21\u9AD4\u4E2D\u6587 +Hant=\u7E41\u9AD4\u4E2D\u6587 +Hebr=\u5E0C\u4F2F\u4F86\u6587 +Hira=\u5E73\u5047\u540D +Hmng=\u694A\u677E\u9304\u82D7\u6587 +Hrkt=\u7247\u5047\u540D\u6216\u5E73\u5047\u540D +Hung=\u53E4\u5308\u7259\u5229\u6587 +Inds=\u5370\u5EA6\u6CB3\u6D41\u57DF (\u54C8\u62C9\u5E15\u6587) +Ital=\u53E4\u610F\u5927\u5229\u6587 +Java=\u722A\u54C7\u6587 +Jpan=\u65E5\u6587 +Kali=\u514B\u8036\u674E\u6587 +Kana=\u7247\u5047\u540D +Khar=\u5361\u7F85\u9808\u63D0\u6587 +Khmr=\u67EC\u57D4\u5BE8\u6587 +Knda=\u574E\u90A3\u9054\u6587 +Kore=\u97D3\u6587 +Kpel=\u514B\u4F69\u5217\u6587 +Kthi=\u5361\u5E1D\u6587 +Lana=\u85CD\u62FF\u6587 +Laoo=\u5BEE\u6587 +Latf=\u62C9\u4E01\u6587 (\u5C16\u89D2\u9AD4\u6D3B\u5B57\u8B8A\u9AD4) +Latg=\u62C9\u4E01\u6587 (\u84CB\u723E\u8A9E\u8B8A\u9AD4) +Latn=\u62C9\u4E01\u6587 +Lepc=\u96F7\u5E03\u67E5\u6587 +Limb=\u6797\u4F48\u6587 +Lina=\u7DDA\u6027\u6587\u5B57 A +Linb=\u7DDA\u6027\u6587\u5B57 B +Lisu=\u9ECE\u50F3\u6587 +Loma=\u6D1B\u99AC\u6587 +Lyci=\u5442\u897F\u4E9E\u8A9E +Lydi=\u91CC\u5E95\u4E9E\u8A9E +Mand=\u66FC\u5B89\u5E95\u6587 +Mani=\u6469\u5C3C\u6559\u6587 +Maya=\u746A\u96C5\u8C61\u5F62\u6587\u5B57 +Mend=\u9580\u8FEA\u8A9E +Merc=\u9EA5\u7F85\u57C3\u6587\u884C\u8349 +Mero=\u9EA5\u7F85\u57C3\u6587 +Mlym=\u99AC\u4F86\u4E9E\u62C9\u59C6\u6587 +Mong=\u8499\u53E4\u6587 +Moon=\u7A46\u6069\u9AD4\u76F2\u6587 +Mtei=\u66FC\u5C3C\u666E\u723E\u6587 +Mymr=\u7DEC\u7538\u6587 +Narb=\u5317\u963F\u62C9\u4F2F\u53E4\u6587 +Nbat=\u7D0D\u5DF4\u6CF0\u6587 +Nkgb=\u7D0D\u897F\u8FE6\u5DF4\u6587 +Nkoo=\u897F\u975E\u66F8\u9762\u8A9E\u8A00 (N'Ko) +Ogam=\u6B50\u7518\u6587 +Olck=\u6851\u5854\u5229\u6587 +Orkh=\u9102\u723E\u6E3E\u6587 +Orya=\u6B50\u5229\u4E9E\u6587 +Osma=\u6B50\u65AF\u66FC\u4E9E\u6587 +Palm=\u5E15\u7C73\u745E\u5C3C\u6587 +Perm=\u53E4\u5F7C\u723E\u59C6\u8AF8\u6587 +Phag=\u516B\u601D\u5DF4\u6587 +Phli=\u7891\u8A18\u6587\u6D3E\u9F8D\u7279\u6587 +Phlp=\u8A69\u7BC7\u96C6\u6D3E\u9F8D\u7279\u6587 +Phlv=\u66F8\u7C4D\u6D3E\u9F8D\u7279\u6587 +Phnx=\u8153\u5C3C\u57FA\u6587 +Plrd=\u67CF\u683C\u7406\u62FC\u97F3\u7B26 +Prti=\u7891\u8A18\u6587\u5DF4\u5E95\u4E9E\u6587 +Rjng=\u62C9\u8B93\u6587 +Roro=\u6717\u683C\u6717\u683C\u8C61\u5F62\u6587 +Runr=\u53E4\u5317\u6B50\u6587\u5B57 +Samr=\u6492\u99AC\u5229\u4E9E\u6587 +Sara=\u6C99\u62C9\u5824\u6587 +Sarb=\u5357\u963F\u62C9\u4F2F\u53E4\u6587 +Saur=\u7D22\u62C9\u4EC0\u7279\u62C9\u6587 +Sgnw=\u624B\u8A9E\u66F8\u5BEB\u7B26\u865F +Shaw=\u7C2B\u67CF\u7D0D\u5B57\u7B26 +Sind=\u4FE1\u5FB7\u6587 +Sinh=\u932B\u862D\u6587 +Sund=\u5DFD\u4E39\u6587 +Sylo=\u5E0C\u6D1B\u5F1F\u7D0D\u683C\u91CC\u6587 +Syrc=\u6558\u5229\u4E9E\u6587 +Syre=\u6558\u5229\u4E9E\u6587 (\u798F\u97F3\u9AD4\u6587\u5B57\u8B8A\u9AD4) +Syrj=\u6558\u5229\u4E9E\u6587 (\u897F\u65B9\u6587\u5B57\u8B8A\u9AD4) +Syrn=\u6558\u5229\u4E9E\u6587 (\u6771\u65B9\u6587\u5B57\u8B8A\u9AD4) +Tagb=\u5357\u5CF6\u6587 +Tale=\u50A3\u54EA\u6587 +Talu=\u65B0\u50A3\u6587 +Taml=\u5766\u7C73\u723E\u6587 +Tavt=\u50A3\u8D8A\u6587 +Telu=\u7279\u62C9\u53E4\u6587 +Teng=\u8AC7\u683C\u74E6\u6587 +Tfng=\u63D0\u975E\u7D0D (\u67CF\u67CF\u723E\u6587) +Tglg=\u5854\u52A0\u62C9\u65CF\u6587 +Thaa=\u5854\u5B89\u90A3\u6587 +Thai=\u6CF0\u6587 +Tibt=\u897F\u85CF\u6587 +Ugar=\u70CF\u52A0\u5217\u6587 +Vaii=\u8D8A\u5357\u6587 Vai +Visp=\u53EF\u898B\u8A9E\u8A00 +Wara=Warang Citi +Xpeo=\u53E4\u6CE2\u65AF\u6587 +Xsux=\u8607\u7C73\u9B6F\u4E9E\u7532\u6587\u6954\u5F62\u6587\u5B57 +Yiii=\u5F5D\u6587 +Zinh=\u907A\u50B3\u5B78\u8853\u8A9E +Zmth=\u6578\u5B78\u7B26\u865F +Zsym=\u7B26\u865F +Zxxx=\u64A4\u92B7\u5BEB\u5165 +Zyyy=\u4E00\u822C\u6587\u5B57 +Zzzz=\u8173\u672C\u672A\u77E5\u6216\u8005\u7121\u6548 # country names # key is ISO 3166 country code @@ -478,3 +1109,37 @@ ZA=\u5357\u975e ZM=\u5c1a\u6bd4\u4e9e ZW=\u8f9b\u5df4\u5a01 + +# territory names +# key is UN M.49 country and area code + +001=\u4E16\u754C +002=\u975E\u6D32 +003=\u5317\u7F8E\u6D32 +005=\u5357\u7F8E\u6D32 +009=\u5927\u6D0B\u6D32 +011=\u897F\u975E +013=\u4E2D\u7F8E\u6D32 +014=\u6771\u975E +015=\u5317\u975E +017=\u4E2D\u975E +018=\u975E\u6D32\u5357\u90E8 +019=\u7F8E\u6D32 +021=\u7F8E\u6D32\u5317\u90E8 +029=\u52A0\u52D2\u6BD4\u6D77 +030=\u6771\u4E9E +034=\u5357\u4E9E +035=\u6771\u5357\u4E9E +039=\u5357\u6B50 +053=\u6FB3\u6D32\u8207\u7D10\u897F\u862D +054=\u7F8E\u62C9\u5C3C\u897F\u4E9E +057=\u5BC6\u514B\u7F85\u5C3C\u897F\u4E9E +061=\u73BB\u91CC\u5C3C\u897F\u4E9E +142=\u4E9E\u6D32 +143=\u4E2D\u4E9E +145=\u897F\u4E9E +150=\u6B50\u6D32 +151=\u6771\u6B50 +154=\u5317\u6B50 +155=\u897F\u6B50 +419=\u62C9\u4E01\u7F8E\u6D32\u548C\u52A0\u52D2\u6BD4\u6D77 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/jvmti/minst/Minst.java --- a/jdk/src/share/demo/jvmti/minst/Minst.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/jvmti/minst/Minst.java Sat May 14 11:52:15 2011 -0700 @@ -45,7 +45,7 @@ */ public static void method_entry(int cnum, int mnum) { - Class x = Minst.class; + Class<Minst> x = Minst.class; synchronized ( x ) { if ( engaged > 0 ) { engaged = 0; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/FullThreadDump/Deadlock.java --- a/jdk/src/share/demo/management/FullThreadDump/Deadlock.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/FullThreadDump/Deadlock.java Sat May 14 11:52:15 2011 -0700 @@ -48,7 +48,7 @@ */ public class Deadlock { public static void main(String[] argv) { - Deadlock dl = new Deadlock(); + new Deadlock(); // Now find deadlock ThreadMonitor monitor = new ThreadMonitor(); @@ -112,6 +112,7 @@ this.mon2 = mon2; this.useSync = false; } + @Override public void run() { if (useSync) { syncLock(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java --- a/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java Sat May 14 11:52:15 2011 -0700 @@ -39,7 +39,6 @@ import java.lang.management.MonitorInfo; import javax.management.*; import java.io.*; -import java.util.*; /** * Example of using the java.lang.management API to dump stack trace @@ -167,7 +166,8 @@ } } - private void printMonitorInfo(ThreadInfo ti, MonitorInfo[] monitors) { + private void printMonitorInfo(ThreadInfo ti) { + MonitorInfo[] monitors = ti.getLockedMonitors(); System.out.println(INDENT + "Locked monitors: count = " + monitors.length); for (MonitorInfo mi : monitors) { System.out.println(INDENT + " - " + mi + " locked at "); @@ -201,6 +201,7 @@ ThreadInfo[] infos = tmbean.getThreadInfo(tids, true, true); for (ThreadInfo ti : infos) { printThreadInfo(ti); + printMonitorInfo(ti); printLockInfo(ti.getLockedSynchronizers()); System.out.println(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/JTop/JTop.java --- a/jdk/src/share/demo/management/JTop/JTop.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/JTop/JTop.java Sat May 14 11:52:15 2011 -0700 @@ -57,7 +57,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.Timer; @@ -69,10 +68,8 @@ import static java.lang.management.ManagementFactory.*; import java.awt.*; -import java.awt.event.*; import javax.swing.*; import javax.swing.border.*; -import javax.swing.event.*; import javax.swing.table.*; /** @@ -80,6 +77,8 @@ * in a table. */ public class JTop extends JPanel { + + private static final long serialVersionUID = -1499762160973870696L; private MBeanServerConnection server; private ThreadMXBean tmbean; private MyTableModel tmodel; @@ -122,29 +121,34 @@ } class MyTableModel extends AbstractTableModel { + private static final long serialVersionUID = -7877310288576779514L; private String[] columnNames = {"ThreadName", "CPU(sec)", "State"}; // List of all threads. The key of each entry is the CPU time // and its value is the ThreadInfo object with no stack trace. private List<Map.Entry<Long, ThreadInfo>> threadList = - Collections.EMPTY_LIST; + Collections.emptyList(); public MyTableModel() { } + @Override public int getColumnCount() { return columnNames.length; } + @Override public int getRowCount() { return threadList.size(); } + @Override public String getColumnName(int col) { return columnNames[col]; } + @Override public Object getValueAt(int row, int col) { Map.Entry<Long, ThreadInfo> me = threadList.get(row); switch (col) { @@ -164,7 +168,8 @@ } } - public Class getColumnClass(int c) { + @Override + public Class<?> getColumnClass(int c) { return getValueAt(0, c).getClass(); } @@ -207,12 +212,14 @@ * Format Double with 4 fraction digits */ class DoubleRenderer extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1704639497162584382L; NumberFormat formatter; public DoubleRenderer() { super(); setHorizontalAlignment(JLabel.RIGHT); } + @Override public void setValue(Object value) { if (formatter==null) { formatter = NumberFormat.getInstance(); @@ -238,12 +245,14 @@ } // Get the current thread info and CPU time + @Override public List<Map.Entry<Long, ThreadInfo>> doInBackground() { return getThreadList(); } // fire table data changed to trigger GUI update // when doInBackground() is finished + @Override protected void done() { try { // Set table model with the new thread list @@ -290,6 +299,7 @@ // A timer task to update GUI per each interval TimerTask timerTask = new TimerTask() { + @Override public void run() { // Schedule the SwingWorker to update the GUI jtop.newSwingWorker().execute(); @@ -299,6 +309,7 @@ // Create the standalone window with JTop panel // by the event dispatcher thread SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { createAndShowGUI(jtop); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/JTop/JTopPlugin.java --- a/jdk/src/share/demo/management/JTop/JTopPlugin.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/JTop/JTopPlugin.java Sat May 14 11:52:15 2011 -0700 @@ -40,13 +40,13 @@ import java.beans.PropertyChangeListener; import java.util.LinkedHashMap; import java.util.Map; -import javax.management.MBeanServerConnection; + import javax.swing.JPanel; import javax.swing.SwingWorker; -import com.sun.tools.jconsole.JConsolePlugin; import com.sun.tools.jconsole.JConsoleContext; import com.sun.tools.jconsole.JConsoleContext.ConnectionState; +import com.sun.tools.jconsole.JConsolePlugin; /** * JTopPlugin is a subclass to com.sun.tools.jconsole.JConsolePlugin @@ -70,6 +70,7 @@ /* * Returns a JTop tab to be added in JConsole. */ + @Override public synchronized Map<String, JPanel> getTabs() { if (tabs == null) { jtop = new JTop(); @@ -86,6 +87,7 @@ /* * Returns a SwingWorker which is responsible for updating the JTop tab. */ + @Override public SwingWorker<?,?> newSwingWorker() { return jtop.newSwingWorker(); } @@ -101,10 +103,10 @@ * Property listener to reset the MBeanServerConnection * at reconnection time. */ + @Override public void propertyChange(PropertyChangeEvent ev) { String prop = ev.getPropertyName(); if (prop == JConsoleContext.CONNECTION_STATE_PROPERTY) { - ConnectionState oldState = (ConnectionState)ev.getOldValue(); ConnectionState newState = (ConnectionState)ev.getNewValue(); // JConsole supports disconnection and reconnection // The MBeanServerConnection will become invalid when diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java --- a/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Sat May 14 11:52:15 2011 -0700 @@ -42,9 +42,6 @@ import javax.swing.border.EtchedBorder; import javax.swing.border.TitledBorder; import java.lang.management.*; -import java.util.*; - - /** * Demo code which plots the memory usage by all memory pools. * The memory usage is sampled at some time interval using @@ -53,6 +50,7 @@ */ public class MemoryMonitor extends JPanel { + private static final long serialVersionUID = -3463003810776195761L; static JCheckBox dateStampCB = new JCheckBox("Output Date Stamp"); public Surface surf; JPanel controls; @@ -84,6 +82,7 @@ controls.add(dateStampCB); dateStampCB.setFont(font); addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { removeAll(); if ((doControls = !doControls)) { @@ -128,28 +127,32 @@ public Surface() { setBackground(Color.black); addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if (thread == null) start(); else stop(); } }); - int i = 0; usedMem = new float[numPools][]; ptNum = new int[numPools]; } + @Override public Dimension getMinimumSize() { return getPreferredSize(); } + @Override public Dimension getMaximumSize() { return getPreferredSize(); } + @Override public Dimension getPreferredSize() { return new Dimension(135,80); } + @Override public void paint(Graphics g) { if (big == null) { @@ -315,13 +318,14 @@ notify(); } + @Override public void run() { Thread me = Thread.currentThread(); while (thread == me && !isShowing() || getSize().width == 0) { try { - thread.sleep(500); + Thread.sleep(500); } catch (InterruptedException e) { return; } } @@ -339,7 +343,7 @@ } repaint(); try { - thread.sleep(sleepAmount); + Thread.sleep(sleepAmount); } catch (InterruptedException e) { break; } if (MemoryMonitor.dateStampCB.isSelected()) { System.out.println(new Date().toString() + " " + usedStr); @@ -354,6 +358,7 @@ static class Memeater extends ClassLoader implements Runnable { Object y[]; public Memeater() {} + @Override public void run() { y = new Object[10000000]; int k =0; @@ -378,7 +383,7 @@ } - Class loadNext() throws ClassNotFoundException { + Class<?> loadNext() throws ClassNotFoundException { // public class TestNNNNNN extends java.lang.Object{ // public TestNNNNNN(); @@ -424,15 +429,15 @@ int len = begin.length + value.length + end.length; byte b[] = new byte[len]; - int i, pos=0; - for (i=0; i<begin.length; i++) { - b[pos++] = (byte)begin[i]; + int pos=0; + for (int i: begin) { + b[pos++] = (byte) i; } - for (i=0; i<value.length; i++) { - b[pos++] = value[i]; + for (byte v: value) { + b[pos++] = v; } - for (i=0; i<end.length; i++) { - b[pos++] = (byte)end[i]; + for (int e: end) { + b[pos++] = (byte) e; } return defineClass(name, b, 0, b.length); @@ -445,8 +450,11 @@ public static void main(String s[]) { final MemoryMonitor demo = new MemoryMonitor(); WindowListener l = new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) {System.exit(0);} + @Override public void windowDeiconified(WindowEvent e) { demo.surf.start(); } + @Override public void windowIconified(WindowEvent e) { demo.surf.stop(); } }; JFrame f = new JFrame("MemoryMonitor"); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/VerboseGC/PrintGCStat.java --- a/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java Sat May 14 11:52:15 2011 -0700 @@ -71,12 +71,10 @@ assert(false); } - Set mbeans = server.queryNames(poolName, null); + Set<ObjectName> mbeans = server.queryNames(poolName, null); if (mbeans != null) { pools = new ArrayList<MemoryPoolMXBean>(); - Iterator iterator = mbeans.iterator(); - while (iterator.hasNext()) { - ObjectName objName = (ObjectName) iterator.next(); + for (ObjectName objName : mbeans) { MemoryPoolMXBean p = newPlatformMXBeanProxy(server, objName.getCanonicalName(), @@ -88,9 +86,7 @@ mbeans = server.queryNames(gcName, null); if (mbeans != null) { gcmbeans = new ArrayList<GarbageCollectorMXBean>(); - Iterator iterator = mbeans.iterator(); - while (iterator.hasNext()) { - ObjectName objName = (ObjectName) iterator.next(); + for (ObjectName objName : mbeans) { GarbageCollectorMXBean gc = newPlatformMXBeanProxy(server, objName.getCanonicalName(), @@ -116,7 +112,9 @@ * of all memory pools as well as the GC statistics. */ public void printVerboseGc() { - System.out.print("Uptime: " + formatMillis(rmbean.getUptime())); + System.out.println("Uptime: " + formatMillis(rmbean.getUptime())); + System.out.println("Heap usage: " + mmbean.getHeapMemoryUsage()); + System.out.println("Non-Heap memory usage: " + mmbean.getNonHeapMemoryUsage()); for (GarbageCollectorMXBean gc : gcmbeans) { System.out.print(" [" + gc.getName() + ": "); System.out.print("Count=" + gc.getCollectionCount()); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/management/VerboseGC/VerboseGC.java --- a/jdk/src/share/demo/management/VerboseGC/VerboseGC.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/management/VerboseGC/VerboseGC.java Sat May 14 11:52:15 2011 -0700 @@ -95,9 +95,8 @@ int port = -1; long interval = 5000; // default is 5 second interval long mins = 5; - for (int argIndex = 0; argIndex < args.length; argIndex++) { - String arg = args[argIndex]; - if (args[argIndex].startsWith("-")) { + for (String arg: args) { + if (arg.startsWith("-")) { if (arg.equals("-h") || arg.equals("-help") || arg.equals("-?")) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/nio/zipfs/Demo.java --- a/jdk/src/share/demo/nio/zipfs/Demo.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/nio/zipfs/Demo.java Sat May 14 11:52:15 2011 -0700 @@ -42,7 +42,6 @@ import static java.nio.file.StandardOpenOption.*; import static java.nio.file.StandardCopyOption.*; - /* * ZipFileSystem usage demo * @@ -157,7 +156,6 @@ env.put("create", "true"); try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { Path path, src, dst; - boolean isRename = false; switch (action) { case rename: src = fs.getPath(args[2]); @@ -303,6 +301,7 @@ final String fStr = (args.length > 3)?args[3]:""; try (DirectoryStream<Path> ds = Files.newDirectoryStream(path, new DirectoryStream.Filter<Path>() { + @Override public boolean accept(Path path) { return path.toString().contains(fStr); } @@ -358,10 +357,18 @@ return null; } + @SuppressWarnings("unused") + /** + * Not used in demo, but included for demonstrational purposes. + */ private static byte[] getBytes(String name) { return name.getBytes(); } + @SuppressWarnings("unused") + /** + * Not used in demo, but included for demonstrational purposes. + */ private static String getString(byte[] name) { return new String(name); } @@ -534,6 +541,10 @@ Files.createDirectory(path); } + @SuppressWarnings("unused") + /** + * Not used in demo, but included for demonstrational purposes. + */ private static void rmdirs(Path path) throws IOException { while (path != null && path.getNameCount() != 0) { Files.delete(path); @@ -557,7 +568,11 @@ } } - // check the content of two paths are equal + @SuppressWarnings("unused") + /** + * Checks that the content of two paths are equal. + * Not used in demo, but included for demonstrational purposes. + */ private static void checkEqual(Path src, Path dst) throws IOException { //System.out.printf("checking <%s> vs <%s>...%n", diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java --- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java Sat May 14 11:52:15 2011 -0700 @@ -38,14 +38,18 @@ * document. This is used in ScriptShellPanel class as document for editor. */ public class EditableAtEndDocument extends PlainDocument { + + private static final long serialVersionUID = 5358116444851502167L; private int mark; + @Override public void insertString(int offset, String text, AttributeSet a) throws BadLocationException { int len = getLength(); super.insertString(len, text, a); } + @Override public void remove(int offs, int len) throws BadLocationException { int start = offs; int end = offs + len; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java --- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java Sat May 14 11:52:15 2011 -0700 @@ -32,14 +32,10 @@ package com.sun.demo.scripting.jconsole; import com.sun.tools.jconsole.*; -import java.awt.*; -import java.awt.event.*; import java.io.*; -import java.lang.reflect.*; import java.util.concurrent.CountDownLatch; import javax.script.*; import javax.swing.*; -import javax.swing.event.*; import java.util.*; /** @@ -86,6 +82,7 @@ tabs.put("Script Shell", window); new Thread(new Runnable() { + @Override public void run() { // initialize the script engine initScriptEngine(); @@ -103,10 +100,12 @@ window.dispose(); } + @Override public String getPrompt() { return prompt; } + @Override public String executeCommand(String cmd) { String res; try { @@ -176,7 +175,7 @@ String oldFilename = (String) engine.get(ScriptEngine.FILENAME); engine.put(ScriptEngine.FILENAME, "<built-in jconsole." + extension + ">"); try { - Class myClass = this.getClass(); + Class<? extends ScriptJConsolePlugin> myClass = this.getClass(); InputStream stream = myClass.getResourceAsStream("/resources/jconsole." + extension); if (stream != null) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java --- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Sat May 14 11:52:15 2011 -0700 @@ -44,8 +44,11 @@ * A JPanel subclass containing a scrollable text area displaying the * jconsole's script console. */ + class ScriptShellPanel extends JPanel { + private static final long serialVersionUID = 4116273141148726319L; + // interface to evaluate script command and script prompt interface CommandProcessor { // execute given String as script and return the result @@ -75,9 +78,11 @@ add(scroller, BorderLayout.CENTER); editor.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { } + @Override public void insertUpdate(DocumentEvent e) { if (updating) return; beginUpdate(); @@ -90,10 +95,12 @@ // Trim "\\n" combinations final String cmd1 = trimContinuations(cmd); commandExecutor.execute(new Runnable() { + @Override public void run() { final String result = executeCommand(cmd1); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (result != null) { print(result + "\n"); @@ -113,6 +120,7 @@ } } + @Override public void removeUpdate(DocumentEvent e) { } }); @@ -121,6 +129,7 @@ // the JEditorPane to update the caret's position precisely the // size of the insertion editor.addCaretListener(new CaretListener() { + @Override public void caretUpdate(CaretEvent e) { int len = editor.getDocument().getLength(); if (e.getDot() > len) { @@ -133,6 +142,7 @@ hbox.add(Box.createGlue()); JButton button = new JButton("Clear"); // FIXME: i18n? button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { clear(); } @@ -148,6 +158,7 @@ commandExecutor.shutdown(); } + @Override public void requestFocus() { editor.requestFocus(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/lib/security/sunpkcs11-solaris.cfg --- a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/lib/security/sunpkcs11-solaris.cfg Sat May 14 11:52:15 2011 -0700 @@ -14,6 +14,8 @@ attributes = compatibility disabledMechanisms = { +# the following mechanisms are disabled due to lack of digest cloning support +# need to fix 6414899 first CKM_MD2 CKM_MD5 CKM_SHA_1 @@ -21,9 +23,6 @@ CKM_SHA384 CKM_SHA512 CKM_DSA_KEY_PAIR_GEN -# KEY_AND_MAC_DERIVE disabled due to Solaris bug 6306708 - CKM_SSL3_KEY_AND_MAC_DERIVE - CKM_TLS_KEY_AND_MAC_DERIVE # the following mechanisms are disabled due to performance issues (Solaris bug 6337157) CKM_DSA_SHA1 CKM_MD5_RSA_PKCS diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/share/native/java/lang/Throwable.c --- a/jdk/src/share/native/java/lang/Throwable.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/share/native/java/lang/Throwable.c Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2011, 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 @@ -44,7 +44,7 @@ * `this' so you can write 'throw e.fillInStackTrace();' */ JNIEXPORT jobject JNICALL -Java_java_lang_Throwable_fillInStackTrace(JNIEnv *env, jobject throwable) +Java_java_lang_Throwable_fillInStackTrace(JNIEnv *env, jobject throwable, int dummy) { JVM_FillInStackTrace(env, throwable); return throwable; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java --- a/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Sat May 14 11:52:15 2011 -0700 @@ -50,6 +50,8 @@ public native long getTotalPhysicalMemorySize(); public native long getOpenFileDescriptorCount(); public native long getMaxFileDescriptorCount(); + public native double getSystemCpuLoad(); + public native double getProcessCpuLoad(); static { initialize(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/sun/awt/X11/XListPeer.java --- a/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java Sat May 14 11:52:15 2011 -0700 @@ -1479,16 +1479,19 @@ int h = height - (SCROLLBAR_AREA + (2 * MARGIN)); hsb.setValue(hsb.getValue() + x); + int options = PAINT_ITEMS | PAINT_HSCROLL; + Rectangle source = null; Point distance = null; if (x < 0) { source = new Rectangle(MARGIN + SPACE, MARGIN, w + x, h); distance = new Point(-x, 0); + options |= COPY_AREA; } else if (x > 0) { source = new Rectangle(MARGIN + SPACE + x, MARGIN, w - x, h); distance = new Point(-x, 0); + options |= COPY_AREA; } - int options = COPY_AREA | PAINT_ITEMS | PAINT_HSCROLL; repaint(vsb.getValue(), lastItemDisplayed(), options, source, distance); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/sun/nio/ch/EPoll.java --- a/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Sat May 14 11:52:15 2011 -0700 @@ -99,8 +99,6 @@ // -- Native methods -- - private static native void init(); - private static native int eventSize(); private static native int eventsOffset(); @@ -116,6 +114,5 @@ static { Util.load(); - init(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java --- a/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Sat May 14 11:52:15 2011 -0700 @@ -432,8 +432,6 @@ // -- native methods -- - private static native void init(); - // sizeof inotify_event private static native int eventSize(); @@ -461,6 +459,5 @@ System.loadLibrary("nio"); return null; }}); - init(); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/appletviewer.1 --- a/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/appletviewer.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,44 +19,34 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH appletviewer 1 "02 Jun 2010" +.TH appletviewer 1 "10 May 2011" .LP .SH "Name" appletviewer \- The Java Applet Viewer. .LP -.RS 3 - -.LP .LP The \f3appletviewer\fP command allows you to run applets outside of a web browser. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .LP \f4appletviewer\fP \f2[\fP \f2options\fP \f2] \fP\f2urls\fP ... .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3appletviewer\fP command connects to the documents or resources designated by \f2urls\fP and displays each applet referenced by the documents in its own window. Note: if the documents referred to by \f2urls\fP do not reference any applets with the \f2OBJECT\fP, \f2EMBED\fP, or \f2APPLET\fP tag, then \f3appletviewer\fP does nothing. For details on the HTML tags that \f3appletviewer\fP supports, see .na \f2AppletViewer Tags\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/appletviewertags.html. +http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html. .LP .LP \f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-debug diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/apt.1 --- a/jdk/src/solaris/doc/sun/man/man1/apt.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/apt.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH apt 1 "02 Jun 2010" +.TH apt 1 "10 May 2011" .LP .SH "NAME" @@ -50,21 +50,17 @@ .SH "DESCRIPTION" .LP .LP -The tool \f2apt\fP, annotation processing tool, includes a set of new reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. +\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. +.LP +.LP +The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. .LP .LP A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in .na \f4Getting Started with \fP\f4apt\fP. @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html -.LP -.RS 3 -.TP 3 -Note: -\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac(1)\fP tool and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool. -.RE - +http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html .LP .SH "OPTIONS" .LP @@ -90,6 +86,12 @@ .TP 3 \-factory classname Name of annotation processor factory to use; bypasses default discovery process +.TP 3 +\-version +Print version information. +.TP 3 +\-X +Display information about non\-standard options. .RE .LP @@ -109,10 +111,35 @@ .LP Consult the javac(1) man page for information on \f2javac\fP options. .LP +.SS +Non\-Standard Options +.LP +.RS 3 +.TP 3 +\-XListAnnotationTypes +List found annotation types. +.TP 3 +\-XListDeclarations +List specified and included declarations. +.TP 3 +\-XPrintAptRounds +Print information about initial and recursive \f2apt\fP rounds. +.TP 3 +\-XPrintFactoryInfo +Print information about which annotations a factory is asked to process. +.TP 3 +\-XclassesAsDecls +Treat both class and source files as declarations to process. +.RE + +.LP +.LP +\f3Note\fP: Because these options are non\-standard, they are subject to change without notice. +.LP .SH "NOTES" .LP .LP -The functionality of \f2apt\fP has been subsumed by the standard annotation\-processing infrastructure now offered by \f2javac\fP. Support for \f2apt\fP and its associated APIs may be discontinued in some future JDK release. +The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. .LP .SH "SEE ALSO" .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/extcheck.1 --- a/jdk/src/solaris/doc/sun/man/man1/extcheck.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/extcheck.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH extcheck 1 "02 Jun 2010" +.TH extcheck 1 "10 May 2011" .LP .SH "Name" extcheck \- A utility to detect jar conflicts .LP -.RS 3 - -.LP .LP \f3extcheck\fP detects version conflicts between a target jar file and currently installed extension jar files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3extcheck\fP utility checks a specified Jar file for title and version conflicts with any extensions installed in the Java(TM) SDK. Before installing an extension, you can use this utility to see if the same or a more recent version of the extension is already installed. .LP @@ -63,8 +55,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-verbose @@ -77,8 +67,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP jar(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/idlj.1 --- a/jdk/src/solaris/doc/sun/man/man1/idlj.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/idlj.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH idlj 1 "02 Jun 2010" +.TH idlj 1 "10 May 2011" .LP .SH "Name" idlj \- The IDL\-to\-Java Compiler .LP -.RS 3 - -.LP -\f3idlj\fP generates Java bindings from a given IDL file. -.RE +\f3idlj\fP generates Java bindings from a given IDL file. .SH "Synopsis" .LP - -.LP .nf \f3 .fl @@ -48,28 +42,62 @@ .LP .SH "Description" .LP - .LP The IDL\-to\-Java Compiler generates the Java bindings for a given IDL file.\ For binding details, see the .na \f2OMG IDL to Java Language Language Mapping Specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP. +.LP .SS Emitting Client and Server Bindings .LP -.RS 3 +.LP +To generate Java bindings for an IDL file named My.idl: +.LP +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +This generates the client\-side bindings and is equivalent to: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-fclient\fP My.idl +.fl +.fi .LP -To generate Java bindings for an IDL file named My.idl: \f2idlj My.idl\fP +.LP +The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: .LP -This generates the client\-side bindings and is equivalent to: \f2idlj \fP\f4\-fclient\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fserver\fP My.idl +.fl +.fi + +.LP .LP -The client\-side bindings do not include the server\-side skeleton. If you want to generate the server\-side bindings for the interfaces: \f2idlj \fP\f4\-fserver\fP\f2 My.idl\fP +Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: .LP -Server\-side bindings include the client\-side bindings plus the skeleton, all of which are \f2POA\fP (that is, Inheritance Model) classes. If you want to generate both client and server\-side bindings, use one of the following (equivalent) commands: \f2idlj \fP\f4\-fclient \-fserver\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fclient \-fserver\fP My.idl +.fl +idlj \f3\-fall\fP My.idl +.fl +.fi + .LP .LP There are two possible server\-side models: the Inheritance Model and the Tie Delegation Model. @@ -82,31 +110,47 @@ .na \f2org.omg.PortableServer.Servant\fP @ .fi -http://java.sun.com/javase/6/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements. +http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements. .LP .LP The \f2PortableServer\fP module for the .na \f2Portable Object Adapter (POA)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. .LP .LP Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible: .LP -\f2idlj \fP\f4\-fclient \-fserver\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fall\fP\f2 \fP\f4\-oldImplBase\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fclient \-fserver\fP \f3\-oldImplBase\fP My.idl +.fl +idlj \f3\-fall\fP \f3\-oldImplBase\fP My.idl +.fl +.fi + .LP -Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP. +.LP +Given an interface \f2My\fP defined in \f2My.idl\fP, the file \f2_MyImplBase.java\fP is generated. You must provide the implementation for \f2My\fP and it must inherit from \f2_MyImplBase\fP. +.LP .LP The other server\-side model is called the Tie Model. This is a delegation model. Because it is not possible to generate ties and skeletons at the same time, they must be generated separately. The following commands generate the bindings for the Tie Model: .LP -\f2idlj \fP\f4\-fall\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-fallTIE\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-fall\fP My.idl +.fl +idlj \f3\-fallTIE\fP My.idl +.fl +.fi + .LP -For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance: +.LP +For the interface \f2My\fP, the second command generates \f2MyPOATie.java\fP. The constructor to \f2MyPOATie\fP takes a \f2delegate\fP. In this example, using the default POA model, the constructor also needs a \f2poa\fP. You must provide the implementation for \f2delegate\fP, but it does not have to inherit from any other class, only the interface \f2MyOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2MyPOATie\fP. For instance: +.LP .nf \f3 .fl @@ -144,13 +188,21 @@ .fi .LP -You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method. +.LP +You might want to use the Tie model instead of the typical Inheritance model if your implementation must inherit from some other implementation. Java allows any number of interface inheritance, but there is only one slot for class inheritance. If you use the inheritance model, that slot is used up . By using the Tie Model, that slot is freed up for your own use. The drawback is that it introduces a level of indirection: one extra method call occurs when invoking a method. +.LP .LP To generate server\-side, Tie model bindings that are compatible with versions of the IDL to Java language mapping in versions prior to J2SE 1.4. .LP -\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fall\fP\f2 My.idl\fP -.br -\f2idlj \fP\f4\-oldImplBase\fP\f2 \fP\f4\-fallTIE\fP\f2 My.idl\fP +.nf +\f3 +.fl +idlj \fP\f3\-oldImplBase\fP \f3\-fall\fP My.idl +.fl +idlj \f3\-oldImplBase\fP \f3\-fallTIE\fP My.idl +.fl +.fi + .LP .LP For the interface \f2My\fP, this will generate \f2My_Tie.java\fP. The constructor to \f2My_Tie\fP takes a \f2impl\fP. You must provide the implementation for \f2impl\fP, but it does not have to inherit from any other class, only the interface \f2HelloOperations\fP. But to use it with the ORB, you must wrap your implementation within \f2My_Tie\fP. For instance: @@ -184,201 +236,383 @@ .fi .LP -.RE .SS Specifying Alternate Locations for Emitted Files .LP -.RS 3 +.LP +If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-td /altdir\fP My.idl +.fl +.fi .LP -If you want to direct the emitted files to a directory other than the current directory, invoke the compiler as: -.RS 3 - .LP -\f2idlj \fP\f4\-td /altdir\fP\f2 My.idl\fP -.RE For the interface \f2My\fP, the bindings will be emitted to \f2/altdir/My.java\fP, etc., instead of \f2./My.java\fP. -.RE +.LP .SS Specifying Alternate Locations for Include Files .LP -.RS 3 +.LP +If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-i /includes\fP My.idl +.fl +.fi .LP -If \f2My.idl\fP included another idl file, \f2MyOther.idl\fP, the compiler assumes that \f2MyOther.idl\fP resides in the local directory. If it resides in \f2/includes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes\fP\f2 My.idl\fP +.LP +If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-i /includes \-i /moreIncludes\fP My.idl +.fl +.fi + +.LP .LP -If \f2My.idl\fP also included \f2Another.idl\fP that resided in \f2/moreIncludes\fP, for example, then you would invoke the compiler with the following command: \f2idlj \fP\f4\-i /includes \-i /moreIncludes\fP\f2 My.idl\fP +Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: .LP -Since this form of include can become irritatingly long, another means of indicating to the compiler where to search for included files is provided. This technique is similar to the idea of an environment variable. Create a file named \f2idl.config\fP in a directory that is listed in your CLASSPATH. Inside of \f2idl.config\fP, provide a line with the following form: \f2includes=/includes;/moreIncludes\fP +.nf +\f3 +.fl +includes=/includes;/moreIncludes +.fl +\fP +.fi + +.LP .LP The compiler will find this file and read in the includes list. Note that in this example the separator character between the two directories is a semicolon (;). This separator character is platform dependent. On the Windows platform, use a semicolon, on the Unix platform, use a colon, etc. For more information on \f2includes\fP, see the .na \f2Setting the Classpath\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general. -.RE +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general. +.LP .SS Emitting Bindings for Include Files .LP -.RS 3 +.LP +By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: +.LP + +.LP +.LP +\f4My.idl\fP +.LP +.nf +\f3 +.fl +#include <MyOther.idl> +.fl +interface My +.fl +{ +.fl +}; +.fl +\fP +.fi + +.LP + +.LP +.LP +\f4MyOther.idl\fP +.LP +.nf +\f3 +.fl +interface MyOther +.fl +{ +.fl +}; +.fl +\fP +.fi + +.LP + +.LP +.LP +The following command will only generate the java bindings for \f2My\fP: +.LP +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-emitAll\fP My.idl +.fl +.fi + +.LP +.LP +There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: +.LP .LP -By default, only those interfaces, structs, etc, that are defined in the idl file on the command line have Java bindings generated for them. The types defined in included files are not generated. For example, assume the following two idl files: \f4My.idl\fP +.LP +\f4My.idl\fP .LP -\f2#include <MyOther.idl>\fP -.br -\f2interface My\fP -.br -\f2{\fP -.br -\f2};\fP -.br -\f4MyOther.idl\fP +.nf +\f3 +.fl +#include <MyOther.idl> +.fl +interface My +.fl +{ +.fl + #include <Embedded.idl> +.fl +}; +.fl +\fP +.fi + .LP -\f2interface MyOther\fP -.br -\f2{\fP -.br -\f2};\fP\ + +.LP +.LP +\f4MyOther.idl\fP .LP -The following command will only generate the java bindings for \f2My\fP: \f2idlj My.idl\fP +.nf +\f3 +.fl +interface MyOther +.fl +{ +.fl +}; +.fl +\fP +.fi + .LP -To generate all of the types in \f2My.idl\fP and all of the types in the files that \f2My.idl\fP includes (in this example, \f2MyOther.idl\fP), use the following command: \f2idlj \fP\f4\-emitAll\fP\f2 My.idl\fP + .LP -There is a caveat to the default rule. \f2#include\fP statements which appear at global scope are treated as described. These \f2#include\fP statements can be thought of as import statements. \f2#include\fP statements which appear within some enclosing scope are treated as true \f2#include\fP statements, meaning that the code within the included file is treated as if it appeared in the original file and, therefore, Java bindings are emitted for it. Here is an example: \f4My.idl\fP +.LP +\f4Embedded.idl\fP .LP -\f2#include <MyOther.idl>\fP -.br -\f2interface My\fP -.br -\f2{\fP -.br -\f2\ #include <Embedded.idl>\fP -.br -\f2};\ \fP \f4MyOther.idl\fP +.nf +\f3 +.fl +enum E {one, two, three}; +.fl +\fP +.fi + +.LP + +.LP .LP -\f2interface MyOther\fP -.br -\f2{\fP -.br -\f2};\ \fP \f4Embedded.idl\fP +Running the following command: .LP -\f2enum E {one, two, three};\fP\ +.nf +\f3 +.fl +idlj My.idl +.fl +\fP +.fi + +.LP +.LP +will generate the following list of Java files: .LP -Running the following command: \f2idlj My.idl\fP +.nf +\f3 +.fl +./MyHolder.java +.fl +./MyHelper.java +.fl +./_MyStub.java +.fl +./MyPackage +.fl +./MyPackage/EHolder.java +.fl +./MyPackage/EHelper.java +.fl +./MyPackage/E.java +.fl +./My.java +.fl +\fP +.fi + .LP -will generate the following list of Java files: \f2./MyHolder.java\fP -.br -\f2./MyHelper.java\fP -.br -\f2./_MyStub.java\fP -.br -\f2./MyPackage\fP -.br -\f2./MyPackage/EHolder.java\fP -.br -\f2./MyPackage/EHelper.java\fP -.br -\f2./MyPackage/E.java\fP -.br -\f2./My.java\fP .LP -Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP). +Notice that \f2MyOther.java\fP was not generated because it is defined in an import\-like \f2#include\fP. But \f2E.java\fP \f2was\fP generated because it was defined in a true \f2#include\fP. Also notice that since \f2Embedded.idl\fP was included within the scope of the interface \f2My\fP, it appears within the scope of \f2My\fP (that is,in \f2MyPackage\fP). +.LP .LP If the \f2\-emitAll\fP flag had been used in the previous example, then all types in all included files would be emitted. .LP -.RE .SS Inserting Package Prefixes .LP -.RS 3 +.LP +Suppose that you work for a company named ABC that has constructed the following IDL file: +.LP .LP -Suppose that you work for a company named ABC that has constructed the following IDL file: -.br -\f4Widgets.idl\fP +.LP +\f4Widgets.idl\fP .LP -\f2module Widgets\fP -.br -\f2{\fP -.br -\f2\ interface W1 {...};\fP -.br -\f2\ interface W2 {...};\fP -.br -\f2};\fP\ +.nf +\f3 +.fl +module Widgets +.fl +{ +.fl + interface W1 {...}; +.fl + interface W2 {...}; +.fl +}; +.fl +\fP +.fi + .LP -Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: \f2idlj \fP\f4\-pkgPrefix Widgets com.abc\fP\f2 Widgets.idl\fP + +.LP +.LP +Running this file through the IDL\-to\-Java compiler will place the Java bindings for \f2W1\fP and \f2W2\fP within the package \f2Widgets\fP. But there is an industry convention that states that a company's packages should reside within a package named \f2com.<company name>\fP. The \f2Widgets\fP package is not good enough. To follow convention, it should be \f2com.abc.Widgets\fP. To place this package prefix onto the \f2Widgets\fP module, execute the following: .LP -If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package. +.nf +\f3 +.fl +idlj \fP\f3\-pkgPrefix Widgets com.abc\fP Widgets.idl +.fl +.fi + +.LP +.LP +If you have an IDL file which includes \f2Widgets.idl\fP, the \f2\-pkgPrefix\fP flag must appear in that command also. If it does not, then your IDL file will be looking for a \f2Widgets\fP package rather than a \f2com.abc.Widgets\fP package. +.LP .LP If you have a number of these packages that require prefixes, it might be easier to place them into the \f2idl.config\fP file described above. Each package prefix line should be of the form: .LP -\f2PkgPrefix.<type>=<prefix>\fP +.nf +\f3 +.fl +PkgPrefix.<type>=<prefix> +.fl +\fP +.fi + .LP -So the line for the above example would be: \f2PkgPrefix.Widgets=com.abc\fP +So the line for the above example would be: +.nf +\f3 +.fl +PkgPrefix.Widgets=com.abc +.fl +\fP +.fi + .LP .LP The use of this option does not affect the Repository ID. .LP -.RE .SS Defining Symbols Before Compilation .LP -.RS 3 +.LP +You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command +.LP +.nf +\f3 +.fl +idlj \fP\f3\-d\fP MYDEF My.idl +.fl +.fi .LP -You may need to define a symbol for compilation that is not defined within the IDL file, perhaps to include debugging code in the bindings. The command \f2idlj \fP\f4\-d\fP\f2 MYDEF My.idl\fP .LP is the equivalent of putting the line \f2#define MYDEF\fP inside \f2My.idl\fP. -.RE +.LP .SS Preserving Pre\-Existing Bindings .LP -.RS 3 +.LP +If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command +.LP +.nf +\f3 +.fl +idlj \fP\f3\-keep\fP My.idl +.fl +.fi .LP -If the Java binding files already exist, the \f2\-keep\fP flag will keep the compiler from overwriting them. The default is to generate all files without considering if they already exist. If you've customized those files (which you should not do unless you are very comfortable with their contents), then the \f2\-keep\fP option is very useful. The command \f2idlj \fP\f4\-keep\fP\f2 My.idl\fP .LP -emit all client\-side bindings that do not already exist. -.RE +emits all client\-side bindings that do not already exist. +.LP .SS Viewing Progress of Compilation .LP -.RS 3 +.LP +The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: +.LP +.nf +\f3 +.fl +idlj \fP\f3\-v\fP My.idl +.fl +.fi .LP -The IDL\-to\-Java compiler will generate status messages as it progresses through its phases of execution. Use the \f2\-v\fP option to activate this "verbose" mode: \f2idlj \fP\f4\-v\fP\f2 My.idl\fP .LP By default the compiler does not operate in verbose mode. -.RE +.LP .SS Displaying Version Information .LP -.RS 3 - -.LP .LP To display the build version of the IDL\-to\-Java compiler, specify the \f2\-version\fP option on the command\-line: .LP -.LP -\f2idlj \-version\fP +.nf +\f3 +.fl +idlj \-version +.fl +\fP +.fi + .LP .LP Version information also appears within the bindings generated by the compiler. Any additional options appearing on the command\-line are ignored. .LP -.RE .SH "Options" .LP - -.LP .RS 3 .TP 3 \-d symbol This is equivalent to the following line in an IDL file: -.RS 3 - -.LP .nf \f3 .fl @@ -386,7 +620,6 @@ .fl \fP .fi -.RE .TP 3 \-emitAll Emit all types, including those found in \f2#include\fP files. @@ -410,8 +643,9 @@ Wherever \f2type\fP is encountered at file scope, prefix the generated Java package name with \f2prefix\fP for all files generated for that type. The \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module. .TP 3 \-pkgTranslate type package -Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly. -.LP +Whenever the module name \f2type\fP is encountered in an identifier, replace it in the identifier with \f2package\fP for all files in the generated Java package. Note that \f2pkgPrefix\fP changes are made first. \f2type\fP is the simple name of either a top\-level module, or an IDL type defined outside of any module, and must match the full package name exactly. +.br +.br If more than one translation matches an identifier, the longest match is chosen. For example, if the arguments include: .nf \f3 @@ -420,7 +654,6 @@ .fl \fP .fi -.LP The following translations would occur: .nf \f3 @@ -435,7 +668,6 @@ .fl \fP .fi -.LP The following package names cannot be translated: .RS 3 .TP 2 @@ -445,8 +677,7 @@ o \f2org.omg\fP or any subpackages of \f2org.omg\fP .RE -.LP -Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. +Any attempt to translate these packages will result in uncompilable code, and the use of these packages as the first argument after \f2\-pkgTranslate\fP will be treated as an error. .TP 3 \-skeletonName xxx%yyy Use \f2xxx%yyy\fP as the pattern for naming the skeleton. The defaults are: @@ -481,11 +712,11 @@ .RE .LP -See the Description section for more option information. +.LP +See the Description section for more option information. +.LP .SH "Restrictions:" .LP - -.LP .RS 3 .TP 2 o @@ -498,8 +729,6 @@ .LP .SH "Known Problems:" .LP - -.LP .RS 3 .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/appletviewer.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH appletviewer 1 "14 Apr 2011" +.TH appletviewer 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/apt.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH apt 1 "14 Apr 2011" +.TH apt 1 "07 May 2011" .LP .SH "NAME" @@ -50,7 +50,10 @@ .SH "��" .LP .LP -��ġ�� \f2apt\fP �ϡ��ե쥯�� API �ȥ��ݡ��ȥ��ե饹�ȥ饯��㡼��鹽��졢�ץ��ޤ��\f2apt\fP ��ե쥯�� API �ϡ� ��ۻ��Υ��١��ǡ��ץ��๽¤�˴ؤ��ɤ߼��ѥӥ塼��󶡤��ޤ��Υ�ե쥯�� API �ϡ��Τ��ɲä��ˡ�Java(TM) �ץ��ߥ󥰸��η��ƥ��ǥ벽��褦��߷פ��Ƥ��ޤ��ǽ�ˡ�\f2apt\fP �ϡ��ɤ�¾�Υե��ץ��å��¹Ԥ��ޤ��ˡ�\f2apt\fP �ϡ��Υ��ե��ե��ξ��򥳥�ѥ��뤹�뤿�ᡢ��ȯ��ڤˤʤ�ޤ��ġ��ȤΥ��󥿥ե��˻��Ѥ��ե쥯�� API �ʤɤ� API �ϡ�\f2com.sun.mirror\fP �Υ��֥ѥå��Ǥ�� +\f3��\fP: \f2apt\fP �ġ��ȡ��ѥå�� \f2com.sun.mirror\fP �˴ޤޤ�Ƥ��뤽��˴�Ϣ�� API �ϡ�JDK 7 �ʹ��侩�ˤʤäƤ��ꡢJDK �μ��Υ᥸�㡼��꡼��Ǻ��ͽ��Ǥ��\f2javac(1)\fP �ġ��Ѳ�ǽ�ʥ��ץ��ȡ��ѥå�� \f2javax.annotation.processing\fP �� \f2javax.lang.model\fP �˴ޤޤ�Ƥ�� API ��Ѥ��ơ��Ƥ�� +.LP +.LP +��ġ�� \f2apt\fP �ϡ��ե쥯�� API �ȥ��ݡ��ȥ��ե饹�ȥ饯��㡼��鹽��졢�ץ��ޤ��\f2apt\fP ��ե쥯�� API �ϡ� ��ۻ��Υ��١��ǡ��ץ��๽¤�˴ؤ��ɤ߼��ѥӥ塼��󶡤��ޤ��Υ�ե쥯�� API �ϡ��Τ��ɲä��ˡ�Java(TM) �ץ��ߥ󥰸��η��ƥ��ǥ벽��褦��߷פ��Ƥ��ޤ��ǽ�ˡ�\f2apt\fP �ϡ��ɤ�¾�Υե��ץ��å��¹Ԥ��ޤ��ˡ�\f2apt\fP �ϡ��Υ��ե��ե��ξ��򥳥�ѥ��뤹�뤿�ᡢ��ȯ��ڤˤʤ�ޤ��ġ��ȤΥ��󥿥ե��˻��Ѥ��ե쥯�� API �ʤɤ� API �ϡ�\f2com.sun.mirror\fP �Υ��֥ѥå��Ǥ�� .LP .LP �ġ��ε�ǽ�˴ؤ��ܺ٤ȡ�\f2apt\fP ��Ѥ��ȯ��ˡ�ˤĤ��Ƥϡ� @@ -59,13 +62,6 @@ .fi http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html�򻲾Ȥ��Ƥ�� .LP -.RS 3 -.TP 3 -��: -\f2apt\fP �ε�ǽ�ϡ�\f2javac(1)\fP �ġ��ΰ��Ȥʤä��ե饹�ȥ饯��㡼��Ȥ߹��ޤ졢��٤Ƥ� Java ��ѥ��ǻ��ѤǤ��褦��ɸ�ಽ��ޤ��ο��ե饹�ȥ饯��㡼�ϡ��ǥ뤪�� Java �ץ�åȥե��ΰ��Ȥʤä�� API �˰�¸��ޤ��ץ��å��γ�ȯ�ϡ�� API �� \f2javac\fP �ġ��˴�Ť��ƹԤ��褦��ᤷ�ޤ�� -.RE - -.LP .SH "��ץ��" .LP .SS @@ -143,7 +139,7 @@ .SH "��" .LP .LP -\f2apt\fP �ε�ǽ�ϡ�\f2javac\fP �ˤ��󶡤��ɸ��ե饹�ȥ饯��㡼��Ȥ߹��ޤ�ޤ�� JDK ��꡼��Ǥϡ�\f2apt\fP ��Ӵ�Ϣ�� API �Υ��ݡ��Ȥ��ߤ��ǽ��ޤ�� +\f2apt\fP �ġ��ȡ��ѥå�� \f2com.sun.mirror\fP �˴ޤޤ�Ƥ��뤽��˴�Ϣ�� API �ϡ�JDK 7 �ʹ��侩�ˤʤäƤ��ꡢJDK �μ��Υ᥸�㡼��꡼��Ǻ��ͽ��Ǥ��\f2javac(1)\fP �ġ��Ѳ�ǽ�ʥ��ץ��ȡ��ѥå�� \f2javax.annotation.processing\fP �� \f2javax.lang.model\fP �˴ޤޤ�Ƥ�� API ��Ѥ��ơ��Ƥ�� .LP .SH "��Ϣ��" .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/extcheck.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH extcheck 1 "14 Apr 2011" +.TH extcheck 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/idlj.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH idlj 1 "14 Apr 2011" +.TH idlj 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jar.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jar.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jar 1 "14 Apr 2011" +.TH jar 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jarsigner 1 "14 Apr 2011" +.TH jarsigner 1 "07 May 2011" .LP .SH "̾��" @@ -110,16 +110,16 @@ .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<��ȥ��Υѥ����>\fP\f3 .fl - \-keypass dukekeypasswd MyJARFile.jar duke + \-keypass \fP\f4<��Υѥ����>\fP\f3 MyJARFile.jar duke .fl \fP .fi .LP .LP -��ȥ��ϥѥ���ɤ��ݸ��Ƥ��Τǡ��ȥ��Υѥ���� (��Ǥ� mypass) ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤǥ��ȥ��Υѥ���ɤ��ꤷ�ʤ��ȡ��ѥ���ɤ��Ϥ��ޤ��Ʊ�ͤˡ��⥭��ȥ��ǥѥ���ɤˤ�ä��ݸ��Ƥ��뤿�ᡢ��Υѥ���� (��Ǥ� dukekeypasswd) ��ꤹ��ɬ�פ��ޤ�� ޥ�ɹԤ��Υѥ���ɤ��ꤷ�Ƥ��ʤ��ޤ��ꤷ��ѥ���Ȥ��¸��Ƥ��ѥ���ɤȰ�äƤ��ˤϡ��Υѥ���ɤ��Ϥ��ޤ�� +��ȥ��ϥѥ���ɤ��ݸ��Ƥ��Τǡ��ȥ��Υѥ���ɤ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤǥ��ȥ��Υѥ���ɤ��ꤷ�ʤ��ȡ��ѥ���ɤ��Ϥ��ޤ��Ʊ�ͤˡ��⥭��ȥ��ǥѥ���ɤˤ�ä��ݸ��Ƥ��뤿�ᡢ��Υѥ���ɤ��ꤹ��ɬ�פ��ޤ��ޥ�ɹԤ��Υѥ���ɤ��ꤷ�Ƥ��ʤ��ޤ��ꤷ��ѥ���Ȥ��¸��Ƥ��ѥ���ɤȰ�äƤ��ˤϡ��Υѥ���ɤ��Ϥ��ޤ�� .LP .SS ��ȥ��ξ�� @@ -500,7 +500,7 @@ .LP \f2file\fP �˻��ѤǤ��ʸ��ϡ�a\-zA\-Z0\-9_\-�פǤ��Ĥޤꡢʸ��ӥϥ��ե��ѤǤ��ޤ��: .SF �� .DSA �Υե��̾�Ǥϡ��ʸ��Ϥ��٤��ʸ��Ѵ��ޤ�� .LP -\-sigfile \f2��ץ��\fP ��ꤷ�ʤ��ä��硢.SF �ե�� .DSA �ե��Υ١��ե��̾�ϡ��ޥ�ɹԤǻ��ꤵ�줿��̾��Ƭ�� 8 ʸ��򤹤٤��ʸ��Ѵ��Τˤʤ�ޤ��̾�� 8 ʸ��̤��ξ��ϡ��̾��Τޤ޻Ȥ��ޤ��̾��ˡ��̾�ե��̾�˻��ѤǤ��ʤ�ʸ��ޤޤ�Ƥ��ϡ��ʸ�� (_) ��֤��ƥե��̾��ޤ�� +\-sigfile \f2\-sigfile\fP ��ץ��ꤷ�ʤ��ä��硢.SF �ե�� .DSA �ե��Υ١��ե��̾�ϡ��ޥ�ɹԤǻ��ꤵ�줿��̾��Ƭ�� 8 ʸ��򤹤٤��ʸ��Ѵ��Τˤʤ�ޤ��̾�� 8 ʸ��̤��ξ��ϡ��̾��Τޤ޻Ȥ��ޤ��̾��ˡ��̾�ե��̾�˻��ѤǤ��ʤ�ʸ��ޤޤ�Ƥ��ϡ��ʸ�� (_) ��֤��ƥե��̾��ޤ�� .TP 3 \-sigalg algorithm JAR �ե��ν�̾�˻��Ѥ��̾��르�ꥺ��̾��ꤷ�ޤ�� @@ -609,7 +609,7 @@ \fP .fi .TP 3 -\-Jjavaoption +�Ǥ��ޤ�javaoption ��ꤵ�줿 \f2javaoption\fP ʸ�� Java ��󥿥ץ꥿��ľ��Ϥ��ޤ��\f3jarsigner\fP �ϡ��ºݤˤ� Java ��󥿥ץ꥿��Ф��֥�åѡ��פǤ��Υ��ץ��ˤϡ��ޤ�뤳�ȤϤǤ��ޤ��󡣤��Υ��ץ��ϡ��¹ԴĶ��ޤ��ϥ��꡼��Ѥ�Ĵ��Ǥ��Ѳ�ǽ�ʥ��󥿥ץ꥿��ץ��ΰ��ɽ��ˤϡ� \f2java \-h\fP �ޤ�� \f2java \-X\fP �ȥ��ޥ�ɹԤ��Ϥ��ޤ�� .LP .TP 3 @@ -676,14 +676,14 @@ JAR �ե��ν�̾ .LP .LP -bundle.jar �Ȥ��̾�� JAR �ե��뤬��Ȥ��ޤ��Υե��ˡ��ȥ��̾�� jane �Ǥ��桼��Ȥäơ��̾��դ��Ȥ��ޤ��ȥ��ϡ�mystore �Ȥ��̾��ǡ�C �ɥ饤�֤� working �ǥ��쥯�ȥ�ˤ��ꡢ��ȥ��Υѥ���ɤ� mypass��\f2jane\fP ��Υѥ���ɤ� j638klm �Ȥ��ޤ��ξ�硢��Υ��ޥ�ɤ�¹Ԥ��ȡ�JAR �ե��˽�̾��դ�� sbundle.jar �Ȥ��̾�դ� JAR �ե��Ǥ��ޤ�� +bundle.jar �Ȥ��̾�� JAR �ե��뤬��Ȥ��ޤ��Υե��ˡ��ȥ��̾�� jane �Ǥ��桼��Ȥäơ��̾��դ��Ȥ��ޤ��ξ�硢��Υ��ޥ�ɤ�¹Ԥ��ȡ�JAR �ե��˽�̾��դ�� sbundle.jar �Ȥ��̾�դ� JAR �ե��Ǥ��ޤ�� .LP .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<��ȥ��Υѥ����>\fP\f3 .fl - \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane + \-keypass \fP\f4<��Υѥ����>\fP\f3 \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -800,7 +800,7 @@ ��Ȥä�� .LP .LP -��ڻ�� \-verify �� \-verbose ��ץ��˲ä�� \f2\-certs\fP ��ץ��ꤷ��ϡ� JAR �ե��γƽ�̾�Ԥξ��Ϥ��ޤ��ˤϡ��񥿥��ס��̾�Լ��̾�� (X.509 ��ξ��Τ�)�� JAR �ե��θ��ξ��񤬥��ȥ��ȥ�ξ��˰��פ��ˤϡ��̤ǰϤޤ줿��̾�ԤΥ��ȥ��̾��ޤޤ�ޤ��򼨤��ޤ�� +��ڻ�� \-verify �� \-verbose ��ץ��˲ä�� \f2\-certs\fP ��ץ��ꤷ��ϡ� �� JAR �ե��γƽ�̾�Ԥξ��Ϥ��ޤ��ˤϡ��񥿥��ס��̾�Լ��̾�� (X.509 ��ξ��Τ�)�� JAR �ե��θ��ξ��񤬥��ȥ��ȥ�ξ��˰��פ��ˤϡ��̤ǰϤޤ줿��̾�ԤΥ��ȥ��̾��ޤޤ�ޤ��Ȥ��С� .LP .nf \f3 @@ -862,7 +862,7 @@ JAR �ե��뤬��JDK 1.1 �� \f3javakey\fP �ġ��Ȥäƽ�̾��Ƥ��硢��̾�Ԥϥ��ǥ�ƥ��ƥ��ǡ��١��̾�Ǥ��ξ�硢��ڤν��Ϥˤ� i �Ȥ��椬�ޤޤ�ޤ��JAR �ե��뤬��ǥ�ƥ��ƥ��ǡ��١��̾�ȥ��ȥ��̾��ξ��ˤ�äƽ�̾��Ƥ��ϡ�k �� i ��ξ��ɽ��ޤ�� .LP .LP -\f2\-certs\fP ��ץ��ꤷ��硢��ȥ��̾�ϳ�̤ǰϤޤ��Τ��Ф��ǥ�ƥ��ƥ��ǡ��١��̾�ϳѳ�̤ǰϤޤ��ɽ��ޤ��Ȥ��С� +\f2\-certs\fP ��ץ��ꤷ��硢��ȥ��̾�ϳ�̤ǰϤޤ��Τ��Ф��ǥ�ƥ��ƥ��ǡ��١��̾�ϳѳ�̤ǰϤޤ��ɽ��ޤ��򼨤��ޤ�� .LP .nf \f3 @@ -978,7 +978,7 @@ .fl �� JAR �ˤϡ��Υ��ȥ��̾�ˤ�äƽ�̾��Ƥ��ʤ��̾�դ��ȥ꤬�ޤޤ�Ƥ��ޤ� .fl - + .fl \fP .fi @@ -993,7 +993,7 @@ .nf \f3 .fl -failure 1 +failure 1 .fl \fP .fi @@ -1649,7 +1649,7 @@ .na \f4jarsigner\fP\f2 �ġ��λ��ˤĤ��Ƥϡ�\fP @ .fi -http://download.oracle.com/javase/tutorial/index.html +http://download.oracle.com/javase/tutorial/security/index.html .na \f2��Java ��塼�ȥꥢ��\fP\f4��\fP @ .fi diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/java.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/java.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/java.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH java 1 "14 Apr 2011" +.TH java 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javac.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javac.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javac 1 "14 Apr 2011" +.TH javac 1 "07 May 2011" .LP .SH "̾��" @@ -136,10 +136,6 @@ \f3\-sourcepath\fP ��ץ��󤬻��ꤵ��Ƥ��ʤ��ϡ��ե��桼��饹�ѥ��鸡��ޤ�� .LP \f3\-processorpath\fP ��ץ��󤬻��ꤵ��Ƥ��ʤ��ϡ��ץ��å��桼��饹�ѥ��鸡��ޤ�� -.LP -�ص��塢 \f2*\fP �Υ١��̾��ޤ९�饹�ѥ��Ǥϡ��ǥ��쥯�ȥ��γ�ĥ�� \f2.jar\fP �ޤ�� \f2.JAR\fP ��Ĥ��٤ƤΥե��Υꥹ�Ȥ��ꤹ��Τ�Ʊ��Ȥߤʤ��ޤ�� -.LP -��Ȥ��С��ǥ��쥯�ȥ� \f2foo\fP �� \f2a.jar\fP �� \f2b.JAR\fP ��ޤޤ�Ƥ��硢��饹�ѥ�� \f2foo/*\fP �� \f2A.jar:b.JAR\fP ��Ÿ��ޤ��JAR �ե��ν��֤ϻ��ꤵ��ޤ��󡣤��Υꥹ�Ȥˤϡ��ե��ޤᡢ��ꤵ�줿�ǥ��쥯�ȥ��Τ��٤Ƥ� JAR �ե��뤬�ޤޤ�ޤ�� \f2*\fP ��륯�饹�ѥ��ȥ�ϡ��ߤΥǥ��쥯�ȥ��Τ��٤Ƥ� JAR �ե��Υꥹ�Ȥ�Ÿ��ޤ�� \f2CLASSPATH\fP �Ķ��ѿ��⡢��ˤ�Ʊ�ͤ�Ÿ��ޤ��\f3��:\fP ��ޥ�ɹԴĶ��ι��ˤ�äƤϡ� \f2javac \-cp "*.jar" MyClass.java\fP �ʤɤΤ褦�ˡ��磻��ɥ��ʸ��ǰϤळ�Ȥ�ɬ�פʾ��⤢��ޤ�� .TP 3 \-Djava.ext.dirs=directories ��󥹥ȡ��뷿��ĥ��ǽ�ΰ��֤򥪡��С��饤�ɤ��ޤ�� @@ -315,7 +311,7 @@ �侩��뤹�٤Ƥηٹ��ͭ��ˤ��ޤ��Υ�꡼��Ǥϡ��Ѳ�ǽ�ʤ��٤Ƥηٹ��ͭ��ˤ��뤳�Ȥ��侩��Ƥ��ޤ�� .TP 3 \-Xlint:none -Java ��ͤǤϻ��ꤵ��Ƥ��ʤ��٤Ƥηٹ��̵��ˤ��ޤ�� +��٤Ƥηٹ��̵��ˤ��ޤ�� .TP 3 \-Xlint:name �ٹ� \f2name\fP ��ͭ��ˤ��ޤ��Υ��ץ��ͭ��ˤǤ��ٹ�Υꥹ�ȤˤĤ��Ƥϡ��\-Xlint ��ץ��Ȥä�ͭ��ޤ��̵��ˤǤ��ٹ�פ򻲾Ȥ��Ƥ�� @@ -617,7 +613,7 @@ ��褹��ˤϡ��饹 \f2AnnosWithoutProcessors\fP ��ӻ��Ѥ��̾�� \f2Anno\fP �� \f2NotAnno\fP ��ѹ��ޤ�� .TP 3 rawtypes -raw ��Ф��̤��ˤĤ��Ʒٹ𤷤ޤ��äˤ��Υ��ץ��ϡ��ʤ��ѥ�᡼��줿��Ѥ��桼��Ф��Ʒٹ𤷤ޤ��ʸ�Ǥϡ� \f2rawtypes\fP �ٹ��ޤ�� +raw ��Ф��̤��ˤĤ��Ʒٹ𤷤ޤ��ʸ�Ǥϡ� \f2rawtypes\fP �ٹ��ޤ�� .nf \f3 .fl diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javadoc.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javadoc 1 "14 Apr 2011" +.TH javadoc 1 "07 May 2011" .SH "̾��" javadoc \- Java API �ɥ��ȥ��ͥ졼�� .LP @@ -38,11 +38,7 @@ ��ڡ��Ƕ��ڤ�줿��Ϣ�Υѥå��̾�Ǥ��Ȥ��С� \f2java.lang\ java.lang.reflect\ java.awt �Τ褦�˻��ꤷ�ޤ�\fP��ɥ��Ȳ��ѥå��̤˻��ꤹ��ɬ�פ��ޤ��磻��ɥ��ɤϻ��ԲĤǤ��Ƶ�Ū��Τ��ˤϡ�\-subpackages ��Ѥ��ޤ��Javadoc �ġ��ϡ�\f2\-sourcepath\fP ��Ѥ��Ƥ��Υѥå��̾�򸡺��ޤ��1 �İʾ�Υѥå��Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ�� .TP 3 sourcefilenames -��ڡ��Ƕ��ڤ�줿��Ϣ�Υ��ե��̾�Ǥ�� ƥե��ϡ��ѥ��ǻϤޤ�ޤ��ꥹ�� (*) �ʤɤΥ磻��ɥ��ɤ�ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��뤬��Τϡ��ե��̾��.java�פȤ��ĥ�Ҥǽ��ꡢ��γ�ĥ�Ҥ��̾��ºݤ�ͭ��ʥ��饹̾�Ǥ��뤹�٤ƤΥե��Ǥ� ( -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625�򻲾�)��äơ��ϥ��ե��ޤ�̾�� ( \f2X\-Buffer\fP �ʤ�) �䡢��¾��̵��ʸ��ޤ�̾��դ��뤳�Ȥˤ�äơ��Υե��ɥ��Ȳ��оݤ��Ǥ��ޤ��ϡ��ƥ��ѤΥե��䡢�ƥ�ץ졼�Ȥ��줿�ե��ξ��Ǥ��ե��̾��˻��ꤷ��ѥ��ˤ�äơ�javadoc ��Υե��򸡺��꤬��ޤ�ޤ��Javadoc �ġ��ϡ��Υ��ե��̾�򸡺��Ȥ��ˤ� \f2\-sourcepath\fP ��Ѥ��ޤ��Хѥ��ϸ��ߤΥǥ��쥯�ȥ��Ȥ��뤿�ᡢ \f2Button.java\fP ��Ϥ��Ȥϡ� \f2./Button.java\fP ��Ϥ��Ȥ�Ʊ��Ǥ��ե��̾��ե�ѥ��ǻ��ꤹ��ȡ� \f2/home/src/java/awt/Graphics*.java �Τ褦�ˤʤ�ޤ�\fP�� 1 �İʾ�Υ��饹�Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ��ޤ��֥ѥå��ȥ��饹�Υɥ��Ȳ��פ��Τ褦�ˡ��ѥå��̾�ȥ��ե��̾�򺮺ߤ��뤳�Ȥ�Ǥ��ޤ�� +��ڡ��Ƕ��ڤ�줿��Ϣ�Υ��ե��̾�Ǥ�� ƥե��ϡ��ѥ��ǻϤޤ�ޤ��ꥹ�� (*) �ʤɤΥ磻��ɥ��ɤ�ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��뤬��Τϡ��ե��̾��.java�פȤ��ĥ�Ҥǽ��ꡢ��γ�ĥ�Ҥ��̾��ºݤ�ͭ��ʥ��饹̾�Ǥ��뤹�٤ƤΥե��Ǥ� (Java ��ͤ򻲾�)��äơ��ϥ��ե��ޤ�̾�� ( \f2X\-Buffer\fP �ʤ�) �䡢��¾��̵��ʸ��ޤ�̾��դ��뤳�Ȥˤ�äơ��Υե��ɥ��Ȳ��оݤ��Ǥ��ޤ��ϡ��ƥ��ѤΥե��䡢�ƥ�ץ졼�Ȥ��줿�ե��ξ��Ǥ��ե��̾��˻��ꤷ��ѥ��ˤ�äơ�javadoc ��Υե��򸡺��꤬��ޤ�ޤ��Javadoc �ġ��ϡ��Υ��ե��̾�򸡺��Ȥ��ˤ� \f2\-sourcepath\fP ��Ѥ��ޤ��Хѥ��ϸ��ߤΥǥ��쥯�ȥ��Ȥ��뤿�ᡢ \f2Button.java\fP ��Ϥ��Ȥϡ� \f2./Button.java\fP ��Ϥ��Ȥ�Ʊ��Ǥ��ե��̾��ե�ѥ��ǻ��ꤹ��ȡ� \f2/home/src/java/awt/Graphics*.java �Τ褦�ˤʤ�ޤ�\fP�� 1 �İʾ�Υ��饹�Υɥ��Ȳ��פ��򻲾Ȥ��Ƥ��ޤ��֥ѥå��ȥ��饹�Υɥ��Ȳ��פ��Τ褦�ˡ��ѥå��̾�ȥ��ե��̾�򺮺ߤ��뤳�Ȥ�Ǥ��ޤ�� .TP 3 \-subpackages pkg1:pkg2:... ��ե��뤫��ꤵ�줿�ѥå��Ӥ��Υ��֥ѥå��˺Ƶ�Ū�˥ɥ��Ȥ��ޤ��ѥå��̾�ޤ��ϥ��ե��̾��ꤹ��ɬ�פϤ��ޤ�� @@ -62,11 +58,7 @@ .RS 3 .TP 2 o -̾��\f2.java\fP�פ��ȼºݤ�ͭ��ʥ��饹̾�ˤʤäƤ�� (ͭ��ʸ��ˤĤ��Ƥ� -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625�򻲾�) +̾��\f2.java\fP�פ��ȡ��ºݤ�ͭ��ʥ��饹̾�ˤʤäƤ�� (Java ��ͤ�ͭ��ʸ��򻲾�) .TP 2 o ��ĥ꡼�Υ롼�Ȥ��Ū�ʥǥ��쥯�ȥ�ѥ��ڤ�ʸ��ɥåȤ��Ѵ��ȡ��ºݤ�ͭ��ʥѥå��̾�ˤʤäƤ�� @@ -111,11 +103,7 @@ .LP �ºݤˤϡ�Javadoc �ġ��ϡ��᥽�å��Τ��ʤ��ʥ��֥ե��Ǥ��褦�� \f2.java\fP ��ե��Ǥ�ư��ޤ��äơ�API �κ��ˤϡ��򵭽Ҥ��߷פ��ᤤ�ʳ��ǡ��ɥ��ơ��󥳥��Ȥ򵭽Ҥ�� javadoc �ġ��¹ԤǤ��ޤ�� .LP -��ѥ��˰�¸��뤳�Ȥˤ�äơ�HTML ��Ϥϡ��ºݤμ��Τ��б��ޤ��ºݤμ��ϡ��Ū�ʥ��ɤˤǤϤʤ��ۤΥ��ɤ˰�¸��礬��ޤ��Ȥ��С�Javadoc �ġ��ϡ�.class �ե��ˤ�¸�ߤ��뤬��ɤˤ�¸�ߤ��ʤ� -.na -\f2�ǥե��ȥ��󥹥ȥ饯��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (Java ��ͤΥ�� 8.6.7) \f2��ɥ��Ȳ�\fP ��ޤ�� +��ѥ��˰�¸��뤳�Ȥˤ�äơ�HTML ��Ϥϡ��ºݤμ��Τ��б��ޤ��ºݤμ��ϡ��Ū�ʥ��ɤˤǤϤʤ��ۤΥ��ɤ˰�¸��礬��ޤ��Ȥ��С�Javadoc �ġ��ϡ�.class �ե��ˤ�¸�ߤ��뤬��ɤˤ�¸�ߤ��ʤ��ǥե��ȥ��󥹥ȥ饯�� (Java ��ͤ򻲾�) \f2��ɥ��Ȳ�\fP ��ޤ�� .LP �̾Javadoc �ġ��Ǥϡ��ե��Υ��ɤ��Դ��ޤ��ϥ��顼��ޤ�Ǥ��Ǥ�ɥ��Ȥ��Ǥ��ޤ��Τ��ᡢ�ǥХå��ȥ�֥륷�塼�ƥ��󥰤�λ��˥ɥ��Ȥ��Ǥ��ޤ��Ȥ��С�Java ��ͤˤ��ȡ��ݥ᥽�åɤ�ޤ९�饹�ϡ��켫��ݤȤ��ʤ��Фʤ�ޤ��󡣤��Υ��顼�򸡽Ф��ȡ�javac ��ѥ��ߤ��ޤ��Javadoc �ġ��Ϸٹ��Ф��˽��³�Ԥ��ޤ��Javadoc �ġ��ϥɥ��ơ��󥳥��Ȥδ��Ū�ʥ��å��Ԥ��ޤ��ɥ��ơ��󥳥��Ȥ��ܤ��å��ɬ�פ��ϡ�DocCheck �ɥå��åȤ��Ѥ��Ƥ�� .LP @@ -161,7 +149,7 @@ .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html \- �ɥ��ơ��󥳥��Ȥε��ˡ�˴ؤ�� Sun �ε�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html \- �ɥ��ơ��󥳥��Ȥε��ˡ�˴ؤ�� Sun �ε�� .TP 2 o .na @@ -179,13 +167,13 @@ .na \f2DocCheck �ɥå��å�\fP @ .fi -http://java.sun.com/javadoc/doccheck \- ��ե��Υɥ��ơ��󥳥��Ȥ��å��Ф��줿��顼��Υ�ݡ��Ȥ��ޤ��Doc Check �桼�ƥ��ƥ��ΰ��Ǥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ��ե��Υɥ��ơ��󥳥��Ȥ��å��Ф��줿��顼��Υ�ݡ��Ȥ��ޤ��Doc Check �桼�ƥ��ƥ��ΰ��Ǥ�� .TP 2 o .na \f2MIF �ɥå��å�\fP @ .fi -http://java.sun.com/javadoc/mifdoclet \- MIF��FrameMaker��PDF �ν񼰤� API �ɥ��Ȥ�ư��ޤ��MIF �� Adobe FrameMaker �θ򴹽񼰤Ǥ�� +http://java.sun.com/j2se/javadoc/mifdoclet/ \- MIF��FrameMaker��PDF �ν񼰤� API �ɥ��Ȥ�ư��ޤ��MIF �� Adobe FrameMaker �θ򴹽񼰤Ǥ�� .RE .SS �Ѹ� @@ -218,7 +206,7 @@ .na \f21.3\fP @ .fi -http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ��ѹ��Ƥ��ޤ��javadoc �ġ��¹Ԥ��Ȥ��ϡ�Javadoc �Υ֡��ȥ��饹�ѥ��ӥ��饹�ѥ��ˤ��뤹�٤Ƥλ��ȥ��饹��꡼�˥��ɤ��ɬ�פ��ޤ��ȥ��饹��Ĥ��ʤ��ϡ��֥��饹��Ĥ��ޤ��פȤ��ٹ�ɽ��ޤ��Javadoc �ġ��ϡ��饹��¸�ߤȤ��Υ��С��δ��̾��Ƚ�̤��Τ�ɬ�פʤ��٤Ƥξ��.class �ե��뤫��Ф��Ȥ��Ǥ��ޤ�� +http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses ��ѹ��Ƥ��ޤ��javadoc �ġ��¹Ԥ��Ȥ��ϡ�Javadoc �Υ֡��ȥ��饹�ѥ��ӥ��饹�ѥ��ˤ��뤹�٤Ƥλ��ȥ��饹��꡼�˥��ɤ��ɬ�פ��ޤ��ȥ��饹��Ĥ��ʤ��ϡ��֥��饹��Ĥ��ޤ��פȤ��ٹ�ɽ��ޤ��Javadoc �ġ��ϡ��饹��¸�ߤȤ��Υ��С��δ��̾��Ƚ�̤��Τ�ɬ�פʤ��٤Ƥξ��.class �ե��뤫��Ф��Ȥ��Ǥ��ޤ�� .LP .TP 3 ��ȥ��饹 (external referenced classes) @@ -310,7 +298,7 @@ .na \f2package.html\fP�� @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments�򻲾Ȥ��Ƥ�� .LP \f3�ѥå��ȥե��ν��\fP \- Javadoc �ġ��ϡ��¹Ի��˥ѥå��ȥե��ưŪ�˸��Υե��򸫤Ĥ��ȼ��ν��Ԥ��ޤ�� .RS 3 @@ -350,7 +338,7 @@ .RS 3 .TP 2 o -\f2<body>\fP �� \f2</body>\fP ��δ֤ˤ��뤹�٤Ƥ��Ƥ��оݤȤ��ƥ��ԡ�� +\f2<body>\fP �� \f2</body>\fP ��δ֤ˤ��뤹�٤Ƥ��Ƥ��оݤȤ��ƥ��ԡ�� .TP 2 o ��ץ��С��٤ƽ�� @@ -408,11 +396,7 @@ .LP �ƥ��ȥե�� doc ��Ȥ��ޤޤ��硢��Τ褦�˥磻��ɥ��ɤ�ޤ��ƥ��ȥ��ե��̾��Ϥ��ƥƥ��ȥե��Υɥ��Ȥ��褦�ˡ�Javadoc �ġ��̸Ĥ˼¹ԤǤ��褦��Ǥ��ޤ��Ȥ��С� \f2com/package1/test\-files/*.java �ʤɤǤ�\fP�� .LP -\f3��ե��Υƥ�ץ졼��\fP \- �ƥ�ץ졼�ȥե��̾��ϡ�.java�פǽ��뤳�Ȥ⤢��ޤ��ƥ�ץ졼�ȥե��ϥ��ѥ��Ǥ��ޤ��󡣥��ǥ��쥯�ȥ��ݻ��ե��Υƥ�ץ졼�Ȥ��ϡ� \f2Buffer\-Template.java\fP �Τ褦�˥ϥ��ե�䤽��¾��̵�� Java ʸ��̾��˴ޤ�뤳�Ȥǡ��ƥ�ץ졼�Ȥ��ʤ��褦�ˤ��ޤ��ϡ�Javadoc �ġ��뤬��Τϡ��.java��̾�� Υ��饹̾�Ǥ��륽��ե��Ǥ��뤿��Ǥ� ( -.na -\f2��Identifiers��\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625��)�� +\f3��ե��Υƥ�ץ졼��\fP \- �ƥ�ץ졼�ȥե��̾��ϡ�.java�פǽ��뤳�Ȥ⤢��ޤ��ƥ�ץ졼�ȥե��ϥ��ѥ��Ǥ��ޤ��󡣥��ǥ��쥯�ȥ��ݻ��ե��Υƥ�ץ졼�Ȥ��ϡ� \f2Buffer\-Template.java\fP �Τ褦�˥ϥ��ե�䤽��¾��̵�� Java ʸ��̾��˴ޤ�뤳�Ȥǡ��ƥ�ץ졼�Ȥ��ʤ��褦�ˤ��ޤ��ϡ�Javadoc �ġ��뤬��Τϡ��.java��̾�� Υ��饹̾�Ǥ��륽��ե��Ǥ��뤿��Ǥ� (Java ��ͤΡ�Identifiers�פ˴ؤ��򻲾�)�� .SH "��ե��" .LP �ǥե��ȤǤϡ�javadoc �ġ��ϡ�HTML ��Υɥ��Ȥ��ɸ��ɥå��åȤ�Ȥ��ޤ��Υɥå��åȤϡ��ʲ��μ��Υե��ޤ��줾�� HTML �ڡ��ϡ��ġ��Υե��ޤ��javadoc ��ե��̾��ˤϡ��饹�䥤�󥿥ե��̾��ˤ��ʤ��Τȡ��Ǥʤ�� ( \f2package\-summary.html �ʤ�\fP) �� 2 ��ब��ޤ��ԤΥ��롼�פΥե��̾�ˤϡ��ԤΥ��롼�פȥե��̾��礷�ʤ��褦�ˡ��ϥ��ե󤬴ޤޤ�Ƥ��ޤ�� @@ -756,7 +740,7 @@ ��ư��ϥС�� 1.3 ��ư��Ȥ��о�Ū�Ǥ��ޤǤΥС��Ǥϡ��ޤ��ϥ��¸�ߤ��С��Ȥϰ��ڷѾ��ޤ��Ǥ�� .TP 2 o -\f3{@inheritDoc} ��ޤॳ��Ȥ��Ū�˷Ѿ��\fP \- ��饤�󥿥� \f2{@inheritDoc}\fP �򡢥᥽�åɤμ��ޤ�� \f2@return\fP�� \f2@param\fP �� \f2@throws\fP �Τ��줫�Υ��ޤ��б��Ѿ��줿��ޤ��ϥ��Ȥ��ΰ��֤˥��ԡ��ޤ�� +\f3{@inheritDoc} ��ޤॳ��Ȥ��Ū�˷Ѿ��\fP \- ��饤�󥿥� \f2{@inheritDoc}\fP �򡢥᥽�åɤμ��ޤ�� \f2@return\fP �� \f2@param\fP ��ޤ�� \f2@throws\fP �Τ��줫�Υ��ޤ��б��Ѿ��줿��ޤ��ϥ��Ȥ��ΰ��֤˥��ԡ��ޤ�� .RE .LP �ɥ��ơ��󥳥��Ȥ�ºݤ˥��ԡ��Ѥ��ˤϡ��Ѿ��᥽�åɤΥ��ե��뤬 \-sourcepath �ǻ��ꤷ��ѥ��֤��Ƥ��뤳�Ȥ�ɬ�פˤʤ�ޤ��ޥ�ɹԤǡ��饹��ѥå��Ϥ�ɬ�פϤ��ޤ��󡣤��ϡ��饹��ɥ��Ȳ��륯�饹�Ǥʤ��Фʤ�ʤ��ä� 1.3.x ��Υ�꡼��Ȱۤʤ�ޤ�� @@ -954,7 +938,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 867 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 851 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1079,7 +1063,7 @@ .na \f2@author ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author�򻲾Ȥ��Ƥ�� .LP .RS 3 .TP 3 @@ -1094,11 +1078,11 @@ .na \f2@deprecated ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated�򻲾Ȥ��Ƥ�� .RS 3 .TP 2 o -Javadoc 1.2 �ʹߤǤ� \f2{@link}\fP ��Ѥ��ޤ��ˤ�ꡢɬ�פʾ��˥��饤��ǥ�󥯤��Ǥ��ޤ��Ȥ��С� +Javadoc 1.2 �ʹߤǤ� \f2{@link}\fP ��Ѥ��ޤ��ˤ�ꡢɬ�פʾ��˥��饤��ǥ�󥯤��Ǥ��ޤ��򼨤��ޤ�� .nf \f3 .fl @@ -1292,7 +1276,7 @@ .na \f2{@link} ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}�򻲾Ȥ��Ƥ�� .LP .TP 3 {@linkplain\ package.class#member\ label} @@ -1386,7 +1370,7 @@ .na \f2@param ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param�򻲾Ȥ��Ƥ�� .LP .TP 3 @return\ description @@ -1396,7 +1380,7 @@ .na \f2@return ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return�򻲾Ȥ��Ƥ�� .LP .TP 3 @see\ reference @@ -1644,7 +1628,7 @@ .nr 40 \n(79+(0*\n(38) .nr 80 +\n(40 .nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1358 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1342 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1751,7 +1735,7 @@ .LP \f3@see �θ��\fP \- Javadoc �ġ��ϡ��ե�� (.java)��ѥå��ե�� (package.html �ޤ�� package\-info.java) �ޤ��ϳ��ץե�� (overview.html) �˴ޤޤ�� \f2@see\fP ��ޤ��Ԥ� 2 �ĤΥե��Ǥϡ��̾�� \f2@see\fP ��˻��ꤷ�ʤ��Фʤ�ޤ��󡣥��ե��Ǥϡ��̾��ޤ��ʬ��̾��Ǥ��ޤ�� .LP -Javadoc �ġ��ϡ��Ǥʤ�̾��Ҥ��줿 \f2@see\fP �� \f2.java �ե��Ǹ��Ĥ��ȡ�\fP Java ��ѥ��Ʊ��ǻ��ꤵ�줿̾��򸡺��ޤ�� Javadoc �ġ��ϡ��̾��֤Τ��ޤ��򸡽Ф��ޤ�� ϡ��ɤˤ��Υ��顼��¸�ߤ��Ƥ��ʤ��Ȥ��Ȥ��Ƥ��뤿��Ǥ��θ��ϡ�Java �� 2 �Ǥ�� 6 �ϡ�Names�פ��Ƥ��ޤ��Javadoc �ġ��ϡ��Ϣ��륯�饹�ȥѥå��ӥ��ݡ��Ȥ��줿��饹�ȥѥå��Τ��٤Ƥ��̾��򸡺��ޤ��Ū�ˤϡ��ν��Ǹ��ޤ�� +Javadoc �ġ��ϡ��Ǥʤ�̾��Ҥ��줿 \f2@see\fP �� \f2.java �ե��Ǹ��Ĥ��ȡ�\fP Java ��ѥ��Ʊ��ǻ��ꤵ�줿̾��򸡺��ޤ�� Javadoc �ġ��ϡ��̾��֤Τ��ޤ��򸡽Ф��ޤ�� ϡ��ɤˤ��Υ��顼��¸�ߤ��Ƥ��ʤ��Ȥ��Ȥ��Ƥ��뤿��Ǥ��θ��ϡ�\f2Java ��\fP��Ƥ��ޤ��Javadoc �ġ��ϡ��Ϣ��륯�饹�ȥѥå��ӥ��ݡ��Ȥ��줿��饹�ȥѥå��Τ��٤Ƥ��̾��򸡺��ޤ��Ū�ˤϡ��ν��Ǹ��ޤ�� .RS 3 .TP 3 1. @@ -1990,7 +1974,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 1434 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1418 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2131,7 +2115,7 @@ .LP \f3@see ��\fP .br -��¦�Υ��Ȥϡ� \f2@see\fP �� \f2java.applet.Applet\fP �Τ褦��̤Υѥå��Υ��饹��ˤ��ˡ�̾��ɤΤ褦��ɽ��뤫�򼨤��Ƥ��ޤ�� +��¦�Υ��Ȥϡ� \f2@see\fP �� \f2java.applet.Applet\fP �ʤɤ��̤Υѥå��Υ��饹��ˤ��ˡ�̾��ɤΤ褦��ɽ��뤫�򼨤��Ƥ��ޤ�� .nf \f3 .fl @@ -2163,7 +2147,7 @@ .na \f2@see ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see�򻲾Ȥ��Ƥ�� .RE .RE .LP @@ -2198,7 +2182,7 @@ .na \f2��ľ�󲽤� FAQ��\fP @ .fi -http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing�⻲�Ȥ��Ƥ�� FAQ �ˤϡ��\-private ��å��ꤷ�ʤ�� javadoc ��¹Ԥ��Ƥ��Τ� private �ե��ɤ� @serial ��Ĥ��ʤ��Ȥ�� javadoc �ηٹ�ɽ��פʤɤΰ��Ū�ʼ��ؤβ��ܤ��Ƥ��ޤ��ľ�󲽷��ͤ˥��饹��ޤ��ˤϡ� +http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing�⻲�Ȥ��Ƥ�� FAQ �ˤϡ��\-private ��å��ꤷ�ʤ�� javadoc ��¹Ԥ��Ƥ��Τ� private �ե��ɤ� @serial ��Ĥ��ʤ��Ȥ�� javadoc �ηٹ�ɽ��פʤɤΰ��Ū�ʼ��ؤβ��ܤ��Ƥ��ޤ��ľ�󲽷��ͤ˥��饹��ޤ��ˤϡ� .na \f2��Sun �λ��͡�\fP @ .fi @@ -2241,7 +2225,7 @@ .na \f2@throws ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception�򻲾Ȥ��Ƥ�� .LP .TP 3 {@value\ package.class#field} @@ -2293,13 +2277,13 @@ @version\ version\-text \-version ��ץ��󤬻��Ѥ��ȡ��ɥ��Ȥ� [�С��] ��Ф��ɲä��ꤵ�줿 \f2version\-text\fP ��񤭹��ߤޤ��Υ��ϡ��Υ��ɤ��ޤޤ�륽�եȥ��θ��ߤΥС��ֹ��ݻ��褦�˰տޤ��Ƥ��ޤ��Ф��@since �ϡ��Υ��ɤ�Ƴ��줿�С��ֹ��ݻ��ޤ�� \f2version\-text\fP �ˤϡ��̤��¤�Ϥ��ޤ��󡣥С��󥿥��ѤǤ��Ĵ�٤�ˤϡ��֥��ѤǤ��פ򻲾Ȥ��Ƥ�� .LP -1 �ĤΥɥ��ơ��󥳥��Ȥ�ʣ�� \f2@version\fP ��ޤ�뤳�Ȥ��Ǥ��ޤ��̣��ʤ��ϰ��ǡ�1 �Ĥ� \f2@version\fP �� 1 �ĤΥС��ֹ��ꤹ�뤳�Ȥ⡢ʣ��ΥС��ֹ��ꤹ�뤳�Ȥ�Ǥ��ޤ��Ԥξ��ϡ�Javadoc �ġ��ˤ�ä�̾��̾��δ֤˥�� (\f2,\fP) �ȶ��̾��δ֤��ޤ��Ԥξ��ϡ��ƥ��Τ��Ϥ��뤳�Ȥʤ��ɥ��Ȥˤ��Τޤޥ��ԡ��ޤ��äơ��ޤǤϤʤ��Ƹ��б��̾��ڤ�ʸ��Ȥ�ɬ�פ��Ȥ��ϡ�1 �ĤΥ��ʣ��̾��ꤷ�Ƥ�� +1 �ĤΥɥ��ơ��󥳥��Ȥ�ʣ�� \f2@version\fP ��ޤ�뤳�Ȥ��Ǥ��ޤ��̣��ʤ��ϰ��ǡ�1 �Ĥ� \f2@version\fP �� 1 �ĤΥС��ֹ��ꤹ�뤳�Ȥ⡢ʣ��ΥС��ֹ��ꤹ�뤳�Ȥ�Ǥ��ޤ��Ԥξ��ϡ�Javadoc �ġ��ˤ�ä�̾��̾��δ֤˥�� (\f2,\fP) �ȶ��ޤ��Ԥξ��ϡ��ƥ��Τ��Ϥ��뤳�Ȥʤ��ɥ��Ȥˤ��Τޤޥ��ԡ��ޤ��äơ��ޤǤϤʤ��Ƹ��б��̾��ڤ�ʸ��Ȥ�ɬ�פ��Ȥ��ϡ�1 �ĤΥ��ʣ��̾��ꤷ�Ƥ�� .LP �ܺ٤ˤĤ��Ƥϡ� .na \f2@version ��Υɥ��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version�򻲾Ȥ��Ƥ�� .RE .SS ��ѤǤ�� @@ -2789,7 +2773,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 2009 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1993 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2982,7 +2966,7 @@ .LP .TP 3 \-classpath\ classpathlist -javadoc ��ȥ��饹 (\f2.class\fP �ե��) �θ��Ԥ��Ȥ��˻��Ѥ��ѥ��ꤷ�ޤ��ȥ��饹�Ȥϡ��ɥ��Ȳ��륯�饹�ȡ��Υ��饹��黲�Ȥ��뤹�٤ƤΥ��饹��ؤ��ޤ��\f2classpathlist\fP �ˤϡ�� (\f2:\fP) �Ƕ��ڤä�ʣ��Υѥ��ޤ�뤳�Ȥ��Ǥ��ޤ�� Javadoc �ġ��ϡ��ꤵ�줿�ѥ��ʲ��Τ��٤ƤΥ��֥ǥ��쥯�ȥ�򸡺��ޤ��classpathlist ��ꤹ��Ȥ��ϡ� +javadoc ��ȥ��饹 (\f2.class\fP �ե��) �θ��Ԥ��Ȥ��˻��Ѥ��ѥ��ꤷ�ޤ��ȥ��饹�Ȥϡ��ɥ��Ȳ��륯�饹�ȡ��Υ��饹��黲�Ȥ��뤹�٤ƤΥ��饹��ؤ��ޤ��\f2classpathlist\fP �ˤϡ�� (\f2:\fP) �Ƕ��ڤä�ʣ��Υѥ��ޤ�뤳�Ȥ��Ǥ��ޤ��Javadoc �ġ��ϡ��ꤵ�줿�ѥ��ʲ��Τ��٤ƤΥ��֥ǥ��쥯�ȥ�򸡺��ޤ��classpathlist ��ꤹ��Ȥ��ϡ� .na \f2��饹�ѥ�\fP @ .fi @@ -3243,13 +3227,13 @@ .LP \f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- \f2java.lang\fP�� \f2java.io\fP ��¾�� Java �ץ�åȥե��ѥå�� ( .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api ��) �˥�󥯤��ͤ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �� \f2\-d\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� +http://download.oracle.com/javase/7/docs/api/ ��) �˥�󥯤��礬��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �� \f2\-d\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- 2 �ĤΥѥå��ꡢ��Υɥ��Ȥ� Javadoc �ġ��ʣ��¹Ԥ��줿��ΤǤ��Ȥ��ޤ��ˡ��Υɥ��Ȥ��Хѥ��ʬ�䤵��Ƥ��Ȥ��ޤ��ξ�硢�ѥå��ϡ�API �Ǥ�� \f2com.apipackage\fP �ȡ�SPI (��ӥ��ץ��Х��󥿥ե��) �Ǥ�� \f2com.spipackage\fP �Ǥ��ɥ��Ȥγ�Ǽ��ϡ� \f2docs/api/com/apipackage\fP �� \f2docs/spi/com/spipackage\fP �Ǥ��API �ѥå��Υɥ��ȤϤ��Ǥ��Ѥߤǡ� \f2docs\fP ��ȥǥ��쥯�ȥ�ˤʤäƤ��Ȳ��ꤹ��ȡ�API �ɥ��ȤؤΥ�󥯤�ޤ� SPI �ѥå��ɥ��Ȳ��ˤϡ��Υ��ޥ�ɤ�¹Ԥ��ޤ�� @@ -3294,9 +3278,9 @@ .LP ��Ȥ��С�Java SE 6 API �Υѥå��ꥹ�Ȥ� .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list �ˤ��ꡢ��Τ褦��ƤǻϤޤäƤ��ޤ�� +http://download.oracle.com/javase/7/docs/api/package\-list �ˤ��ꡢ��Τ褦��ƤǻϤޤäƤ��ޤ�� .nf \f3 .fl @@ -3355,15 +3339,15 @@ .LP 1 �� javadoc �¹Ԥ�ʣ�� \f2\-linkoffline\fP ��ץ��Ǥ��ޤ��1.2.2 ��ϡ�ʣ��Υ��ץ��ꤹ�뤳�ȤϤǤ��ޤ��Ǥ�� .LP -\f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- http://java.sun.com/javase/6/docs/api �� \f2java.lang\fP�� \f2java.io\fP ��Ӥ��¾�� Java SE �ץ�åȥե��ѥå�� \f2�˥�󥯤��Ƥ�\fP Web �˥��Ǥ��ʤ��ͤ��ޤ��֥饦�� \f2��\fP +\f3��ɥ��Ȥؤ��Х�󥯤λ��\fP \- http://download.oracle.com/javase/7/docs/api/ �� \f2java.lang\fP�� \f2java.io\fP ��Ӥ��¾�� Java SE �ץ�åȥե��ѥå�� \f2�˥�󥯤��Ƥ⡢\fPWeb �˥��Ǥ��ʤ��ͤ��ޤ��֥饦�� \f2��\fP .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list �ˤ�� package\-list �ե��򳫤��ǥ��쥯�ȥ��¸�� 2 �� \f2packagelistLoc\fP �Ǥ��Υ��륳�ԡ��ؤΥѥ��ꤷ�ޤ��Ǥϡ��ѥå��ꥹ�ȥե��ϥ��ȥǥ��쥯�ȥ� "\f2.\fP" ��¸��Ƥ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �ʤɡ��¾��ɬ�ץ��ץ��ϼ��Ƥ��ޤ�� +http://download.oracle.com/javase/7/docs/api/package\-list �ˤ�� package\-list �ե��򳫤��ǥ��쥯�ȥ��¸�� 2 �� \f2packagelistLoc\fP �Ǥ��Υ��륳�ԡ��ؤΥѥ��ꤷ�ޤ��Ǥϡ��ѥå��ꥹ�ȥե��ϥ��ȥǥ��쥯�ȥ� "\f2.\fP" ��¸��Ƥ��ޤ��Υ��ޥ�ɤϡ�Java SE �ץ�åȥե��ѥå��ؤΥ�󥯤�ޤ��ѥå�� \f2com.mypackage\fP �Υɥ��Ȥ��ޤ��줿�ɥ��Ȥˤϡ��Ȥ��Х��饹�ĥ꡼�� \f2Object\fP ��饹�ؤΥ�󥯤��ޤޤ�Ƥ��ޤ��ʤ�� \f2\-sourcepath\fP �ʤɡ��¾�Υ��ץ��ϼ��Ƥ��ޤ�� .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi .LP @@ -3694,7 +3678,7 @@ .na \f2��Comparing Annotations and Javadoc Tags��\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations�򻲾Ȥ��Ƥ�� +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations�򻲾Ȥ��Ƥ�� .LP \-taglet ��ץ��Ѥ��ơ��ʣ��ʥ֥��å��䥫��।��饤�󥿥�� 뤳�Ȥ��Ǥ��ޤ�� .LP @@ -3890,13 +3874,13 @@ .fl .fl - <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a> + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> .fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. .fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners. + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ�� .fl \fP .fi @@ -3945,7 +3929,7 @@ .RS 3 .TP 2 o -\f3�� 1 \- 1 �İʾ�Υѥå��ε�ư��Ƶ�Ū�˼¹�\fP \- ��Ǥ� javadoc ��Ǥ�դΥǥ��쥯�ȥ꤫��¹ԤǤ��褦�ˡ�\-sourcepath ��Ѥ��Ƶ�Ū��Τ�� \-subpackages (1.4 �ο��ץ��) ��Ѥ��ޤ��ϡ� \f2java\fP �ǥ��쥯�ȥ�Υ��֥ѥå��򤿤ɤ�ޤ��κݤˡ� \f2java.net\fP �� \f2java.lang\fP ��롼�Ȥ˻��ĥѥå��Ͻ��ޤ��ΤȤ�� \f2java.lang �Υ��֥ѥå��\fP�Ǥ�� java.lang.ref �� \f2��ޤ�\fP�� +\f3�� 1 \- 1 �İʾ�Υѥå��ε�ư��Ƶ�Ū�˼¹�\fP \- ��Ǥ� javadoc ��Ǥ�դΥǥ��쥯�ȥ꤫��¹ԤǤ��褦�ˡ�\-sourcepath ��Ѥ��Ƶ�Ū��Τ�� \-subpackages (1.4 �ο��ץ��) ��Ѥ��ޤ��ϡ� \f2java\fP �ǥ��쥯�ȥ�Υ��֥ѥå��򤿤ɤ�ޤ��κݤˡ� \f2java.net\fP �� \f2java.lang\fP ��롼�Ȥ˻��ĥѥå��ޤ��ξ�硢 \f2java.lang\fP �Υ��֥ѥå��Ǥ�� \f2java.lang.ref\fP�� .nf \f3 .fl @@ -4068,13 +4052,13 @@ .fl \-bottom ' .fl - <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a> + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> .fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. .fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners.' \\ + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ��' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl @@ -4087,7 +4071,7 @@ \fP .fi .LP -�嵭�Υ��ޥ�ɤǡ� \f2packages\fP �ϡ��оݤΥѥå��̾ ( \f2java.applet java.lang\fP �ʤ�) ��äƤ��ե��̾��Ǥ��ƥ��ץ��Ρ�ñ��ǰϤޤ줿��¦�ˤϡ��ʸ��Ǥ��ޤ��󡣤��Ȥ��С��򥳥ԡ��ڡ��Ȥ��ϡ� \f2\-bottom\fP ��ץ��󤫤��ʸ��Ƥ��ˡ��Τ��ȤΡ��פ⻲�Ȥ��Ƥ�� +��ǡ� \f2packages\fP �ϡ��оݤΥѥå��̾ ( \f2java.applet java.lang\fP �ʤ�) ��äƤ��ե��̾��Ǥ��ƥ��ץ��Ρ�ñ��ǰϤޤ줿��¦�ˤϡ��ʸ��Ǥ��ޤ��󡣤��Ȥ��С��򥳥ԡ��ڡ��Ȥ��ϡ� \f2\-bottom\fP ��ץ��󤫤��ʸ��Ƥ��ˡ��Τ��ȤΡ��פ⻲�Ȥ��Ƥ�� .SS Makefile �� .LP @@ -4139,13 +4123,13 @@ .fl BOTTOM = ' .fl - <a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a bug or feature</a> + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> .fl Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. .fl Oracle is a registered trademark of Oracle Corporation and/or its affiliates. .fl - Other names may be trademarks of their respective owners.' + ��¾��̾�Τϡ��줾��ν�ͭ�Ԥξ�ɸ�ޤ��Ͽ��ɸ�Ǥ��' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -4229,13 +4213,13 @@ .na \f2Javadoc �Υۡ��ڡ��\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javah.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "14 Apr 2011" +.TH javah 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javap.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "14 Apr 2011" +.TH javap 1 "07 May 2011" .LP .SH "̾��" @@ -33,7 +33,7 @@ .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -42,7 +42,20 @@ .SH "��" .LP .LP -\f3javap\fP ��ޥ�ɤϡ��饹�ե��ե��֥뤷�ޤ��ν��Ϥϻ��ꤹ�륪�ץ��ˤ��ۤʤ�ޤ��ץ��ꤷ�ʤ��硢\f3javap\fP �ϡ��Υѥå��Ϥ��줿��饹�� protected �� public �Υե��ɤȥ᥽�åɤ��Ϥ��ޤ��\f3javap\fP �Ϥ��ν��Ϥ�ɸ��Ϥ�ɽ��ޤ��Ȥ��С��Υ��饹��򥳥�ѥ��뤹��Ȥ��ޤ�� +\f3javap\fP ��ޥ�ɤϡ�1 �Ĥޤ��ʣ��Υ��饹�ե��ե��֥뤷�ޤ��ν��Ϥϻ��ꤹ�륪�ץ��ˤ��ۤʤ�ޤ��ץ��ꤷ�ʤ��硢\f3javap\fP �ϡ��Υѥå��Ϥ��줿��饹�� protected �� public �Υե��ɤȥ᥽�åɤ��Ϥ��ޤ��\f3javap\fP �Ϥ��ν��Ϥ�ɸ��Ϥ�ɽ��ޤ�� +.LP +.RS 3 +.TP 3 +options +��ޥ�ɹԥ��ץ�� +.TP 3 +classes +��ν��оݤȤʤ� 1 �İʾ�Υ��饹 \f2DocFooter.class\fP �ʤ�) �Υꥹ�� (��ڤ�)��饹�ѥ��Ǹ��Ĥ��륯�饹�ϡ��ե��̾ ( \f2/home/user/myproject/src/DocFooter.class\fP �ʤ�) �ޤ�� URL ( \f2file:///home/user/myproject/src/DocFooter.class\fP �ʤ�) �ǻ��Ǥ��ޤ�� +.RE + +.LP +.LP +��Ȥ��С��Υ��饹��򥳥�ѥ��뤹��Ȥ��ޤ�� .LP .nf \f3 @@ -88,24 +101,24 @@ .LP .LP -\f3javap DocFooter\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� +\f3javap DocFooter.class\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl @@ -114,114 +127,116 @@ .LP .LP -\f3javap \-c DocFooter\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� +\f3javap \-c DocFooter.class\fP ��⤿�餹��Ϥϼ��Τ褦�ˤʤ�ޤ�� .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 <Method java.applet.Applet()> + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."<init>":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 <Method void resize(int, int)> + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 <String "LAST_UPDATED"> + 10: aload_0 .fl - 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 <Field java.lang.String date> + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 <String "EMAIL"> + 20: aload_0 .fl - 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 <Field java.lang.String email> + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 <Class java.lang.StringBuffer> + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 <Method java.lang.StringBuffer()> + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V .fl - 9 getfield #5 <Field java.lang.String date> + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 <String " by "> + 15: ldc #11 // String by .fl - 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 <Method java.lang.String toString()> + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 <Field java.lang.String email> + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 43: return .fl - 43 return +} .fl \fP .fi @@ -284,22 +299,7 @@ �᥽�åɤΥ��å�� \f2locals\fP �� \f2args\fP �ο��Ϥ��ޤ�� .TP 3 \-classpath path -\f3javap\fP ��饹��õ��˻��Ѥ��ѥ��ꤷ�ޤ��ǥե��Ȥޤ�� CLASSPATH �Ķ��ѿ��񤭤��ޤ��ǥ��쥯�ȥ�ϥ��ʬ�䤷�ޤ��äơ�\f2path\fP �ΰ��̷��ϼ��Τ褦�ˤʤ�ޤ�� -.nf -\f3 -.fl - .:<your_path> -.fl -\fP -.fi -��򼨤��ޤ�� -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +\f3javap\fP ��饹��õ��˻��Ѥ��ѥ��ꤷ�ޤ��ǥե��Ȥޤ�� CLASSPATH �Ķ��ѿ��񤭤��ޤ�� .TP 3 \-bootclasspath path �֡��ȥ��ȥ�åץ��饹��ɤ��ѥ��ꤷ�ޤ��֡��ȥ��ȥ�åץ��饹�ϡ��ǥե��ȤǤ� \f2jre/lib/rt.jar\fP ��¾�Τ��Ĥ�� JAR �ե�� ˤ��롢�� Java 2 �ץ�åȥե��륯�饹�Ǥ�� @@ -309,22 +309,6 @@ .RE .LP -.SH "�Ķ��ѿ�" -.LP -.RS 3 -.TP 3 -CLASSPATH -�桼��饹�ؤΥѥ��򥷥��ƥ�˻��ꤷ�ޤ��ǥ��쥯�ȥ�ϥ��ʬ�䤷�ޤ��򼨤��ޤ�� -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE - -.LP .SH "��Ϣ��" .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "14 Apr 2011" +.TH javaws 1 "07 May 2011" .LP .SH "̾��" @@ -81,7 +81,7 @@ \f2\-Xnosplash\fP .LP .LP -�ǽ�Υ��ץ�å��̤�ɽ��̵��ˤ��ޤ�� +��ץ�å��̤�ɽ��ޤ�� .LP .LP \f2\-open <arguments>\fP @@ -99,7 +99,7 @@ \f2\-online\fP .LP .LP -��饤��⡼�ɤǼ¹Ԥ��ޤ� (�ǥե��Ȥ�ư��)�� +��饤��⡼�ɤ��Ѥ��ޤ� (�ǥե��Ȥ�ư��)�� .LP .LP \f2\-wait\fP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "14 Apr 2011" +.TH jconsole 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "14 Apr 2011" +.TH jdb 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "14 Apr 2011" +.TH jhat 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "14 Apr 2011" +.TH jinfo 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "14 Apr 2011" +.TH jmap 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jps.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "14 Apr 2011" +.TH jps 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "14 Apr 2011" +.TH jrunscript 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "14 Apr 2011" +.TH jsadebugd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "14 Apr 2011" +.TH jstack 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "14 Apr 2011" +.TH jstat 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "14 Apr 2011" +.TH jstatd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2008, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jvisualvm 1 "14 Apr 2011" +.TH jvisualvm 1 "07 May 2011" .LP .SH "̾��" @@ -110,7 +110,7 @@ .na \f2Java VisualVM ��ȯ�ԤΥ��\fP @ .fi -https://visualvm.dev.java.net +http://visualvm.java.net .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998-2010 keytool tool, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "14 Apr 2011" +.TH keytool 1 "07 May 2011" .LP .SH "̾��" @@ -1087,9 +1087,9 @@ .fl keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<��ο��ѥ����>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<��ȥ��ο��ѥ����>\fP\f3 \-validity 180 .fl \fP .fi @@ -1099,10 +1099,10 @@ ��: ��Υ��ޥ�ɤ� 1 �Ԥ��Ϥ��ʤ��Фʤ�ޤ��ʣ��Ԥ��Ϥ��Ƥ��Τ��ɤߤ䤹��뤿��Ǥ�� .LP .LP -��Ǥϡ�working �ǥ��쥯�ȥ�� mykeystore �Ȥ��̾��Υ��ȥ�� (��ȥ��Ϥޤ�¸�ߤ��Ƥ��ʤ��Ȳ��ꤹ��)��ȥ��˥ѥ���� ab987c ��Ƥޤ��Υڥ��б��륨��ƥ��ƥ��Ρּ��̾�פϡ��̾Τ��Mark Jones�ס��ȿ�ñ�̤��Java�ס��ȿ��Oracle�ס�2 ʸ��ι��ֹ椬��US�פǤ��Υ��Ϥɤ�� 1024 �ӥåȤǡ��κ��ˤϥǥե��Ȥ� DSA ��르�ꥺ��Ѥ��ޤ�� +��Ǥϡ�working �ǥ��쥯�ȥ�� mykeystore �Ȥ��̾��Υ��ȥ�� (��ȥ��Ϥޤ�¸�ߤ��Ƥ��ʤ��Ȳ��ꤹ��)��ȥ��ˡ�\f2<��ȥ��ο��ѥ����>\fP �ǻ��ꤷ��ѥ���� Ƥޤ��Υڥ��б��륨��ƥ��ƥ��Ρּ��̾�פϡ��̾Τ��Mark Jones�ס��ȿ�ñ�̤��Java�ס��ȿ��Oracle�ס�2 ʸ��ι��ֹ椬��US�פǤ��Υ��Ϥɤ�� 1024 �ӥåȤǡ��κ��ˤϥǥե��Ȥ� DSA ��르�ꥺ��Ѥ��ޤ�� .LP .LP -��Υ��ޥ�ɤϡ��ȼ��̾��ޤ༫�ʽ�̾�� (�ǥե��Ȥ� SHA1withDSA ��̾��르�ꥺ��) ��ޤ��ͭ��֤� 180 ��Ǥ�� ϡ��̾��business�פ��ꤵ��륭��ȥ��ȥ��˴�Ϣ�դ��ޤ��ˤϥѥ���ɡ�kpi135�פ��Ƥ��ޤ�� +��Υ��ޥ�ɤϡ��ȼ��̾��ޤ༫�ʽ�̾�� (�ǥե��Ȥ� SHA1withDSA ��̾��르�ꥺ��) ��ޤ��ͭ��֤� 180 ��Ǥ�� ϡ��̾��business�פ��ꤵ��륭��ȥ��ȥ��˴�Ϣ�դ��ޤ��ˤϡ�\f2<��ο��ѥ����>\fP �ǻ��ꤷ��ѥ���ɤ��Ƥ��ޤ�� .LP .LP ��ץ��Υǥե��ͤ�Ȥ��ϡ��˼��ޥ�ɤ��û��뤳�Ȥ��Ǥ��ޤ��ºݤˤϡ��ץ�� 1 �Ĥ��ꤻ��˥��ޥ�ɤ�¹Ԥ��뤳�Ȥ��ǽ�Ǥ�� ǥե��ͤ��ĥ��ץ��Ǥϡ��ץ��ꤷ�ʤ��Хǥե��ͤ��Ȥ�졢ɬ�פ��ͤˤĤ��Ƥ��Ϥ��ޤ��Ȥ��С�ñ�˼��Τ褦��Ϥ��뤳�Ȥ�Ǥ��ޤ�� @@ -1120,7 +1120,7 @@ ��ξ��ϡ�mykey �Ȥ��̾�ǥ��ȥ��ȥ꤬��졢��줿��Υڥ�� 90 ��ͭ��ʾ��񤬤��Υ��ȥ�˳�Ǽ��ޤ��Υ��ȥ�ϡ��ۡ��ǥ��쥯�ȥ�� .keystore �Ȥ��̾��Υ��ȥ��֤��ޤ��Υ��ȥ��ޤ�¸�ߤ��Ƥ��ʤ��ϡ��ޤ��̾��󡢥��ȥ��Υѥ���ɡ��Υѥ���ɤˤĤ��Ƥϡ��Ϥ��ޤ�� .LP .LP -�ʲ��Ǥϡ��ץ��ꤷ�ʤ�� \f2\-genkeypair\fP ��ޥ�ɤ�¹Ԥ��ΤȤ��򼨤��ޤ��Ϥ��줿��ϡ��ǽ�˼�� \f2\-genkeypair\fP ��ޥ�ɤ��ͤ��Ϥ��ΤȤ��ޤ� (��Ȥ��С��Υѥ���ɤˤ� kpi135 �Ȼ��)�� +�ʲ��Ǥϡ��ץ��ꤷ�ʤ�� \f2\-genkeypair\fP ��ޥ�ɤ�¹Ԥ��ΤȤ��򼨤��ޤ��Ϥ��줿��ϡ��ǽ�˼�� \f2\-genkeypair\fP ��ޥ�ɤ��ͤ��Ϥ��ΤȤ��ޤ� (��Ȥ��С��̾�ˤ� cn=Mark Jones, ou=Java, o=Oracle, c=US �Ȼ��)�� .LP .SS ��ȯ�Զɤ��Ф��̾�դ��׵� @@ -1240,14 +1240,14 @@ .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<��ȥ��Υѥ����>\fP\f3 \-deststorepass \fP\f4<��åȥ��ȥ��Υѥ����>\fP\f3 .fl \fP .fi .LP .LP -�ޤ��importkeystore ��ޥ�ɤ�Ȥ��С��륽��ȥ��ñ��Υ��ȥ�򥿡��åȥ��ȥ��˥��ݡ��Ȥ��뤳�Ȥ�Ǥ��ޤ��ξ�硢�嵭��Ǽ��ץ��˲ä��ݡ��оݤȤʤ��̾��ꤹ��ɬ�פ��ޤ��srcalias ��ץ��ꤹ��ˤϡ��å��̾�⥳�ޥ�ɹԤ��Ǥ��ۤ��̩/��ݸ��ѥѥ���ɤ䥿��å��ݸ��ѥѥ���ɤ��Ǥ��ޤ��С��ץ��ץȤΤޤä��ɽ��ʤ� \f3keytool\fP ��ޥ�ɤ�ȯ�ԤǤ��ޤ��ϡ�\f3keytool\fP ��ޥ�ɤ򥹥��ץȥե��˴ޤ��ݤ��Ǥ��򼨤��ޤ�� +�ޤ��importkeystore ��ޥ�ɤ�Ȥ��С��륽��ȥ��ñ��Υ��ȥ�򥿡��åȥ��ȥ��˥��ݡ��Ȥ��뤳�Ȥ�Ǥ��ޤ��ξ�硢�嵭��Ǽ��ץ��˲ä��ݡ��оݤȤʤ��̾��ꤹ��ɬ�פ��ޤ��srcalias ��ץ��ꤹ��ˤϡ��å��̾�⥳�ޥ�ɹԤ��Ǥ��ۤ��̩/��ݸ��ѥѥ���ɤ䥿��å��ݸ��ѥѥ���ɤ��Ǥ��ޤ��ˡ�򼨤��ޥ�ɤ򼡤˼��ޤ�� .LP .nf \f3 @@ -1258,11 +1258,11 @@ .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<��ȥ��Υѥ����>\fP\f3 \-deststorepass \fP\f4<��åȥ��ȥ��Υѥ����>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<��ȥ�Υѥ����>\fP\f3 \-destkeypass \fP\f4<��åȥ��ȥ�Υѥ����>\fP\f3 .fl \-noprompt .fl @@ -1711,7 +1711,7 @@ ��: ��Ǥ��Ȥ��ƾ��򥤥�ݡ��Ȥ��ˡ��Ƥ򿵽Ť�Ĵ�٤Ƥ�� .LP .LP -�ޤ��Ƥ�ɽ�� (\-printcert ��ޥ�ɤ��Ѥ��뤫��ޤ�� \-noprompt ��ץ��ꤷ�ʤ�� \-importcert ��ޥ�ɤ��)�� ɽ��줿��Υե��󥬡��ץ��Ȥ��Ԥ��ե��󥬡��ץ��ȤȰ��פ��뤫�ɤ��ǧ��ޤ��Ȥ��С��桼��Ƥ��ơ��ξ�� /tmp/cert �Ȥ��̾��ǥե��˳�Ǽ��Ƥ��Ȥ��ޤ�� ξ��ϡ��Ǥ��Υꥹ�Ȥˤ��ξ��ɲä��ˡ� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ƥե��󥬡��ץ��Ȥ�ɽ��Ǥ��ޤ��Ȥ��С��Τ褦�ˤ��ޤ�� +�ޤ��Ƥ�ɽ�� (\-printcert ��ޥ�ɤ��Ѥ��뤫��ޤ�� \-noprompt ��ץ��ꤷ�ʤ�� \-importcert ��ޥ�ɤ��)�� ޥ�ɤ��Ѥ�� ɽ��줿��Υե��󥬡��ץ��Ȥ��Ԥ��ե��󥬡��ץ��ȤȰ��פ��뤫�ɤ��ǧ��ޤ��Ȥ��С��桼��Ƥ��ơ��ξ�� /tmp/cert �Ȥ��̾��ǥե��˳�Ǽ��Ƥ��Ȥ��ޤ�� ξ��ϡ��Ǥ��Υꥹ�Ȥˤ��ξ��ɲä��ˡ� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ƥե��󥬡��ץ��Ȥ�ɽ��Ǥ��ޤ��Ȥ��С��Τ褦�ˤ��ޤ�� .LP .nf \f3 @@ -1744,7 +1744,7 @@ ��ˡ��ʪ��Ϣ��ο�ʪ��󼨤��ե��󥬡��ץ��Ȥȡ��Υ��ޥ�ɤ�ɽ��줿�ե��󥬡��ץ��ȤȤ��Ӥ��ޤ��ե��󥬡��ץ��Ȥ��פ��С��Ǥۤ��β��Ԥ� (��Ԥʤ�) �ˤ��Τ��ؤ��Ԥ��Ƥ��ʤ��Ȥ��ǧ�Ǥ��ޤ��Ǥ��μ�ι��⤬�Ԥ��Ƥ��硢��å��Ԥ鷺�˾��򥤥�ݡ��Ȥ��ȡ��Ԥˤ�äƽ�̾��줿��٤ƤΤ�� (��Ū�տޤ��ĥ��饹�ե��ޤ�� JAR �ե��ʤ�) ��ꤹ�뤳�Ȥˤʤ�ޤ�� .LP .LP -��: ��򥤥�ݡ��Ȥ��ɬ�� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ʤ��Фʤ�ʤ��櫓�ǤϤ��ޤ��󡣥��ȥ��ο��Ǥ��Υꥹ�Ȥ˾��ɲä�� \f2\-importcert\fP ��ޥ�ɤ�¹Ԥ��ȡ��ξ��ɽ��졢��ǧ��å��ɽ��ޤ��ݡ��ϡ��λ��ߤǤ��ޤ��ǧ��å��ɽ��Τϡ�\-importcert ��ޥ�ɤ� \-noprompt ��ץ��ꤻ��˼¹Ԥ��Ǥ�� \f2\-noprompt\fP ��ץ��󤬻��ꤵ��Ƥ��硢�桼��Ȥ��äϹԤ��ޤ�� +��: ��򥤥�ݡ��Ȥ��ɬ�� \f2\-printcert\fP ��ޥ�ɤ�¹Ԥ��ʤ��Фʤ�ʤ��櫓�ǤϤ��ޤ��󡣥��ȥ��ο��Ǥ��Υꥹ�Ȥ˾��ɲä�� \f2\-importcert\fP ��ޥ�ɤ�¹Ԥ��ȡ��ξ��ɽ��졢��ǧ��å��ɽ��ޤ��ݡ��ϡ��λ��ߤǤ��ޤ��ǧ��å��ɽ��Τϡ�\-importcert ��ޥ�ɤ� \-noprompt ��ץ��ꤻ��˼¹Ԥ��Ǥ�� ޥ�ɤ��Ѥ�� \f2\-noprompt\fP ��ץ��󤬻��ꤵ��Ƥ��硢�桼��Ȥ��äϹԤ��ޤ�� .LP .SS �ѥ���ɤ˴ؤ��ջ�� diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "14 Apr 2011" +.TH native2ascii 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "14 Apr 2011" +.TH orbd 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "14 Apr 2011" +.TH pack200 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "14 Apr 2011" +.TH policytool 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "14 Apr 2011" +.TH rmic 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "14 Apr 2011" +.TH rmid 1 "07 May 2011" .LP .SH "̾��" @@ -121,7 +121,7 @@ .LP .LP -ɬ�פ˱��ƥ��ӥ��򳫻Ϥ��褦��ꤹ��ܺ٤ˤĤ��Ƥϡ� \f2inetd\fP (Solaris) �ޤ�� \f2xinetd\fP (Linux) �Υޥ˥奢��ڡ��򻲾Ȥ��Ƥ�� +ɬ�פ˱��ƥ��ӥ��򳫻Ϥ��褦��ꤹ��ܺ٤ˤĤ��Ƥϡ� \f2inetd\fP (Solaris �ξ��)��ޤ�� \f2xinetd\fP (Linux) �Υޥ˥奢��ڡ��򻲾Ȥ��Ƥ�� .LP .SH "��ץ��" .LP @@ -239,7 +239,7 @@ .fl \fP .fi -�ǽ��Ϳ��Ƥ��륢��ϡ� \f2rmid\fP ��Ф��ѥ�̾�ˤ��Ū�˻��ꤵ�� \f2java\fP ��ޥ�ɤ� 1.7.0 �С��μ¹Ԥ��Ĥ��ޤ��ǥե��ȤǤϡ�java.home �ˤ��С�� \f2java\fP ��ޥ�� ( \f2rmid\fP ��Ѥ��Τ�Ʊ��С��) ��Ѥ��뤿�ᡢ��Υ��ޥ�ɤϡ��ݥꥷ��ե��ǻ��ꤹ��ɬ�פϤ��ޤ��2 ��ܤΥ��ϡ� \f2rmid\fP ��Ф��ơ��ǥ��쥯�ȥ� \f2/files/apps/rmidcmds\fP ��Ǥ�դΥ��ޥ�ɤμ¹Ը��¤��Ĥ��ޤ�� +�ǽ��Ϳ��Ƥ��륢��ϡ� \f2rmid\fP ��Ф��ѥ�̾�ˤ��Ū�˻��ꤵ�� \f2java\fP ��ޥ�ɤ� 1.7.0 �С��μ¹Ԥ��Ĥ��ޤ��ǥե��ȤǤϡ�java.home �ˤ��С�� \f2java\fP ��ޥ�ɤ��Ѥ��ޤ�� \f2rmid\fP ��Ѥ��Τ�Ʊ��С��) ��Ѥ��뤿�ᡢ��Υ��ޥ�ɤϡ��ݥꥷ��ե��ǻ��ꤹ��ɬ�פϤ��ޤ��2 ��ܤΥ��ϡ� \f2rmid\fP ��Ф��ơ��ǥ��쥯�ȥ� \f2/files/apps/rmidcmds\fP ��Ǥ�դΥ��ޥ�ɤμ¹Ը��¤��Ĥ��ޤ�� .LP 3 ��ܤ��Ϳ��Ƥ��륢�� \f2ExecOptionPermission\fP �ϡ� \f2rmid\fP ��Ф��ơ��ƥ��ݥꥷ��ե�� \f2/files/policies/group.policy\fP �Ȥ��Ƥ��뵯ư��롼�פγ��Ϥ��Ĥ��ޤ��Υ��ϡ��ư��롼�פ� \f2java.security.debug\fP �ץ��ѥƥ��Ѥ��뤳�Ȥ��Ĥ��Ƥ��ޤ��Ǹ�Υ��ϡ��ư��롼�פ� \f2sun.rmi\fP �Ȥ��ץ��ѥƥ��̾�γ��Ǥ�դΥץ��ѥƥ��Ѥ��뤳�Ȥ��Ĥ��Ƥ��ޤ�� .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "14 Apr 2011" +.TH rmiregistry 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "14 Apr 2011" +.TH schemagen 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "14 Apr 2011" +.TH serialver 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "14 Apr 2011" +.TH servertool 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "14 Apr 2011" +.TH tnameserv 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "14 Apr 2011" +.TH unpack200 1 "07 May 2011" .LP .SH "̾��" diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "14 Apr 2011" +.TH wsgen 1 "07 May 2011" .SH "̾��" wsgen \- XML Web Services (JAX\-WS) 2.0 �Τ�� Java(TM) API .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "14 Apr 2011" +.TH wsimport 1 "07 May 2011" .SH "̾��" wsimport \- XML Web Services (JAX\-WS) 2.0 �Τ�� Java(TM) API .LP @@ -818,7 +818,7 @@ .ll \n(34u*1u/3u .if \n(.l<\n(81 .ll \n(81u .in 0 -ǧ�ھ��ޤ�ե��ꤹ�� WSDL URI �Ǥ�� URI �η��ϼ��ΤȤ��Ǥ� http://username:password@example.org/stock?wsdl +ǧ�ھ��ޤ�ե��ꤹ�� WSDL URI �Ǥ�� URI �η��ϼ��ΤȤ��Ǥ� http://\f2<�桼��̾>\fP:\f2<�ѥ����>\fP@\f2<�ۥ��̾>\fP/\f2<Web ��ӥ�̾>\fP?wsdl .br .di .nr b| \n(dn @@ -1057,10 +1057,10 @@ .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -Java ��ƥ��ե��Ȥ�� \f2http://stockquote.xyz/quote?wsdl\fP �򥤥�ݡ��Ȥ��뤳�Ȥǡ��Υ��ƥ��ե��Ȥ򥳥�ѥ��뤷�ޤ�� +Java ��ƥ��ե��Ȥ�� \f2http://stockquote.example.com/quote?wsdl\fP �򥤥�ݡ��Ȥ��Ƥ�� Java ��ƥ��ե��Ȥ򥳥�ѥ��뤷�ޤ� .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 --- a/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/ja/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "14 Apr 2011" +.TH xjc 1 "07 May 2011" .LP .ad c diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jar.1 --- a/jdk/src/solaris/doc/sun/man/man1/jar.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jar.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,17 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jar 1 "02 Jun 2010" +.TH jar 1 "10 May 2011" .LP .SH "Name" jar\-The Java Archive Tool .LP -\f3jar\fP combines multiple files into a single JAR archive file. +\f3jar\fP combines multiple files into a single JAR archive file. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 Create jar file @@ -53,9 +51,6 @@ where: .LP .RS 3 - -.LP -.RS 3 .TP 3 cuxtiv0Mmfe Options that control the \f2jar\fP command. @@ -80,11 +75,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP The \f3jar\fP tool combines multiple files into a single JAR archive file. \f3jar\fP is a general\-purpose archiving and compression tool, based on ZIP and the .na \f2ZLIB\fP @ @@ -93,9 +85,6 @@ .LP Typical usage to combine files into a jar file is: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -103,20 +92,16 @@ .fl \fP .fi -.RE .LP In this example, all the class files in the current directory are placed into the file named \f2myFile.jar\fP. The jar tool automatically generates a manifest file entry named \f2META\-INF/MANIFEST.MF\fP. It is always the first entry in the jar file. The manifest file declares meta\-information about the archive, and stores that data as \f2name\ :\ value\fP pairs. Refer to the .na \f2JAR file specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. .LP If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -124,7 +109,6 @@ .fl \fP .fi -.RE .LP An existing manifest file must end with a new line character.\ \f3jar\fP does not parse the last line of a manifest file if it does not end with a new line character. @@ -135,9 +119,6 @@ .LP \f3Note:\ \fP A jar command that specifies \f2cfm\fP on the command line instead of \f2cmf\fP (the order of the m and \-f options are reversed), the \f3jar\fP command line must specify the name of the jar archive first, followed by the name of the manifest file: -.RS 3 - -.LP .nf \f3 .fl @@ -145,16 +126,12 @@ .fl \fP .fi -.RE .LP The manifest is in a text format inspired by RFC822 ASCII format, so it is easy to view and process manifest\-file contents. .LP To extract the files from a jar file, use \f2x\fP: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -162,15 +139,11 @@ .fl \fP .fi -.RE .LP .LP To extract individual files from a jar file, supply their filenames: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -178,7 +151,6 @@ .fl \fP .fi -.RE .LP .LP @@ -186,10 +158,7 @@ .na \f2JarIndex\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest. -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\ only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest. .LP .nf \f3 @@ -198,7 +167,6 @@ .fl \fP .fi -.RE .LP .LP @@ -210,9 +178,6 @@ .br To copy directories, first compress files in \f2dir1\fP to \f2stdout\fP, then extract from \f2stdin\fP to \f2dir2\fP (omitting the \f2\-f\fP option from both \f2jar\fP commands): .LP -.RS 3 - -.LP .nf \f3 .fl @@ -220,7 +185,6 @@ .fl \fP .fi -.RE .LP .LP @@ -228,12 +192,10 @@ .na \f2Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar. +http://download.oracle.com/javase/tutorial/deployment/jar. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 c @@ -241,9 +203,6 @@ .TP 3 u Updates an existing file \f2jarfile\fP (when \f2f\fP is specified) by adding to it files and directories specified by \f2inputfiles\fP. For example: -.RS 3 - -.LP .nf \f3 .fl @@ -251,11 +210,7 @@ .fl \fP .fi -.RE would add the file \f2foo.class\fP to the existing jar file \f2foo.jar\fP. The \f2\-u\fP option can also update the manifest entry, as given by this example: -.RS 3 - -.LP .nf \f3 .fl @@ -263,7 +218,6 @@ .fl \fP .fi -.RE updates the \f2foo.jar\fP manifest with the \f2name : value\fP pairs in \f2manifest\fP. .TP 3 x @@ -274,9 +228,6 @@ .TP 3 i Generate index information for the specified \f2jarfile\fP and its dependent jar files. For example: -.RS 3 - -.LP .nf \f3 .fl @@ -284,9 +235,8 @@ .fl \fP .fi -.RE .LP -would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example. +would generate an \f2INDEX.LIST\fP file in \f2foo.jar\fP which contains location information for each package in \f2foo.jar\fP and all the jar files specified in the \f2Class\-Path\fP attribute of \f2foo.jar\fP. See the index example. .TP 3 f Specifies the file \f2jarfile\fP to be created (\f2c\fP), updated (\f2u\fP), extracted (\f2x\fP), indexed (\f2i\fP), or viewed (\f2t\fP). The \f2\-f\fP option and filename \f2jarfile\fP are a pair \-\- if present, they must both appear. Omitting \f2f\fP and \f2jarfile\fP accepts a jar file name from \f2stdin\fP(for x and t) or sends jar file to \f2stdout\fP (for c and u). @@ -301,12 +251,10 @@ Do not create a manifest file entry (for c and u), or delete a manifest file entry if one exists (for u). .TP 3 m -Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value. -.LP +Includes \f2name : value\fP attribute pairs from the specified manifest file \f2manifest\fP in the file at \f2META\-INF/MANIFEST.MF\fP. \f2jar\fP adds a \f2name\ :\ value\fP pair unless an entry already exists with the same name, in which case \f2jar\fP updates its value. +.br +.br On the command line, the letters \f3m\fP and \f3f\fP must appear in the same order that \f2manifest\fP and \f2jarfile\fP appear. Example use: -.RS 3 - -.LP .nf \f3 .fl @@ -314,22 +262,18 @@ .fl \fP .fi -.RE You can add special\-purpose \f2name\ :\ value\fP attribute pairs to the manifest that aren't contained in the default manifest. For example, you can add attributes specifying vendor information, version information, package sealing, or to make JAR\-bundled applications executable. See the .na \f2JAR Files\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option. -.LP +http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial for examples of using the \f4\-m\fP option. .TP 3 e Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file. .br .br +.br For example, this command creates \f2Main.jar\fP where the \f2Main\-Class\fP attribute value in the manifest is set to \f2Main\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -337,12 +281,7 @@ .fl \fP .fi -.RE -.LP The java runtime can directly invoke this application by running the following command: -.RS 3 - -.LP .nf \f3 .fl @@ -350,11 +289,7 @@ .fl \fP .fi -.RE If the entrypoint class name is in a package it may use either a dot (".") or slash ("/") character as the delimiter. For example, if \f2Main.class\fP is in a package called \f2foo\fP the entry point can be specified in the following ways: -.RS 3 - -.LP .nf \f3 .fl @@ -362,11 +297,7 @@ .fl \fP .fi -.RE or -.RS 3 - -.LP .nf \f3 .fl @@ -374,18 +305,13 @@ .fl \fP .fi -.RE -\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted. -.LP +\f3Note:\ \fP specifying both \f2\-m\fP and \f2\-e\fP options together when the given manifest also contains the \f2Main\-Class\fP attribute results in an ambigous \f2Main.class\fP specification, leading to an error and the jar creation or update operation is aborted. .TP 3 -\-C \ dir +\-C\ dir Temporarily changes directories (\f2cd\fP\ \f2dir\fP) during execution of the \f2jar\fP command while processing the following \f2inputfiles\fP argument. Its operation is intended to be similar to the \f2\-C\fP option of the UNIX \f2tar\fP utility. .br .br For example, this command changes to the \f2classes\fP directory and adds the \f2bar.class\fP from that directory to \f2foo.jar\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -393,11 +319,7 @@ .fl \fP .fi -.RE This command changes to the \f2classes\fP directory and adds to \f2foo.jar\fP all files within the \f2classes\fP directory (without creating a classes directory in the jar file), then changes back to the original directory before changing to the \f2bin\fP directory to add \f2xyz.class\fP to \f2foo.jar\fP. -.RS 3 - -.LP .nf \f3 .fl @@ -405,11 +327,7 @@ .fl \fP .fi -.RE If \f2classes\fP holds files \f2bar1\fP and \f2bar2\fP, then here's what the jar file will contain using \f2jar tf foo.jar\fP: -.RS 3 - -.LP .nf \f3 .fl @@ -425,7 +343,6 @@ .fl \fP .fi -.RE .LP .TP 3 \-Joption @@ -435,8 +352,6 @@ .LP .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP To shorten or simplify the jar command line, you can specify one or more files that themselves contain arguments to the \f2jar\fP command (except \f2\-J\fP options). This enables you to create jar commands of any length, overcoming command line limits imposed by the operating system. .LP An argument file can include options and filenames. The arguments within a file can be space\-separated or newline\-separated. Filenames within an argument file are relative to the current directory, not relative to the location of the argument file. Wildcards (*) that might otherwise be expanded by the operating system shell are not expanded. Use of the \f2@\fP character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. @@ -447,24 +362,17 @@ .br The example below, \f2classes.list\fP holds the names of files output by a \f2find\fP command: .LP -.RS 3 - -.LP .nf \f3 .fl % find \fP\f3.\fP \-name '*.class' \-print > classes.list .fl .fi -.RE .LP .LP You can then execute the \f2jar\fP command on \f2Classes.list\fP by passing it to \f2jar\fP using argfile syntax: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -472,13 +380,9 @@ .fl \fP .fi -.RE .LP An argument file can specify a path, but any filenames inside the argument file that have relative paths are relative to the current working directory, not to the path passed in. Here is an example: -.RS 3 - -.LP .nf \f3 .fl @@ -486,7 +390,6 @@ .fl \fP .fi -.RE .LP .LP @@ -494,12 +397,7 @@ .LP .SH "EXAMPLES" .LP - -.LP To add all the files in a particular directory to an archive (overwriting contents if the archive already exists). Enumerating verbosely (with the \f2\-v\fP option) will tell you more information about the files in the archive, such as their size and last modified date. -.RS 3 - -.LP .nf \f3 .fl @@ -535,13 +433,9 @@ .fl \fP .fi -.RE .LP If you already have separate subdirectories for images, audio files and classes, you can combine them into a single jar file: -.RS 3 - -.LP .nf \f3 .fl @@ -585,13 +479,9 @@ .fl \fP .fi -.RE .LP To see the entry names in the jarfile, use the \f2t\fP option: -.RS 3 - -.LP .nf \f3 .fl @@ -619,7 +509,6 @@ .fl \fP .fi -.RE .LP .LP @@ -630,9 +519,6 @@ .br .LP -.RS 3 - -.LP If you split the inter\-dependent classes for a stock trade application into three jar files: \f2main.jar\fP, \f2buy.jar\fP, and \f2sell.jar\fP. .br @@ -660,38 +546,34 @@ .fi .LP -An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources. -.RE +An \f2INDEX.LIST\fP file is inserted to the \f2META\-INF\fP directory. This enables the application class loader to download the specified jar files when it is searching for classes or resources. .SH "SEE ALSO" .LP - .LP .na \f2The Jar Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jarGuide.html -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html +.LP .LP .na \f2The Jar File Specification\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html +.LP .LP .na \f2The JarIndex Spec\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Index -.br - +http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index +.LP .LP .na \f2Jar Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar on the Java Software web site. -.br - +http://download.oracle.com/javase/tutorial/deployment/jar/index.html +.LP .LP -pack200(1) +pack200(1) +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jarsigner.1 --- a/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jarsigner 1 "02 Jun 2010" +.TH jarsigner 1 "10 May 2011" .LP .SH "Name" jarsigner \- JAR Signing and Verification Tool .LP -.RS 3 - -.LP .LP Generates signatures for Java ARchive (JAR) files, and verifies the signatures of signed JAR files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -51,8 +45,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jarsigner\fP tool is used for two purposes: .LP @@ -109,9 +101,6 @@ .SS Keystore Aliases .LP -.RS 3 - -.LP .LP All keystore entities are accessed via unique \f2aliases\fP. .LP @@ -121,37 +110,29 @@ .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3 .fl - \-keypass dukekeypasswd MyJARFile.jar duke + \-keypass \fP\f4<private key password>\fP\f3 MyJARFile.jar duke .fl \fP .fi .LP .LP -Keystores are protected with a password, so the store password (in this case "myspass") must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password (in this case "dukekeypasswd") must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password. +Keystores are protected with a password, so the store password must be specified. You will be prompted for it if you don't specify it on the command line. Similarly, private keys are protected in a keystore with a password, so the private key's password must be specified, and you will be prompted for it if you don't specify it on the command line and it isn't the same as the store password. .LP -.RE .SS Keystore Location .LP -.RS 3 - -.LP .LP \f3jarsigner\fP has a \f2\-keystore\fP option for specifying the URL of the keystore to be used. The keystore is by default stored in a file named \f2.keystore\fP in the user's home directory, as determined by the \f2user.home\fP system property. On Solaris systems \f2user.home\fP defaults to the user's home directory. .LP .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based, for example, if it resides on a hardware token device. .LP -.RE .SS Keystore Implementation .LP -.RS 3 - -.LP .LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP @@ -166,13 +147,13 @@ .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP .LP Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP .LP For \f3jarsigner\fP and \f3keytool\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Change Keystore" command in the Edit menu. @@ -227,41 +208,36 @@ .na \f2KeyTool and JarSigner\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details. +http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details. .LP -.RE .SS Supported Algorithms .LP -.RS 3 - .LP -.LP -By default, \f3jarsigner\fP signs a JAR file using either +By default, \f3jarsigner\fP signs a JAR file using one of the following: .LP .RS 3 .TP 2 o -DSA (Digital Signature Algorithm) with the SHA\-1 digest algorithm, or +DSA (Digital Signature Algorithm) with the SHA1 digest algorithm .TP 2 o -the RSA algorithm with the SHA\-256 digest algorithm. +RSA algorithm with the SHA256 digest algorithm. +.TP 2 +o +EC (Elliptic Curve) cryptography algorithm with the SHA256 with ECDSA (Elliptic Curve Digital Signature Algorithm). .RE .LP .LP -That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. +That is, if the signer's public and private keys are DSA keys, \f3jarsigner\fP will sign the JAR file using the "SHA1withDSA" algorithm. If the signer's keys are RSA keys, \f3jarsigner\fP will attempt to sign the JAR file using the "SHA256withRSA" algorithm. If the signer's keys are EC keys, \f3jarsigner\fP will sign the JAR file using the "SHA256withECDSA" algorithm. .LP .LP These default signature algorithms can be overridden using the \f2\-sigalg\fP option. .LP -.RE .SS The Signed JAR File .LP -.RS 3 - -.LP .LP When \f3jarsigner\fP is used to sign a JAR file, the output signed JAR file is exactly the same as the input JAR file, except that it has two additional files placed in the META\-INF directory: .LP @@ -271,7 +247,7 @@ a signature file, with a .SF extension, and .TP 2 o -a signature block file, with a .DSA extension. +a signature block file, with a .DSA, .RSA, or .EC extension. .RE .LP @@ -281,23 +257,20 @@ .nf \f3 .fl - \-sigFile MKSIGN +\-sigFile MKSIGN .fl \fP .fi .LP .LP -the files are named "MKSIGN.SF" and "MKSIGN.DSA". +The files are named "MKSIGN.SF" and "MKSIGN.DSA". .LP .LP If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not allowed in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. Legal characters include letters, digits, underscores, and hyphens. .LP \f3The Signature (.SF) File\fP .LP -.RS 3 - -.LP .LP A signature file (the .SF file) looks similar to the manifest file that is always included in a JAR file when \f3jarsigner\fP is used to sign the file. That is, for each source file included in the JAR file, the .SF file has three lines, just as in the manifest file, listing the following: .LP @@ -320,25 +293,14 @@ .LP The signature file also, by default, includes a header containing a hash of the whole manifest file. The presence of the header enables verification optimization, as described in JAR File Verification. .LP -.RE -\f3The Signature Block (.DSA) File\fP -.LP -.RS 3 - +\f3The Signature Block File\fP .LP -.LP -The .SF file is signed and the signature is placed in the .DSA file. The .DSA file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. -.LP -.RE -.RE +The .SF file is signed and the signature is placed in the signature block file. This file also contains, encoded inside it, the certificate or certificate chain from the keystore which authenticates the public key corresponding to the private key used for signing. The file has the extension .DSA, .RSA, or .EC depending on the digest algorithm used. .SS Signature Timestamp .LP -.RS 3 - .LP -.LP -\f2jarsigner\fP tool can now generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options: +\f2jarsigner\fP tool can generate and store a signature timestamp when signing a JAR file. In addition, \f2jarsigner\fP supports alternative signing mechanisms. This behavior is optional and is controlled by the user at the time of signing through these options: .LP .RS 3 .TP 2 @@ -359,31 +321,31 @@ .LP Each of these options is detailed in the Options section below. .LP -.RE .SS JAR File Verification .LP -.RS 3 - -.LP .LP A successful JAR file verification occurs if the signature(s) are valid, and none of the files that were in the JAR file when the signatures were generated have been changed since then. JAR file verification involves the following steps: .LP .RS 3 .TP 3 1. -Verify the signature of the .SF file itself. -.LP -That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with. +Verify the signature of the .SF file itself. +.br +.br +That is, the verification ensures that the signature stored in each signature block (.DSA) file was in fact generated using the private key corresponding to the public key whose certificate (or certificate chain) also appears in the .DSA file. It also ensures that the signature is a valid signature of the corresponding signature (.SF) file, and thus the .SF file has not been tampered with. .TP 3 2. -Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest. -.LP -The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step. -.LP -If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File). -.LP -One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file. +Verify the digest listed in each entry in the .SF file with each corresponding section in the manifest. +.br +.br +The .SF file by default includes a header containing a hash of the entire manifest file. When the header is present, then the verification can check to see whether or not the hash in the header indeed matches the hash of the manifest file. If that is the case, verification proceeds to the next step. +.br +.br +If that is not the case, a less optimized verification is required to ensure that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file (see The Signature (.SF) File). +.br +.br +One reason the hash of the manifest file that is stored in the .SF file header may not equal the hash of the current manifest file would be because one or more files were added to the JAR file (using the \f2jar\fP tool) after the signature (and thus the .SF file) was generated. When the \f2jar\fP tool is used to add files, the manifest file is changed (sections are added to it for the new files), but the .SF file is not. A verification is still considered successful if none of the files that were in the JAR file when the signature was generated have been changed since then, which is the case if the hashes in the non\-header sections of the .SF file equal the hashes of the corresponding sections in the manifest file. .TP 3 3. Read each file in the JAR file that has an entry in the .SF file. While reading, compute the file's digest, and then compare the result with the digest for this file in the manifest section. The digests should be the same, or verification fails. @@ -393,13 +355,9 @@ .LP If any serious verification failures occur during the verification process, the process is stopped and a security exception is thrown. It is caught and displayed by \f3jarsigner\fP. .LP -.RE .SS Multiple Signatures for a JAR File .LP -.RS 3 - -.LP .LP A JAR file can be signed by multiple people simply by running the \f3jarsigner\fP tool on the file multiple times, specifying the alias for a different person each time, as in: .LP @@ -435,11 +393,8 @@ .LP Note: It is also possible for a JAR file to have mixed signatures, some generated by the JDK 1.1 \f3javakey\fP tool and others by \f3jarsigner\fP. That is, \f3jarsigner\fP can be used to sign JAR files already previously signed using \f3javakey\fP. .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The various \f3jarsigner\fP options are listed and described below. Note: .LP @@ -462,12 +417,15 @@ .RS 3 .TP 3 \-keystore url -Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property. -.LP -A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default). -.LP -A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore. -.LP +Specifies the URL that tells the keystore location. This defaults to the file \f2.keystore\fP in the user's home directory, as determined by the "user.home" system property. +.br +.br +A keystore is required when signing, so you must explicitly specify one if the default keystore does not exist (or you want to use one other than the default). +.br +.br +A keystore is \f2not\fP required when verifying, but if one is specified, or the default exists, and the \f2\-verbose\fP option was also specified, additional information is output regarding whether or not any of the certificates used to verify the JAR file are contained in that keystore. +.br +.br Note: the \f2\-keystore\fP argument can actually be a file name (and path) specification rather than a URL, in which case it will be treated the same as a "file:" URL. That is, .nf \f3 @@ -494,79 +452,93 @@ \f2\-storetype PKCS11\fP .RE For example, this command lists the contents of the configured PKCS#11 token: -.RS 3 - -.LP .nf \f3 .fl jarsigner \-keystore NONE \-storetype PKCS11 \-list .fl - -.fl \fP .fi -.RE .TP 3 \-storetype storetype -Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP. -.LP -The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified. +Specifies the type of keystore to be instantiated. The default keystore type is the one that is specified as the value of the "keystore.type" property in the security properties file, which is returned by the static \f2getDefaultType\fP method in \f2java.security.KeyStore\fP. +.br +.br +The PIN for a PCKS#11 token can also be specified using the \f2\-storepass\fP option. If none has been specified, keytool and jarsigner will prompt for the token PIN. If the token has a protected authentication path (such as a dedicated PIN\-pad or a biometric reader), then the \f2\-protected\fP option must be specified and no password options can be specified. .TP 3 -\-storepass password -Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password. -.LP -Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. +\-storepass[:env | :file] argument +Specifies the password which is required to access the keystore. This is only needed when signing (not verifying) a JAR file. In that case, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for the password. +.br +.br +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. .TP 3 -\-keypass password -Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it. -.LP -Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. Also, when typing in a password at the password prompt, the password is echoed (displayed exactly as typed), so be careful not to type it in front of anyone. +\-keypass[:env | :file] argument +Specifies the password used to protect the private key of the keystore entry addressed by the alias specified on the command line. The password is required when using \f3jarsigner\fP to sign a JAR file. If no password is provided on the command line, and the required password is different from the store password, the user is prompted for it. +.br +.br +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +Note: The password shouldn't be specified on the command line or in a script unless it is for testing purposes, or you are on a secure system. .TP 3 \-sigfile file -Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file. -.LP -The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names. -.LP -If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. +Specifies the base file name to be used for the generated .SF and .DSA files. For example, if \f2file\fP is "DUKESIGN", the generated .SF and .DSA files will be named "DUKESIGN.SF" and "DUKESIGN.DSA", and will be placed in the "META\-INF" directory of the signed JAR file. +.br +.br +The characters in \f2file\fP must come from the set "a\-zA\-Z0\-9_\-". That is, only letters, numbers, underscore, and hyphen characters are allowed. Note: All lowercase characters will be converted to uppercase for the .SF and .DSA file names. +.br +.br +If no \f2\-sigfile\fP option appears on the command line, the base file name for the .SF and .DSA files will be the first 8 characters of the alias name specified on the command line, all converted to upper case. If the alias name has fewer than 8 characters, the full alias name is used. If the alias name contains any characters that are not legal in a signature file name, each such character is converted to an underscore ("_") character in forming the file name. .TP 3 \-sigalg algorithm -.RS 3 - -.LP -Specifies the name of the signature algorithm to use to sign the JAR file. -.LP +Specifies the name of the signature algorithm to use to sign the JAR file. +.br +.br See .na \f2Appendix A\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA or SHA256withRSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. -.LP -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. .TP 3 \-digestalg algorithm -.RS 3 -Specifies the name of the message digest algorithm to use when digesting the entries of a jar file. -.LP +Specifies the name of the message digest algorithm to use when digesting the entries of a jar file. +.br +.br See .na \f2Appendix A\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA\-256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. -.LP -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. .TP 3 \-signedjar file -Specifies the name to be used for the signed JAR file. -.LP -If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file. +Specifies the name to be used for the signed JAR file. +.br +.br +If no name is specified on the command line, the name used is the same as the input JAR file name (the name of the JAR file to be signed); in other words, that file is overwritten with the signed JAR file. .TP 3 \-verify -If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)" -.LP -It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both. -.LP -For further information on verification, see JAR File Verification. +If this appears on the command line, the specified JAR file will be verified, not signed. If the verification is successful, "jar verified" will be displayed. If you try to verify an unsigned JAR file, or a JAR file signed with an unsupported algorithm (e.g., RSA when you don't have an RSA provider installed), the following is displayed: "jar is unsigned. (signatures missing or not parsable)" +.br +.br +It is possible to verify JAR files signed using either \f3jarsigner\fP or the JDK 1.1 \f3javakey\fP tool, or both. +.br +.br +For further information on verification, see JAR File Verification. .TP 3 \-certs If this appears on the command line, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file. This information includes @@ -578,7 +550,6 @@ o if the certificate is an X.509 certificate (more specifically, an instance of \f2java.security.cert.X509Certificate\fP): the distinguished name of the signer .RE -.LP The keystore is also examined. If no keystore value is specified on the command line, the default keystore file (if any) will be checked. If the public key certificate for a signer matches an entry in the keystore, then the following information will also be displayed: .RS 3 .TP 2 @@ -596,26 +567,25 @@ In the past, the .DSA (signature block) file generated when a JAR file was signed used to include a complete encoded copy of the .SF file (signature file) also generated. This behavior has been changed. To reduce the overall size of the output JAR file, the .DSA file by default doesn't contain a copy of the .SF file anymore. But if \f2\-internalsf\fP appears on the command line, the old behavior is utilized. \f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP .TP 3 \-sectionsonly -If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File . -.LP -By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file. -.LP -For further information, see JAR File Verification. -.LP -\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP +If this appears on the command line, the .SF file (signature file) generated when a JAR file is signed does \f2not\fP include a header containing a hash of the whole manifest file. It just contains information and hashes related to each individual source file included in the JAR file, as described in The Signature (.SF) File . +.br +.br +By default, this header is added, as an optimization. When the header is present, then whenever the JAR file is verified, the verification can first check to see whether or not the hash in the header indeed matches the hash of the whole manifest file. If so, verification proceeds to the next step. If not, it is necessary to do a less optimized verification that the hash in each source file information section in the .SF file equals the hash of its corresponding section in the manifest file. +.br +.br +For further information, see JAR File Verification. +.br +.br +\f3This option is mainly useful for testing; in practice, it should not be used, since doing so eliminates a useful optimization.\fP .TP 3 \-protected Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. -.RE -.RS 3 .TP 3 -\-provider provider\-class\-name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP. -.LP +\-providerClass provider\-class\-name +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file, \f2java.security\fP. +.br +.br Used in conjunction with the \f2\-providerArg\fP \f2ConfigFilePath\fP option, keytool and jarsigner will install the provider dynamically (where \f2ConfigFilePath\fP is the path to the token configuration file). Here's an example of a command to list a PKCS#11 keystore when the Sun PKCS#11 provider has not been configured in the security properties file. -.RS 3 - -.LP .nf \f3 .fl @@ -629,19 +599,16 @@ .fl \fP .fi -.RE .TP 3 \-providerName providerName -If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider. -.LP +If more than one provider has been configured in the \f2java.security\fP security properties file, you can use the \f2\-providerName\fP option to target a specific provider instance. The argument to this option is the name of the provider. +.br +.br For the Sun PKCS#11 provider, \f2providerName\fP is of the form \f2SunPKCS11\-\fP\f2TokenName\fP, where \f2TokenName\fP is the name suffix that the provider instance has been configured with, as detailed in the .na \f2configuration attributes table\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: .nf \f3 .fl @@ -653,58 +620,59 @@ .fl \fP .fi -.RE .TP 3 \-Jjavaoption -Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. -.LP +Passes through the specified \f2javaoption\fP string directly to the Java interpreter. (\f3jarsigner\fP is actually a "wrapper" around the interpreter.) This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .TP 3 \-tsa url -If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore. -.LP +If \f2"\-tsa http://example.tsa.url"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The URL, \f2http://example.tsa.url\fP, identifies the location of the Time Stamping Authority (TSA). It overrides any URL found via the \f2\-tsacert\fP option. The \f2\-tsa\fP option does not require the TSA's public key certificate to be present in the keystore. +.br +.br To generate the timestamp, \f2jarsigner\fP communicates with the TSA using the Time\-Stamp Protocol (TSP) defined in .na \f2RFC 3161\fP @ .fi -http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file. -.LP +http://www.ietf.org/rfc/rfc3161.txt. If successful, the timestamp token returned by the TSA is stored along with the signature in the signature block file. .TP 3 \-tsacert alias -If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA. -.LP -The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP. -.LP +If \f2"\-tsacert alias"\fP appears on the command line when signing a JAR file then a timestamp is generated for the signature. The \f2alias\fP identifies the TSA's public key certificate in the keystore that is currently in effect. The entry's certificate is examined for a Subject Information Access extension that contains a URL identifying the location of the TSA. +.br +.br +The TSA's public key certificate must be present in the keystore when using \f2\-tsacert\fP. .TP 3 \-altsigner class -Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism. -.LP -For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP -.LP +Specifies that an alternative signing mechanism be used. The fully\-qualified class name identifies a class file that extends the \f2com.sun.jarsigner.ContentSigner abstract class\fP. The path to this class file is defined by the \f2\-altsignerpath\fP option. If the \f2\-altsigner\fP option is used, \f2jarsigner\fP uses the signing mechanism provided by the specified class. Otherwise, \f2jarsigner\fP uses its default signing mechanism. +.br +.br +For example, to use the signing mechanism provided by a class named \f2com.sun.sun.jarsigner.AuthSigner\fP, use the \f2jarsigner\fP option \f2"\-altsigner com.sun.jarsigner.AuthSigner"\fP .TP 3 \-altsignerpath classpathlist -Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below. -.LP -An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path. -.LP +Specifies the path to the class file (the class file name is specified with the \f2\-altsigner\fP option described above) and any JAR files it depends on. If the class file is in a JAR file, then this specifies the path to that JAR file, as shown in the example below. +.br +.br +An absolute path or a path relative to the current directory may be specified. If \f2classpathlist\fP contains multiple paths or JAR files, they should be separated with a colon (\f2:\fP) on Solaris and a semi\-colon (\f2;\fP) on Windows. This option is not necessary if the class is already in the search path. +.br +.br Example of specifying the path to a jar file that contains the class file: -.RS 3 - -.LP -.LP -\f2\-altsignerpath /home/user/lib/authsigner.jar\fP -.LP -.RE -.LP -Note that the JAR file name is included. -.LP +.nf +\f3 +.fl +\-altsignerpath /home/user/lib/authsigner.jar +.fl +\fP +.fi +Note that the JAR file name is included. +.br +.br Example of specifying the path to the jar file that contains the class file: -.RS 3 -.LP -\f2\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/\fP -.LP -.RE -.LP -Note that the JAR file name is omitted. +.nf +\f3 +.fl +\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/ +.fl +\fP +.fi +Note that the JAR file name is omitted. .TP 3 \-strict During the signing or verifying process, some warning messages may be shown. If this option appears on the command line, the exit code of the tool will reflect the warning messages that are found. Read the "WARNINGS" section for details. @@ -712,25 +680,22 @@ \-verbose:sub\-options For the verifying process, the \f2\-verbose\fP option takes sub\-options to determine how much information will be shown. If \f2\-certs\fP is also specified, the default mode (or sub\-option all) displays each entry as it is being processed and following that, the certificate information for each signer of the JAR file. If \f2\-certs\fP and the \f2\-verbose:grouped\fP sub\-option are specified, entries with the same signer info are grouped and displayed together along with their certificate information. If \f2\-certs\fP and the \f2\-verbose:summary\fP sub\-option are specified, then entries with the same signer info are grouped and displayed together along with their certificate information but details about each entry are summarized and displayed as "one entry (and more)". See the examples section for more information. .RE -.SH "EXAMPLES" + .LP - +.SH "EXAMPLES" .LP .SS Signing a JAR File .LP -.RS 3 - .LP -.LP -Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. Suppose the keystore password is "myspass" and the password for \f2jane\fP's private key is "j638klm". You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar": +Suppose you have a JAR file named "bundle.jar" and you'd like to sign it using the private key of the user whose keystore alias is "jane" in the keystore named "mystore" in the "working" directory. You can use the following to sign the JAR file and name the signed JAR file "sbundle.jar": .LP .nf \f3 .fl - jarsigner \-keystore /working/mystore \-storepass myspass + jarsigner \-keystore /working/mystore \-storepass \fP\f4<keystore password>\fP\f3 .fl - \-keypass j638klm \-signedjar sbundle.jar bundle.jar jane + \-keypass \fP\f4<private key password>\fP\f3 \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -747,7 +712,7 @@ .fl jarsigner \-keystore /working/mystore .fl - \-signedjar sbundle.jar bundle.jar jane + \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -759,7 +724,7 @@ .nf \f3 .fl - jarsigner \-signedjar sbundle.jar bundle.jar jane + jarsigner \-signedjar sbundle.jar bundle.jar jane .fl \fP .fi @@ -771,26 +736,22 @@ .nf \f3 .fl - jarsigner bundle.jar jane + jarsigner bundle.jar jane .fl \fP .fi -.RE .LP .SS Verifying a Signed JAR File .LP -.RS 3 - -.LP .LP To verify a signed JAR file, that is, to verify that the signature is valid and the JAR file has not been tampered with, use a command such as the following: .LP .nf \f3 .fl - jarsigner \-verify sbundle.jar + jarsigner \-verify sbundle.jar .fl \fP .fi @@ -851,7 +812,7 @@ Verification with Certificate Information .LP .LP -If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (iff it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example, +If you specify the \f2\-certs\fP option when verifying, along with the \f2\-verify\fP and \f2\-verbose\fP options, the output includes certificate information for each signer of the JAR file, including the certificate type, the signer distinguished name information (if and only if it's an X.509 certificate), and, in parentheses, the keystore alias for the signer if the public key certificate in the JAR file matches that in a keystore entry. For example, .LP .nf \f3 @@ -961,11 +922,8 @@ .LP Note that the alias "duke" is in brackets to denote that it is an identity database alias, not a keystore alias. .LP -.RE .SH "WARNINGS" .LP - -.LP During the signing/verifying process, jarsigner may display various warnings. These warning codes are defined as follows: .nf \f3 @@ -980,25 +938,25 @@ .fl This jar contains entries whose signer certificate has expired. .fl - + .fl notYetValidCert 4 .fl This jar contains entries whose signer certificate is not yet valid. .fl - + .fl chainNotValidated 4 .fl This jar contains entries whose certificate chain cannot be correctly validated. .fl - + .fl badKeyUsage 8 .fl This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing. .fl - + .fl badExtendedKeyUsage 8 .fl @@ -1006,33 +964,33 @@ .fl doesn't allow code signing. .fl - + .fl badNetscapeCertType 8 .fl - This jar contains entries whose signer certificate's NetscapeCertType extension + This jar contains entries whose signer certificate's NetscapeCertType extension .fl doesn't allow code signing. .fl - + .fl hasUnsignedEntry 16 .fl This jar contains unsigned entries which have not been integrity\-checked. .fl - + .fl notSignedByAlias 32 .fl This jar contains signed entries which are not signed by the specified alias(es) .fl - + .fl aliasNotInStore 32 .fl This jar contains signed entries that are not signed by alias in this keystore .fl - + .fl \fP .fi @@ -1042,24 +1000,20 @@ When the \f2\-strict\fP option is provided, an OR\-value of warnings detected will be returned as the exit code of the tool. For example, if a certificate used to sign an entry is expired and has a keyUsage extension that does not allow it to sign a file, an exit code 12 (=4+8) will be returned. .LP .LP -\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the exit code +\f3Note\fP: Exit codes are reused because only 0\-255 is legal for Unix. In any case, if the signing/verifying process fails, the following exit code will be returned: .LP .nf \f3 .fl -failure 1 +failure 1 .fl \fP .fi .LP -will be returned. .SS Compatibility with JDK 1.1 .LP -.RS 3 - -.LP .LP The \f3keytool\fP and \f3jarsigner\fP tools completely replace the \f3javakey\fP tool provided in JDK 1.1. These new tools provide more features than \f3javakey\fP, including the ability to protect the keystore and private keys with passwords, and the ability to verify signatures in addition to generating them. .LP @@ -1390,7 +1344,7 @@ .nr 44 \n(83+(3*\n(38) .nr 84 +\n(44 .nr TW \n(84 -.if t .if \n(TW>\n(.li .tm Table at line 1128 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1082 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1591,8 +1545,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o @@ -1606,13 +1558,12 @@ .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool +http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool .RE .LP -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/java.1 --- a/jdk/src/solaris/doc/sun/man/man1/java.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/java.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH java 1 "02 Jun 2010" +.TH java 1 "10 May 2011" .LP .SH "Name" @@ -38,9 +38,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -56,11 +53,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method. .LP @@ -70,7 +64,7 @@ .nf \f3 .fl - public static void main(String args[]) +public static void main(String args[]) .fl \fP .fi @@ -87,76 +81,79 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases. .LP .SH "Standard Options" .LP - -.LP .RS 3 .TP 3 \-client -.LP -Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM. -.LP +Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM. +.br +.br +For default VM selection, see +.na +\f2Server\-Class Machine Detection\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html +.TP 3 +\-server +Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit. +.br +.br For default VM selection, see .na \f2Server\-Class Machine Detection\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html -.TP 3 -\-server -.LP -Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit. -.LP -For default VM selection, see -.na -\f2Server\-Class Machine Detection\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html +http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html .TP 3 \-agentlib:libname[=options] -Load native agent library \f2libname\fP, e.g. -.LP -\-agentlib:hprof -.LP -\-agentlib:jdwp=help -.LP -\-agentlib:hprof=help -.LP +Load native agent library \f2libname\fP, e.g. +.br +.br +\-agentlib:hprof +.br +.br +\-agentlib:jdwp=help +.br +.br +\-agentlib:hprof=help +.br +.br For more information, see .na \f2JVMTI Agent Command Line Options\fP @ .fi -http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting. +http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. .TP 3 \-agentpath:pathname[=options] Load a native agent library by full pathname. For more information, see .na \f2JVMTI Agent Command Line Options\fP @ .fi -http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting. +http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. .TP 3 \-classpath classpath .TP 3 \-cp classpath -Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable. -.LP +Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable. +.br +.br If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP). -.LP +.br +.br As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. -.LP +.br +.br For more information on class paths, see .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath. +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. .TP 3 \-Dproperty=value Set a system property value. @@ -164,19 +161,23 @@ \-d32 .TP 3 \-d64 -Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported. -.LP -Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release. -.LP -If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. +Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported. +.br +.br +Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release. +.br +.br +If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. .TP 3 \-enableassertions[:<package name>"..." | :<class name> ] .TP 3 \-ea[:<package name>"..." | :<class name> ] -Enable assertions. Assertions are disabled by default. -.LP -With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class. -.LP +Enable assertions. Assertions are disabled by default. +.br +.br +With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class. +.br +.br If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: .nf \f3 @@ -185,26 +186,26 @@ .fl \fP .fi -.LP -The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. +The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. .TP 3 \-disableassertions[:<package name>"..." | :<class name> ] .TP 3 \-da[:<package name>"..." | :<class name> ] -Disable assertions. This is the default. -.LP -With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class. -.LP +Disable assertions. This is the default. +.br +.br +With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class. +.br +.br To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used: .nf \f3 .fl -java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class> +java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3 .fl \fP .fi -.LP -The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. +The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. .TP 3 \-enablesystemassertions .TP 3 @@ -215,29 +216,36 @@ .TP 3 \-dsa Disables asserts in all system classes. -.LP .TP 3 \-jar Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the .na \f2Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial/jar for information about working with Jar files and Jar\-file manifests. -.LP -When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored. -.LP +http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests. +.br +.br +When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored. +.br +.br Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to .na \f2Java Archive (JAR) Files\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jar/index.html. +http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html. .TP 3 \-javaagent:jarpath[=options] Load a Java programming language agent, see .na \f2java.lang.instrument\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/lang/instrument/package\-summary.html. +http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. +.TP 3 +\-jre\-restrict\-search +Include user\-private JREs in the version search. +.TP 3 +\-no\-jre\-restrict\-search +Exclude user\-private JREs in the version search. .TP 3 \-verbose .TP 3 @@ -254,8 +262,9 @@ Display version information and exit. .TP 3 \-version:release -Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used. -.LP +Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used. +.br +.br \f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example: .nf \f3 @@ -264,11 +273,13 @@ .fl \fP .fi -The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56). -.LP -For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line. -.LP -See the following NOTES section for important policy information on the use of this option. +The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56). +.br +.br +For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line. +.br +.br +See the following NOTES section for important policy information on the use of this option. .TP 3 \-showversion Display version information and continue. @@ -278,6 +289,9 @@ \-help Display usage information and exit. .TP 3 +\-splash:imagepath +Show splash screen with image specified by \f2imagepath\fP. +.TP 3 \-X Display information about non\-standard options and exit. .RE @@ -287,9 +301,6 @@ Non\-Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Xint Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. @@ -319,18 +330,20 @@ Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. .TP 3 \-Xloggc:file -Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event. -.LP -Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. -.LP +Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event. +.br +.br +Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. .TP 3 \-Xmsn -Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics +Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see +.na +\f2HotSpot Ergonomics\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html +.br .br Examples: -.RS 3 - -.LP .nf \f3 .fl @@ -340,19 +353,20 @@ .fl \-Xms6m .fl - + .fl \fP .fi -.RE .TP 3 \-Xmxn -Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see HotSpot Ergonomics +Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see +.na +\f2HotSpot Ergonomics\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html +.br .br Examples: -.RS 3 - -.LP .nf \f3 .fl @@ -362,28 +376,31 @@ .fl \-Xmx80m .fl - + .fl \fP .fi -.RE On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts. .TP 3 \-Xprof Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems. -.LP .TP 3 \-Xrs -Reduces use of operating\-system signals by the Java virtual machine (JVM). -.LP -In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly. -.LP -Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks. -.LP -The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps. -.LP -Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed. -.LP +Reduces use of operating\-system signals by the Java virtual machine (JVM). +.br +.br +In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly. +.br +.br +Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks. +.br +.br +The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps. +.br +.br +Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed. +.br +.br There are two consequences of specifying \f3\-Xrs\fP: .RS 3 .TP 2 @@ -402,12 +419,11 @@ .RE .LP -.RE .SH "NOTES" .LP - .LP -The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: +The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: +.LP .RS 3 .TP 3 1. @@ -422,8 +438,7 @@ .fl \fP .fi -.LP -Would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. +This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. .TP 3 3. A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example: @@ -448,10 +463,23 @@ .RE .LP -.SH "SEE ALSO" +.SH "EXIT STATUS" +.LP +.LP +The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. .LP +.RS 3 +.TP 2 +o +\f20\fP: Successful completion +.TP 2 +o +\f2>0\fP: An error occurred +.RE .LP +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -470,13 +498,13 @@ .na \f2The Java Extensions Framework\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html .TP 2 o .na \f2Security Features\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/index.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html. .TP 2 o .na diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javac.1 --- a/jdk/src/solaris/doc/sun/man/man1/javac.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javac.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javac 1 "02 Jun 2010" +.TH javac 1 "10 May 2011" .LP .SH "Name" @@ -27,14 +27,12 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl \fP\f3javac\fP [ options ] [ sourcefiles ] [ classes ] [ @argfiles ] .fl - + .fl .fi @@ -43,9 +41,6 @@ Arguments may be in any order. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -61,11 +56,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f3javac\fP tool reads class and interface definitions, written in the Java programming language, and compiles them into bytecode class files. It can also process annotations in Java source files and classes. .LP @@ -96,8 +88,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The compiler has a set of standard options that are supported on the current development environment and will be supported in future releases. An additional set of non\-standard options are specific to the current virtual machine and compiler implementations and are subject to change in the future. Non\-standard options begin with \f3\-X\fP. .LP @@ -105,28 +95,18 @@ Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Akey[=value] Options to pass to annotation processors. These are not interpreted by javac directly, but are made available for use by individual processors. \f2key\fP should be one or more identifiers separated by ".". .TP 3 \-cp path or \-classpath path -Specify where to find user class files, and (optionally) annotation processors and source files. This classpath overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See -.na -\f2Setting the Class Path\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath for more details. -.LP -If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files. -.LP -If the \f3\-processorpath\fP option is not specified, the classpath is also searched for annotation processors. -.LP -As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP. +Specify where to find user class files, and (optionally) annotation processors and source files. This class path overrides the user class path in the \f3CLASSPATH\fP environment variable. If neither \f3CLASSPATH\fP, \f3\-cp\fP nor \f3\-classpath\fP is specified, the user class path consists of the current directory. See Setting the Class Path for more details. .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. \f3Note:\fP \ Depending of the configuration of your command line environment, you may have to quote the wild card character, for example, \f2javac \-cp "*.jar" MyClass.java\fP. +>If the \f3\-sourcepath\fP option is not specified, the user class path is also searched for source files. +.br +.br +If the \f3\-processorpath\fP option is not specified, the class path is also searched for annotation processors. .TP 3 \-Djava.ext.dirs=directories Override the location of installed extensions. @@ -135,17 +115,28 @@ Override the location of endorsed standards path. .TP 3 \-d directory -Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP. -.LP -If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated. -.LP -\f3Note:\fP \ The directory specified by \f3\-d\fP is not automatically added to your user class path. +Set the destination directory for class files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, \f3javac\fP puts the class file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-d /home/myclasses\fP and the class is called \f2com.mypackage.MyClass\fP, then the class file is called \f2/home/myclasses/com/mypackage/MyClass.class\fP. +.br +.br +If \f3\-d\fP is not specified, \f3javac\fP puts each class files in the same directory as the source file from which it was generated. +.br +.br +\f3Note:\fP The directory specified by \f3\-d\fP is not automatically added to your user class path. .TP 3 \-deprecation Show a description of each use or override of a deprecated member or class. Without \f3\-deprecation\fP, \f3javac\fP shows a summary of the source files that use or override deprecated members or classes. \f3\-deprecation\fP is shorthand for \f3\-Xlint:deprecation\fP. .TP 3 \-encoding encoding -Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used. +Set the source file encoding name, such as \f2EUC\-JP and UTF\-8\fP. If \f3\-encoding\fP is not specified, the platform default converter is used. +.TP 3 +\-endorseddirs directories +Override the location of endorsed standards path. +.TP 3 +\-extdirs directories +Overrides the location of the \f2ext\fP directory. The \f2directories\fP variable is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. All JAR archives found are automatically part of the class path. +.br +.br +If you are cross\-compiling (compiling classes against bootstrap and extension classes of a different Java platform implementation), this option specifies the directories that contain the extension classes. See Cross\-Compilation Options for more information. .TP 3 \-g Generate all debugging information, including local variables. By default, only line number and source file information is generated. @@ -171,7 +162,13 @@ Print a synopsis of standard options. .TP 3 \-implicit:{class,none} -Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types. +Controls the generation of class files for implicitly loaded source files. To automatically generate class files, use \f3\-implicit:class\fP. To suppress class file generation, use \f3\-implicit:none\fP. If this option is not specified, the default is to automatically generate class files. In this case, the compiler will issue a warning if any such class files are generated when also doing annotation processing. The warning will not be issued if this option is set explicitly. See Searching For Types. +.TP 3 +\-Joption +Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. +.br +.br +\f3Note:\fP \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. .TP 3 \-nowarn Disable warning messages. This has the same meaning as \f3\-Xlint:none\fP. @@ -183,7 +180,7 @@ Names of the annotation processors to run. This bypasses the default discovery process. .TP 3 \-processorpath path -Specify where to find annotation processors; if this option is not used, the classpath will be searched for processors. +Specify where to find annotation processors; if this option is not used, the class path will be searched for processors. .TP 3 \-s dir Specify the directory where to place generated source files. The directory must already exist; \f3javac\fP will not create it. If a class is part of a package, the compiler puts the source file in a subdirectory reflecting the package name, creating directories as needed. For example, if you specify \f3\-s /home/mysrc\fP and the class is called \f2com.mypackage.MyClass\fP, then the source file will be placed in \f2/home/mysrc/com/mypackage/MyClass.java\fP. @@ -218,41 +215,42 @@ .RE .TP 3 \-sourcepath sourcepath -Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name. -.LP -\f3Note:\fP \ Classes found through the classpath may be subject to automatic recompilation if their sources are also found. See Searching For Types. +Specify the source code path to search for class or interface definitions. As with the user class path, source path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. If packages are used, the local path name within the directory or archive must reflect the package name. +.br +.br +\f3Note:\fP Classes found through the class path may be subject to automatic recompilation if their sources are also found. See Searching For Types. .TP 3 \-verbose Verbose output. This includes information about each class loaded and each source file compiled. .TP 3 \-version -Print version information. +Print version information. +.TP 3 +\-Werror +Terminate compilation if warnings occur. .TP 3 \-X Display information about non\-standard options and exit. .RE .LP -.RE .SS Cross\-Compilation Options .LP -.RS 3 - -.LP .LP By default, classes are compiled against the bootstrap and extension classes of the platform that \f3javac\fP shipped with. But \f3javac\fP also supports \f2cross\-compiling\fP, where classes are compiled against a bootstrap and extension classes of a different Java platform implementation. It is important to use \f3\-bootclasspath\fP and \f3\-extdirs\fP when cross\-compiling; see Cross\-Compilation Example below. .LP .RS 3 .TP 3 \-target version -Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP). -.LP +Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP). +.br +.br The default for \f3\-target\fP depends on the value of \f3\-source\fP: .RS 3 .TP 2 o -If \-source is \f3not specified\fP, the value of \-target is \f31.6\fP +If \-source is \f3not specified\fP, the value of \-target is \f31.7\fP .TP 2 o If \-source is \f31.2\fP, the value of \-target is \f31.4\fP @@ -261,25 +259,18 @@ If \-source is \f31.3\fP, the value of \-target is \f31.4\fP .TP 2 o -For \f3all other values\fP of \-source, the value of \-target is the value of \f3\-source\fP. +For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP. .RE .TP 3 \-bootclasspath bootclasspath Cross\-compile against the specified set of boot classes. As with the user class path, boot class path entries are separated by colons (\f3:\fP) and can be directories, JAR archives, or ZIP archives. -.TP 3 -\-extdirs directories -Cross\-compile against the specified extension directories. \f2Directories\fP is a colon\-separated list of directories. Each JAR archive in the specified directories is searched for class files. .RE .LP -.RE .SS Non\-Standard Options .LP .RS 3 - -.LP -.RS 3 .TP 3 \-Xbootclasspath/p:path Prepend to the bootstrap class path. @@ -291,54 +282,19 @@ Override location of bootstrap class files. .TP 3 \-Xlint -Enable all recommended warnings. In this release, all available warnings are recommended. +Enable all recommended warnings. In this release, enabling all available warnings is recommended. +.TP 3 +\-Xlint:all +Enable all recommended warnings. In this release, enabling all available warnings is recommended. .TP 3 \-Xlint:none -Disable all warnings not mandated by the Java Language Specification. +Disable all warnings. +.TP 3 +\-Xlint:name +Enable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can enable with this option. .TP 3 \-Xlint:\-name -Disable warning \f2name\fP, where \f2name\fP is one of the warning names supported for \f3\-Xlint:\fP\f2name\fP, below. -.TP 3 -\-Xlint:unchecked -Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. -.TP 3 -\-Xlint:path -Warn about nonexistent path (classpath, sourcepath, etc) directories. -.TP 3 -\-Xlint:serial -Warn about missing \f2serialVersionUID\fP definitions on serializable classes. -.TP 3 -\-Xlint:finally -Warn about \f2finally\fP clauses that cannot complete normally. -.TP 3 -\-Xlint:fallthrough -Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement: -.RS 3 - -.LP -.nf -\f3 -.fl -switch (x) { -.fl -case 1: -.fl - System.out.println("1"); -.fl - // No break; statement here. -.fl -case 2: -.fl - System.out.println("2"); -.fl -} -.fl - -.fl -\fP -.fi -.RE -If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question. +Disable warning \f2name\fP. See the section Warnings That Can Be Enabled or Disabled with \-Xlint Option for a list of warnings you can disable with this option. .TP 3 \-Xmaxerrs number Set the maximum number of errors to print. @@ -350,7 +306,10 @@ Send compiler messages to the named file. By default, compiler messages go to \f2System.err\fP. .TP 3 \-Xprefer:{newer,source} -Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP. +Specify which file to read when both a source file and class file are found for a type. (See Searching For Types). If \f2\-Xprefer:newer\fP is used, it reads the newer of the source or class file for a type (default). If the \f2\-Xprefer:source\fP option is used, it reads source file. Use \f2\-Xprefer:source\fP when you want to be sure that any annotation processors can access annotations declared with a retention policy of \f2SOURCE\fP. +.TP 3 +\-Xpkginfo:{always,legacy,nonempty} +Specify handling of package\-info files .TP 3 \-Xprint Print out textual representation of specified types for debugging purposes; perform neither annotation processing nor compilation. The format of the output may change. @@ -363,27 +322,420 @@ .RE .LP -.RE .SS -The \-J Option +Warnings That Can Be Enabled or Disabled with \-Xlint Option .LP -.RS 3 - +.LP +Enable warning \f2name\fP with the option \f3\-Xlint:\fP\f2name\fP, where \f2name\fP is one of the following warning names. Similarly, you can disable warning \f2name\fP with the option \f3\-Xlint:\-\fP\f2name\fP: .LP .RS 3 .TP 3 -\-Joption -Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f3\-X\fP, it is not a `standard option' of \f3javac\fP. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. -.LP -\f3Note:\fP \ \f3CLASSPATH\fP, \f3\-classpath\fP, \f3\-bootclasspath\fP, and \f3\-extdirs\fP do \f2not\fP specify the classes used to run \f3javac\fP. Fiddling with the implementation of the compiler in this way is usually pointless and always risky. If you do need to do this, use the \f3\-J\fP option to pass through options to the underlying \f3java\fP launcher. +cast +Warn about unnecessary and redundant casts. For example: +.nf +\f3 +.fl +String s = (String)"Hello!" +.fl +\fP +.fi +.TP 3 +classfile +Warn about issues related to classfile contents. +.TP 3 +deprecation +Warn about use of deprecated items. For example: +.nf +\f3 +.fl + java.util.Date myDate = new java.util.Date(); +.fl + int currentDay = myDate.getDay(); +.fl +\fP +.fi +The method \f2java.util.Date.getDay\fP has been deprecated since JDK 1.1. +.TP 3 +dep\-ann +Warn about items that are documented with an \f2@deprecated\fP Javadoc comment, but do not have a \f2@Deprecated\fP annotation. For example: +.nf +\f3 +.fl + /** +.fl + * @deprecated As of Java SE 7, replaced by {@link #newMethod()} +.fl + */ +.fl + +.fl + public static void deprecatedMethood() { } +.fl + +.fl + public static void newMethod() { } +.fl +\fP +.fi +.TP 3 +divzero +Warn about division by constant integer 0. For example: +.nf +\f3 +.fl + int divideByZero = 42 / 0; +.fl +\fP +.fi +.TP 3 +empty +Warn about empty statements after \f2if\fP statements. For example: +.nf +\f3 +.fl +class E { +.fl + void m() { +.fl + if (true) ; +.fl + } +.fl +} +.fl +\fP +.fi +.TP 3 +fallthrough +Check \f2switch\fP blocks for fall\-through cases and provide a warning message for any that are found. Fall\-through cases are cases in a \f2switch\fP block, other than the last case in the block, whose code does not include a \f2break\fP statement, allowing code execution to "fall through" from that case to the next case. For example, the code following the \f2case 1\fP label in this \f2switch\fP block does not end with a \f2break\fP statement: +.nf +\f3 +.fl +switch (x) { +.fl +case 1: +.fl + System.out.println("1"); +.fl + // No break statement here. +.fl +case 2: +.fl + System.out.println("2"); +.fl +} +.fl +\fP +.fi +If the \f2\-Xlint:fallthrough\fP flag were used when compiling this code, the compiler would emit a warning about "possible fall\-through into case," along with the line number of the case in question. +.TP 3 +finally +Warn about \f2finally\fP clauses that cannot complete normally. For example: +.nf +\f3 +.fl + public static int m() { +.fl + try { +.fl + throw new NullPointerException(); +.fl + } catch (NullPointerException e) { +.fl + System.err.println("Caught NullPointerException."); +.fl + return 1; +.fl + } finally { +.fl + return 0; +.fl + } +.fl + } +.fl +\fP +.fi +The compiler generates a warning for \f2finally\fP block in this example. When this method is called, it returns a value of \f20\fP, not \f21\fP. A \f2finally\fP block always executes when the \f2try\fP block exits. In this example, if control is transferred to the \f2catch\fP, then the method exits. However, the \f2finally\fP block must be executed, so it is executed, even though control has already been transferred outside the method. +.TP 3 +options +Warn about issues relating to the use of command line options. See Cross\-Compilation Example for an example of this kind of warning. +.TP 3 +overrides +Warn about issues regarding method overrides. For example, consider the following two classes: +.nf +\f3 +.fl +public class ClassWithVarargsMethod { +.fl + void varargsMethod(String... s) { } +.fl +} +.fl +\fP +.fi +.nf +\f3 +.fl +public class ClassWithOverridingMethod extends ClassWithVarargsMethod { +.fl + @Override +.fl + void varargsMethod(String[] s) { } +.fl +} +.fl +\fP +.fi +The compiler generates a warning similar to the following: +.br +.br +\f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP +.br +.br +When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. In the method \f2ClassWithVarargsMethod.varargsMethod\fP, the compiler translates the varargs formal parameter \f2String... s\fP to the formal parameter \f2String[] s\fP, an array, which matches the formal parameter of the method \f2ClassWithOverridingMethod.varargsMethod\fP. Consequently, this example compiles. +.TP 3 +path +Warn about invalid path elements and nonexistent path directories on the command line (with regards to the class path, the source path, and other paths). Such warnings cannot be suppressed with the \f2@SuppressWarnings\fP annotation. For example: +.nf +\f3 +.fl +javac \-Xlint:path \-classpath /nonexistentpath Example.java +.fl +\fP +.fi +.TP 3 +processing +Warn about issues regarding annotation processing. The compiler generates this warning if you have a class that has an annotation, and you use an annotation processor that cannot handle that type of exception. For example, the following is a simple annotation processor: +.br +.br +\f3Source file \fP\f4AnnoProc.java\fP: +.nf +\f3 +.fl +import java.util.*; +.fl +import javax.annotation.processing.*; +.fl +import javax.lang.model.*; +.fl +import javax.lang.model.element.*; +.fl + +.fl +@SupportedAnnotationTypes("NotAnno") +.fl +public class AnnoProc extends AbstractProcessor { +.fl + public boolean process(Set<? extends TypeElement> elems, RoundEnvironment renv) { +.fl + return true; +.fl + } +.fl + +.fl + public SourceVersion getSupportedSourceVersion() { +.fl + return SourceVersion.latest(); +.fl + } +.fl +} +.fl +\fP +.fi +\f3Source file \fP\f4AnnosWithoutProcessors.java\fP\f3:\fP +.nf +\f3 +.fl +@interface Anno { } +.fl + +.fl +@Anno +.fl +class AnnosWithoutProcessors { } +.fl +\fP +.fi +The following commands compile the annotation processor \f2AnnoProc\fP, then run this annotation processor against the source file \f2AnnosWithoutProcessors.java\fP: +.nf +\f3 +.fl +% javac AnnoProc.java +.fl +% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java +.fl +\fP +.fi +When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning: +.br +.br +\f2warning: [processing] No processor claimed any of these annotations: Anno\fP +.br +.br +To resolve this issue, you can rename the annotation defined and used in the class \f2AnnosWithoutProcessors\fP from \f2Anno\fP to \f2NotAnno\fP. +.TP 3 +rawtypes +Warn about unchecked operations on raw types. The following statement generates a \f2rawtypes\fP warning: +.nf +\f3 +.fl +void countElements(List l) { ... } +.fl +\fP +.fi +The following does not generate a \f2rawtypes\fP warning: +.nf +\f3 +.fl +void countElements(List<?> l) { ... } +.fl +\fP +.fi +\f2List\fP is a raw type. However, \f2List<?>\fP is a unbounded wildcard parameterized type. Because \f2List\fP is a parameterized interface, you should always specify its type argument. In this example, the \f2List\fP formal argument is specified with a unbounded wildcard (\f2?\fP) as its formal type parameter, which means that the \f2countElements\fP method can accept any instantiation of the \f2List\fP interface. +.TP 3 +serial +Warn about missing \f2serialVersionUID\fP definitions on serializable classes. For example: +.nf +\f3 +.fl +public class PersistentTime implements Serializable +.fl +{ +.fl + private Date time; +.fl + +.fl + public PersistentTime() { +.fl + time = Calendar.getInstance().getTime(); +.fl + } +.fl + +.fl + public Date getTime() { +.fl + return time; +.fl + } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning: +.br +.br +\f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP +.br +.br +If a serializable class does not explicitly declare a field named \f2serialVersionUID\fP, then the serialization runtime will calculate a default \f2serialVersionUID\fP value for that class based on various aspects of the class, as described in the Java Object Serialization Specification. However, it is strongly recommended that all serializable classes explicitly declare \f2serialVersionUID\fP values because the default process of computing \f2serialVersionUID\fP vales is highly sensitive to class details that may vary depending on compiler implementations, and can thus result in unexpected \f2InvalidClassExceptions\fP during deserialization. Therefore, to guarantee a consistent \f2serialVersionUID\fP value across different Java compiler implementations, a serializable class must declare an explicit \f2serialVersionUID\fP value. +.TP 3 +static +Warn about issues relating to use of statics. For example: +.nf +\f3 +.fl +class XLintStatic { +.fl + static void m1() { } +.fl + void m2() { this.m1(); } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning: +.nf +\f3 +.fl +warning: [static] static method should be qualified by type name, XLintStatic, instead of by an expression +.fl +\fP +.fi +To resolve this issue, you can call the static method \f2m1\fP as follows: +.nf +\f3 +.fl +XLintStatic.m1(); +.fl +\fP +.fi +Alternatively, you can remove the \f2static\fP keyword from the declaration of the method \f2m1\fP. +.TP 3 +try +Warn about issues relating to use of \f2try\fP blocks, including try\-with\-resources statements. For example, a warning is generated for the following statement because the resource \f2ac\fP declared in the \f2try\fP statement is not used: +.nf +\f3 +.fl +try ( AutoCloseable ac = getResource() ) { +.fl + // do nothing +.fl +} +.fl +\fP +.fi +.TP 3 +unchecked +Give more detail for unchecked conversion warnings that are mandated by the Java Language Specification. For example: +.nf +\f3 +.fl + List l = new ArrayList<Number>(); +.fl + List<String> ls = l; // unchecked warning +.fl +\fP +.fi +During type erasure, the types \f2ArrayList<Number>\fP and \f2List<String>\fP become \f2ArrayList\fP and \f2List\fP, respectively. +.br +.br +The variable \f2ls\fP has the parameterized type \f2List<String>\fP. When the \f2List\fP referenced by \f2l\fP is assigned to \f2ls\fP, the compiler generates an unchecked warning; the compiler is unable to determine at compile time, and moreover knows that the JVM will not be able to determine at runtime, if \f2l\fP refers to a \f2List<String>\fP type; it does not. Consequently, heap pollution occurs. +.br +.br +In detail, a heap pollution situation occurs when the \f2List\fP object \f2l\fP, whose static type is \f2List<Number>\fP, is assigned to another \f2List\fP object, \f2ls\fP, that has a different static type, \f2List<String>\fP. However, the compiler still allows this assignment. It must allow this assignment to preserve backwards compatibility with versions of Java SE that do not support generics. Because of type erasure, \f2List<Number>\fP and \f2List<String>\fP both become \f2List\fP. Consequently, the compiler allows the assignment of the object \f2l\fP, which has a raw type of \f2List\fP, to the object \f2ls\fP. +.TP 3 +varargs +Warn about unsafe usages of variable arguments (varargs) methods, in particular, those that contain non\-reifiable arguments. For example: +.nf +\f3 +.fl +public class ArrayBuilder { +.fl + public static <T> void addToList (List<T> listArg, T... elements) { +.fl + for (T x : elements) { +.fl + listArg.add(x); +.fl + } +.fl + } +.fl +} +.fl +\fP +.fi +The compiler generates the following warning for the definition of the method \f2ArrayBuilder.addToList\fP: +.nf +\f3 +.fl +warning: [varargs] Possible heap pollution from parameterized vararg type T +.fl +\fP +.fi +When the compiler encounters a varargs method, it translates the varargs formal parameter into an array. However, the Java programming language does not permit the creation of arrays of parameterized types. In the method \f2ArrayBuilder.addToList\fP, the compiler translates the varargs formal parameter \f2T... elements\fP to the formal parameter \f2T[] elements\fP, an array. However, because of type erasure, the compiler converts the varargs formal parameter to \f2Object[] elements\fP. Consequently, there is a possibility of heap pollution. .RE .LP -.RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP .LP To shorten or simplify the javac command line, you can specify one or more files that themselves contain arguments to the \f2javac\fP command (except \f2\-J\fP options). This enables you to create javac commands of any length on any operating system. .LP @@ -405,9 +757,7 @@ .nf \f3 .fl - % \fP\f3javac @argfile\fP -.fl - +% \fP\f3javac @argfile\fP .fl .fi @@ -433,7 +783,7 @@ .fl \-sourcepath /java/pubs/ws/1.3/src/share/classes .fl - + .fl \fP .fi @@ -451,7 +801,7 @@ .fl MyClass3.java .fl - + .fl \fP .fi @@ -465,7 +815,7 @@ .fl % \fP\f3javac @options @classes\fP .fl - + .fl .fi @@ -479,17 +829,13 @@ .nf \f3 .fl - % \fP\f3javac @path1/options @path2/classes\fP -.fl - +% \fP\f3javac @path1/options @path2/classes\fP .fl .fi .LP .SH "ANNOTATION PROCESSING" .LP - -.LP .LP \f3javac\fP provides direct support for annotation processing, superseding the need for the separate annotation processing tool, \f3apt\fP. .LP @@ -500,11 +846,7 @@ Overview of annotation processing .LP .LP -Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named -.br -\f2\ META\-INF/services/javax.annotation.processing.Processor\fP -.br -on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option. +Unless annotation processing is disabled with the \f3\-proc:none\fP option, the compiler searches for any annotation processors that are available. The search path can be specified with the \f3\-processorpath\fP option; if it is not given, the user class path is used. Processors are located by means of service provider\-configuration files named \f2META\-INF/services/javax.annotation.processing.Processor\fP on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. Alternatively, processors can be specified explicitly, using the \f3\-processor\fP option. .LP .LP After scanning the source files and classes on the command line to determine what annotations are present, the compiler queries the processors to determine what annotations they process. When a match is found, the processor will be invoked. A processor may "claim" the annotations it processes, in which case no further attempt is made to find any processors for those annotations. Once all annotations have been claimed, the compiler does not look for additional processors. @@ -523,8 +865,6 @@ .LP .SH "SEARCHING FOR TYPES" .LP - -.LP .LP When compiling a source file, the compiler often needs information about a type whose definition did not appear in the source files given on the command line. The compiler needs type information for every class or interface used, extended, or implemented in the source file. This includes classes and interfaces not explicitly mentioned in the source file but which provide information through inheritance. .LP @@ -532,11 +872,7 @@ For example, when you subclass \f3java.applet.Applet\fP, you are also using \f3Applet's\fP ancestor classes: \f3java.awt.Panel\fP, \f3java.awt.Container\fP, \f3java.awt.Component\fP, and \f3java.lang.Object\fP. .LP .LP -When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see -.na -\f2Setting the Class Path\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath). +When the compiler needs type information, it looks for a source file or class file which defines the type. The compiler searches for class files first in the bootstrap and extension classes, then in the user class path (which by default is the current directory). The user class path is defined by setting the \f3CLASSPATH\fP environment variable or by using the \f3\-classpath\fP command line option. (For details, see Setting the Class Path). .LP .LP If you set the \-sourcepath option, the compiler searches the indicated path for source files; otherwise the compiler searches the user class path for both class files and source files. @@ -555,8 +891,6 @@ .LP .SH "PROGRAMMATIC INTERFACE" .LP - -.LP .LP \f3javac\fP supports the new Java Compiler API defined by the classes and interfaces in the \f2javax.tools\fP package. .LP @@ -573,8 +907,6 @@ .fl int rc = javac.run(null, null, null, args); .fl - -.fl \fP .fi @@ -588,11 +920,8 @@ .SS Old Interface .LP -.RS 3 - .LP -.LP -\f3Note:\fP \ This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above. +\f3Note:\fP This API is retained for backwards compatibility only; all new code should use the Java Compiler API, described above. .LP .LP The \f2com.sun.tools.javac.Main\fP class provides two static methods to invoke the compiler from a program: @@ -604,8 +933,6 @@ .fl public static int compile(String[] args, PrintWriter out); .fl - -.fl \fP .fi @@ -622,21 +949,14 @@ .LP Note that all \f3other\fP classes and methods found in a package whose name starts with \f2com.sun.tools.javac\fP (informally known as sub\-packages of \f2com.sun.tools.javac\fP) are strictly internal and subject to change at any time. .LP -.RE .SH "EXAMPLES" .LP .SS Compiling a Simple Program .LP -.RS 3 - -.LP .LP One source file, \f2Hello.java\fP, defines a class called \f3greetings.Hello\fP. The \f2greetings\fP directory is the package directory both for the source file and the class file and is off the current directory. This allows us to use the default user class path. It also makes it unnecessary to specify a separate destination directory with \f3\-d\fP. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -682,25 +1002,15 @@ .fl Hello Everyone .fl - -.fl .fi -.RE .LP -.RE .SS Compiling Multiple Source Files .LP -.RS 3 - -.LP .LP This example compiles all the source files in the package \f2greetings\fP. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -720,27 +1030,15 @@ .fl Aloha.java GutenTag.java Hello.java Hi.java .fl - -.fl - -.fl .fi -.RE .LP -.RE .SS Specifying a User Class Path .LP -.RS 3 - -.LP .LP Having changed one of the source files in the previous example, we recompile it: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -750,35 +1048,23 @@ .fl % \f3javac greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP Since \f2greetings.Hi\fP refers to other classes in the \f2greetings\fP package, the compiler needs to find these other classes. The example above works, because our default user class path happens to be the directory containing the package directory. But suppose we want to recompile this file and not worry about which directory we're in? Then we need to add \f2/examples\fP to the user class path. We can do this by setting \f3CLASSPATH\fP, but here we'll use the \f3\-classpath\fP option. .LP -.RS 3 - -.LP .nf \f3 .fl % \fP\f3javac \-classpath /examples /examples/greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP If we change \f2greetings.Hi\fP again, to use a banner utility, that utility also needs to be accessible through the user class path. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -786,42 +1072,26 @@ .fl /examples/greetings/Hi.java\fP .fl - -.fl .fi -.RE .LP .LP To execute a class in \f2greetings\fP, we need access both to \f2greetings\fP and to the classes it uses. .LP -.RS 3 - -.LP .nf \f3 .fl % \fP\f3java \-classpath /examples:/lib/Banners.jar greetings.Hi\fP .fl - -.fl .fi -.RE .LP -.RE .SS Separating Source Files and Class Files .LP -.RS 3 - -.LP .LP It often makes sense to keep source files and class files in separate directories, especially on large projects. We use \f3\-d\fP to indicate the separate class file destination. Since the source files are not in the user class path, we use \f3\-sourcepath\fP to help the compiler find them. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -855,61 +1125,56 @@ .fl Base.class GoodBye.class .fl - -.fl - -.fl .fi -.RE .LP .LP -\f3Note:\fP \ The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option. +\f3Note:\fP The compiler compiled \f2src/farewells/Base.java\fP, even though we didn't specify it on the command line. To trace automatic compiles, use the \f3\-verbose\fP option. .LP -.RE .SS Cross\-Compilation Example .LP -.RS 3 - .LP -.LP -Here we use \f3javac\fP to compile code that will run on a 1.7 VM. -.LP -.RS 3 - +Here we use \f3javac\fP to compile code that will run on a 1.6 VM. .LP .nf \f3 .fl -% \fP\f3javac \-target 1.7 \-bootclasspath jdk1.7.0/lib/rt.jar \\ +% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\ .fl \-extdirs "" OldCode.java\fP .fl - -.fl .fi -.RE .LP .LP -The \f3\-target 1.7\fP option ensures that the generated class files will be compatible with 1.7 VMs. By default, \f3javac\fP compiles for JDK 6. +The \f2\-source 1.6\fP option specifies that version 1.6 (or 6) of the Java programming language be used to compile \f2OldCode.java\fP. The option \f3\-target 1.6\fP option ensures that the generated class files will be compatible with 1.6 VMs. Note that in most cases, the value of the \f3\-target\fP option is the value of the \f3\-source\fP option; in this example, you can omit the \f3\-target\fP option. .LP .LP -The Java Platform JDK's \f3javac\fP would also by default compile against its own bootstrap classes, so we need to tell \f3javac\fP to compile against JDK 1.7 bootstrap classes instead. We do this with \f3\-bootclasspath\fP and \f3\-extdirs\fP. Failing to do this might allow compilation against a Java Platform API that would not be present on a 1.7 VM and would fail at runtime. +You must specify the \f3\-bootclasspath\fP option to specify the correct version of the bootstrap classes (the \f2rt.jar\fP library). If not, the compiler generates a warning: .LP -.RE +.nf +\f3 +.fl +% \fP\f3javac \-source 1.6 OldCode.java\fP +.fl +warning: [options] bootstrap class path not set in conjunction with \-source 1.6 +.fl +.fi + +.LP +.LP +If you do not specify the correct version of bootstrap classes, the compiler will use the old language rules (in this example, it will use version 1.6 of the Java programming language) combined with the new bootstrap classes, which can result in class files that do not work on the older platform (in this case, Java SE 6) because reference to non\-existent methods can get included. +.LP .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o .na \f2The javac Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javac/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html .TP 2 o java(1) \- the Java Application Launcher @@ -933,7 +1198,7 @@ .na \f2The Java Extensions Framework\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javadoc.1 --- a/jdk/src/solaris/doc/sun/man/man1/javadoc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javadoc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,16 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javadoc 1 "02 Jun 2010" +.TH javadoc 1 "10 May 2011" .SH "Name" javadoc \- The Java API Documentation Generator -.RS 3 - .LP -.LP -Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Sun Solaris. -.LP -.RE +Generates HTML pages of API documentation from Java source files. This document contains Javadoc examples for Solaris. .SH "SYNOPSIS" .LP -.LP \f4javadoc\fP\f2\ [\ \fP\f2options\fP\f2\ ]\ [\ packagenames\ ]\ [\ sourcefilenames\ ]\ [\ \-subpackages\fP\ \f2pkg1:pkg2:...\fP\f2\ ]\ [\ \fP\f2@argfiles\fP\f2\ ]\fP .LP -.LP Arguments can be in any order. See processing of Source Files for details on how the Javadoc tool determines which "\f2.java\fP" files to process. -.LP -.RS 3 - -.LP .RS 3 .TP 3 options @@ -49,11 +38,7 @@ A series of names of packages, separated by spaces, such as \f2java.lang\ java.lang.reflect\ java.awt\fP. You must separately specify each package you want to document. Wildcards are not allowed; use \-subpackages for recursion. The Javadoc tool uses \f2\-sourcepath\fP to look for these package names. See Example \- Documenting One or More Packages .TP 3 sourcefilenames -A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes +A series of source file names, separated by spaces, each of which can begin with a path and contain a wildcard such as asterisk (*). The Javadoc tool will process every file whose name ends with ".java", and whose name, when stripped of that suffix, is actually a legal class name (see the Java Language Specification). Therefore, you can name files with dashes (such as \f2X\-Buffer\fP), or other illegal characters, to prevent them from being documented. This is useful for test files and template files The path that precedes the source file name determines where javadoc will look for the file. (The Javadoc tool does \f2not\fP use \f2\-sourcepath\fP to look for these source file names.) Relative paths are relative to the current directory, so passing in \f2Button.java\fP is identical to \f2./Button.java\fP. A source file name with an absolute path and a wildcard, for example, is \f2/home/src/java/awt/Graphics*.java\fP. See Example\ \-\ Documenting One or More Classes. You can also mix packagenames and sourcefilenames, as in Example\ \-\ Documenting Both Packages and Classes .TP 3 \-subpackages pkg1:pkg2:... Generates documentation from source files in the specified packages and recursively in their subpackages. An alternative to supplying packagenames or sourcefilenames. @@ -61,31 +46,19 @@ @argfiles One or more files that contain a list of Javadoc options, packagenames and sourcefilenames in any order. Wildcards (*) and \f2\-J\fP options are not allowed in these files. .RE - -.LP -.RE .SH "DESCRIPTION" .LP -.LP The \f3Javadoc\fP tool parses the declarations and documentation comments in a set of Java source files and produces a corresponding set of HTML pages describing (by default) the public and protected classes, nested classes (but not anonymous inner classes), interfaces, constructors, methods, and fields. You can use it to generate the API (Application Programming Interface) documentation or the implementation documentation for a set of source files. .LP -.LP You can run the Javadoc tool on entire packages, individual source files, or both. When documenting entire packages, you can either use \f2\-subpackages\fP for traversing recursively down from a top\-level directory, or pass in an explicit list of package names. When documenting individual source files, you pass in a list of source (\f2.java\fP) filenames. Examples are given at the end of this document. How Javadoc processes source files is covered next. -.LP .SS Processing of source files .LP -.LP The Javadoc tool processes files that end in "\f2.java\fP" plus other files described under Source Files. If you run the Javadoc tool by explicitly passing in individual source filenames, you can determine exactly which "\f2.java\fP" files are processed. However, that is not how most developers want to work, as it is simpler to pass in package names. The Javadoc tool can be run three ways without explicitly specifying the source filenames. You can (1) pass in package names, (2) use \f2\-subpackages\fP, and (3) use wildcards with source filenames (\f2*.java\fP). In these cases, the Javadoc tool processes a "\f2.java\fP" file only if it fulfills all of the following requirements: -.LP .RS 3 .TP 2 o -Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625 for legal characters) +Its name, after stripping off the "\f2.java\fP" suffix, is actually a legal class name (see the Java Language Specification for legal characters) .TP 2 o Its directory path relative to the root of the source tree is actually a legal package name (after converting its separators to dots) @@ -93,11 +66,8 @@ o Its package statement contains the legal package name (specified in the previous bullet) .RE - -.LP .LP \f3Processing of links\fP \- During a run, the Javadoc tool automatically adds cross\-reference links to package, class and member names that are being documented as part of that run. Links appear in several places: -.LP .RS 3 .TP 2 o @@ -124,69 +94,50 @@ o The index .RE - -.LP .LP You can add hyperlinks to existing text for classes not included on the command line (but generated separately) by way of the \f2\-link\fP and \f2\-linkoffline\fP options. .LP -.LP \f3Other processing details\fP \- The Javadoc tool produces one complete document each time it is run; it cannot do incremental builds \-\- that is, it cannot modify or \f2directly\fP incorporate results from previous runs of the Javadoc tool. However, it can link to results from other runs, as just mentioned. .LP -.LP As implemented, the Javadoc tool requires and relies on the java compiler to do its job. The Javadoc tool calls part of \f2javac\fP to compile the declarations, ignoring the member implementation. It builds a rich internal representation of the classes, including the class hierarchy, and "use" relationships, then generates the HTML from that. The Javadoc tool also picks up user\-supplied documentation from documentation comments in the source code. .LP -.LP In fact, the Javadoc tool will run on \f2.java\fP source files that are pure stub files with no method bodies. This means you can write documentation comments and run the Javadoc tool in the earliest stages of design while creating the API, before writing the implementation. .LP -.LP -Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents -.na -\f2default constructors\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html#36154 (section 8.6.7 of \f2Java Language Specification\fP) that are present in the \f2.class\fP files but not in the source code. -.LP +Relying on the compiler ensures that the HTML output corresponds exactly with the actual implementation, which may rely on implicit, rather than explicit, source code. For example, the Javadoc tool documents default constructors (see Java Language Specification) that are present in the \f2.class\fP files but not in the source code. .LP In many cases, the Javadoc tool allows you to generate documentation for source files whose code is incomplete or erroneous. This is a benefit that enables you to generate documentation before all debugging and troubleshooting is done. For example, according to the \f2Java Language Specification\fP, a class that contains an abstract method should itself be declared abstract. The Javadoc tool does not check for this, and would proceed without a warning, whereas the javac compiler stops on this error. The Javadoc tool does do some primitive checking of doc comments. Use the DocCheck doclet to check the doc comments more thoroughly. .LP -.LP When the Javadoc tool builds its internal structure for the documentation, it loads all referenced classes. Because of this, the Javadoc tool must be able to find all referenced classes, whether bootstrap classes, extensions, or user classes. For more about this, see .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path. .SS Javadoc Doclets .LP -.LP You can customize the content and format of the Javadoc tool's output by using doclets. The Javadoc tool has a default "built\-in" doclet, called the standard doclet, that generates HTML\-formatted API documentation. You can modify or subclass the standard doclet, or write your own doclet to generate HTML, XML, MIF, RTF or whatever output format you'd like. Information about doclets and their use is at the following locations: -.LP .RS 3 .TP 2 o .na \f2Javadoc Doclets\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html .TP 2 o The \f2\-doclet\fP command\-line option .RE - -.LP .LP When a custom doclet is not specified with the \f2\-doclet\fP command line option, the Javadoc tool will use the default standard doclet. The javadoc tool has several command line options that are available regardless of which doclet is being used. The standard doclet adds a supplementary set of command line options. Both sets of options are described below in the options section. -.LP .SS Related Documentation and Doclets -.LP .RS 3 .TP 2 o .na \f2Javadoc Enhancements\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. .TP 2 o .na @@ -198,7 +149,7 @@ .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html for more information about Sun conventions for writing documentation comments. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html for more information about Sun conventions for writing documentation comments. .TP 2 o .na @@ -216,22 +167,18 @@ .na \f2DocCheck Doclet\fP @ .fi -http://java.sun.com/javadoc/doccheck \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Sun Doc Check Utilities. +http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- Checks doc comments in source files and generates a report listing the errors and irregularities it finds. It is part of the Doc Check Utilities. .TP 2 o .na \f2MIF Doclet\fP @ .fi -http://java.sun.com/javadoc/mifdoclet \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format. +http://java.sun.com/j2se/javadoc/mifdoclet/ \- Can automate the generation of API documentation in MIF, FrameMaker and PDF formats. MIF is Adobe FrameMaker's interchange format. .RE - -.LP .SS Terminology .LP -.LP The terms \f2documentation comment\fP, \f2doc comment\fP, \f2main description\fP, \f2tag\fP, \f2block tag\fP, and \f2in\-line tag\fP are described at Documentation Comments. These other terms have specific meanings within the context of the Javadoc tool: -.LP .RS 3 .TP 3 generated document @@ -259,34 +206,25 @@ .na \f21.3\fP @ .fi -http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. +http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. .LP .TP 3 external referenced classes The referenced classes whose documentation is not being generated during a javadoc run. In other words, these classes are not passed into the Javadoc tool on the command line. Links in the generated documentation to those classes are said to be \f2external references\fP or \f2external links\fP. For example, if you run the Javadoc tool on only the \f2java.awt\fP package, then any class in \f2java.lang\fP, such as \f2Object\fP, is an external referenced class. External referenced classes can be linked to using the \f2\-link\fP and \f2\-linkoffline\fP options. An important property of an external referenced class is that its source comments are normally not available to the Javadoc run. In this case, these comments cannot be inherited. .RE - -.LP .SH "SOURCE FILES" .LP -.LP The Javadoc tool will generate output originating from four different types of "source" files: Java language source files for classes (\f2.java\fP), package comment files, overview comment files, and miscellaneous unprocessed files. This section also covers test files and template files that can also be in the source tree, but which you want to be sure not to document. -.LP .SS Class Source Code Files .LP -.LP Each class or interface and its members can have their own documentation comments, contained in a \f2.java\fP file. For more details about these doc comments, see Documentation Comments. -.LP .SS Package Comment Files .LP -.LP Each package can have its own documentation comment, contained in its own "source" file, that the Javadoc tool will merge into the package summary page that it generates. You typically include in this comment any documentation that applies to the entire package. .LP -.LP To create a package comment file, you have a choice of two files to place your comments: -.LP .RS 3 .TP 2 o @@ -295,52 +233,18 @@ o \f2package.html\fP \- Can contain only package comments and Javadoc tags, no package annotations. .RE - -.LP .LP A package may have a single \f2package.html\fP file or a single \f2package\-info.java\fP file but not both. Place either file in the package directory in the source tree along with your \f2.java\fP files. .LP -.LP \f4package\-info.java\fP \- This file can contain a package comment of the following structure \-\- the comment is placed before the package declaration: .LP -.LP File: \f2java/applet/package\-info.java\fP -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 .nf \f3 .fl /** .fl - * Provides the classes necessary to create an + * Provides the classes necessary to create an .fl * applet and the classes an applet uses .fl @@ -372,105 +276,12 @@ .fl \fP .fi -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 352 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-42 - -.LP .LP Note that while the comment separators \f2/**\fP and \f2/*\fP must be present, the leading asterisks on the intermediate lines can be omitted. .LP -.LP \f4package.html\fP \- This file can contain a package comment of the following structure \-\- the comment is placed in the \f2<body>\fP element: .LP -.LP File: \f2java/applet/package.html\fP -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 .nf \f3 .fl @@ -478,7 +289,7 @@ .fl <BODY> .fl -Provides the classes necessary to create an applet and the +Provides the classes necessary to create an applet and the .fl classes an applet uses to communicate with its applet context. .fl @@ -506,77 +317,14 @@ .fl \fP .fi -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 405 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-40 - -.LP .LP Notice this is just a normal HTML file and does not include a package declaration. The content of the package comment file is written in HTML, like all other comments, with one exception: The documentation comment should not include the comment separators \f2/**\fP and \f2*/\fP or leading asterisks. When writing the comment, you should make the first sentence a summary about the package, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include package tags; as with any documentation comment, all block tags must appear after the main description. If you add a \f2@see\fP tag in a package comment file, it must have a fully\-qualified name. For more details, see the .na \f2example of \fP\f2package.html\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments. .LP \f3Processing of package comment file\fP \- When the Javadoc tool runs, it will automatically look for the package comment file; if found, the Javadoc tool does the following: -.LP .RS 3 .TP 2 o @@ -590,35 +338,27 @@ .na \f2Package Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/applet/package\-summary.html. +http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. .TP 2 o Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in .na \f2Overview Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. +http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. .RE - -.LP .SS Overview Comment File .LP -.LP Each application or set of packages that you are documenting can have its own overview documentation comment, kept in its own "source" file, that the Javadoc tool will merge into the overview page that it generates. You typically include in this comment any documentation that applies to the entire application or set of packages. .LP -.LP To create an overview comment file, you can name the file anything you want, typically \f4overview.html\fP and place it anywhere, typically at the top level of the source tree. For example, if the source files for the \f2java.applet\fP package are contained in \f2/home/user/src/java/applet\fP directory, you could create an overview comment file at \f2/home/user/src/overview.html\fP. .LP -.LP Notice you can have multiple overview comment files for the same set of source files, in case you want to run javadoc multiple times on different sets of packages. For example, you could run javadoc once with \-private for internal documentation and again without that option for public documentation. In this case, you could describe the documentation as public or internal in the first sentence of each overview comment file. .LP -.LP The content of the overview comment file is one big documentation comment, written in HTML, like the package comment file described previously. See that description for details. To re\-iterate, when writing the comment, you should make the first sentence a summary about the application or set of packages, and not put a title or any other text between \f2<body>\fP and the first sentence. You can include overview tags; as with any documentation comment, all tags except in\-line tags, such as \f2{@link}\fP, must appear after the main description. If you add a \f2@see\fP tag, it must have a fully\-qualified name. .LP -.LP When you run the Javadoc tool, you specify the overview comment file name with the \-overview option. The file is then processed similar to that of a package comment file. -.LP .RS 3 .TP 2 o @@ -632,25 +372,19 @@ .na \f2Overview Summary\fP @ .fi -http://java.sun.com/javase/6/docs/api/overview\-summary.html. +http://download.oracle.com/javase/7/docs/api/overview\-summary.html. .TP 2 o Copies the first sentence of the overview comment to the top of the overview summary page. .RE - -.LP .SS Miscellaneous Unprocessed Files .LP -.LP You can also include in your source any miscellaneous files that you want the Javadoc tool to copy to the destination directory. These typically includes graphic files, example Java source (.java) and class (.class) files, and self\-standing HTML files whose content would overwhelm the documentation comment of a normal Java source file. .LP -.LP To include unprocessed files, put them in a directory called \f4doc\-files\fP which can be a subdirectory of any package directory that contains source files. You can have one such subdirectory for each package. You might include images, example code, source files, .class files, applets and HTML files. For example, if you want to include the image of a button \f2button.gif\fP in the \f2java.awt.Button\fP class documentation, you place that file in the \f2/home/user/src/java/awt/doc\-files/\fP directory. Notice the \f2doc\-files\fP directory should not be located at \f2/home/user/src/java/doc\-files\fP because \f2java\fP is not a package \-\- that is, it does not directly contain any source files. .LP -.LP All links to these unprocessed files must be hard\-coded, because the Javadoc tool does not look at the files \-\- it simply copies the directory and all its contents to the destination. For example, the link in the \f2Button.java\fP doc comment might look like: -.LP .nf \f3 .fl @@ -664,23 +398,16 @@ .fl \fP .fi - -.LP .SS Test Files and Template Files .LP -.LP Some developers have indicated they want to store test files and templates files in the source tree near their corresponding source files. That is, they would like to put them in the same directory, or a subdirectory, of those source files. .LP -.LP If you run the Javadoc tool by explicitly passing in individual source filenames, you can deliberately omit test and templates files and prevent them from being processed. However, if you are passing in package names or wildcards, you need to follow certain rules to ensure these test files and templates files are not processed. .LP -.LP Test files differ from template files in that the former are legal, compilable source files, while the latter are not, but may end with ".java". .LP -.LP \f3Test files\fP \- Often developers want to put compilable, runnable test files for a given package in the \f2same\fP directory as the source files for that package. But they want the test files to belong to a package other than the source file package, such as the unnamed package (so the test files have no package statement or a different package statement from the source). In this scenario, when the source is being documented by specifying its package name specified on the command line, the test files will cause warnings or errors. You need to put such test files in a subdirectory. For example, if you want to add test files for source files in \f2com.package1\fP, put them in a subdirectory that would be an invalid package name (because it contains a hyphen): -.LP .nf \f3 .fl @@ -688,29 +415,17 @@ .fl \fP .fi - -.LP .LP The test directory will be skipped by the Javadoc tool with no warnings. .LP -.LP If your test files contain doc comments, you can set up a separate run of the Javadoc tool to produce documentation of the test files by passing in their test source filenames with wildcards, such as \f2com/package1/test\-files/*.java\fP. .LP -.LP -\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see -.na -\f2Identifiers\fP @ -.fi -http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#40625). -.LP +\f3Templates for source files\fP \- Template files have names that often end in ".java" and are not compilable. If you have a template for a source file that you want to keep in the source directory, you can name it with a dash (such as \f2Buffer\-Template.java\fP), or any other illegal Java character, to prevent it from being processed. This relies on the fact that the Javadoc tool will only process source files whose name, when stripped of the ".java" suffix, is actually a legal class name (see information about Identifiers in the Java Language Specification). .SH "GENERATED FILES" .LP -.LP By default, javadoc uses a standard doclet that generates HTML\-formatted documentation. This doclet generates the following kinds of files (where each HTML "page" corresponds to a separate file). Note that javadoc generates files with two types of names: those named after classes/interfaces, and those that are not (such as \f2package\-summary.html\fP). Files in the latter group contain hyphens to prevent filename conflicts with those in the former group. .LP -.LP \f3Basic Content Pages\fP -.LP .RS 3 .TP 2 o @@ -722,11 +437,8 @@ o One \f3overview page\fP (\f2overview\-summary.html\fP) for the entire set of packages. This is the front page of the generated document. The Javadoc tool will include any HTML text provided in a file specified with the \f2\-overview\fP option. Note that this file is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) .RE - -.LP .LP \f3Cross\-Reference Pages\fP -.LP .RS 3 .TP 2 o @@ -750,15 +462,12 @@ o An \f3index\fP (\f2index\-*.html\fP) of all class, interface, constructor, field and method names, alphabetically arranged. This is internationalized for Unicode and can be generated as a single file or as a separate file for each starting character (such as A\-Z for English). .RE - -.LP .LP \f3Support Files\fP -.LP .RS 3 .TP 2 o -A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. +A \f3help page\fP (\f2help\-doc.html\fP) that describes the navigation bar and the above pages. You can provide your own custom help file to override the default using \f2\-helpfile\fP. .TP 2 o One \f3index.html file\fP which creates the HTML frames for display. This is the file you load to display the front page with frames. This file itself contains no text content. @@ -775,45 +484,14 @@ o A \f3doc\-files\fP directory that holds any image, example, source code or other files that you want copied to the destination directory. These files are not processed by the Javadoc tool in any manner \-\- that is, any javadoc tags in them will be ignored. This directory is not generated unless it exists in the source tree. .RE - -.LP .LP \f3HTML Frames\fP .LP -.LP The Javadoc tool will generate either two or three HTML frames, as shown in the figure below. It creates the minimum necessary number of frames by omitting the list of packages if there is only one package (or no packages). That is, when you pass a single package name or source files (*.java) belonging to a single package as arguments into the javadoc command, it will create only one frame (C) in the left\-hand column \-\- the list of classes. When you pass into javadoc two or more package names, it creates a third frame (P) listing all packages, as well as an overview page (Detail). This overview page has the filename \f2overview\-summary.html\fP. Thus, this file is created only if you pass in two or more package names. You can bypass frames by clicking on the "No Frames" link or entering at overview\-summary.html. .LP -.LP If you are unfamiliar with HTML frames, you should be aware that frames can have \f2focus\fP for printing and scrolling. To give a frame focus, click on it. Then on many browsers the arrow keys and page keys will scroll that frame, and the print menu command will print it. .LP -.nf -\f3 -.fl - \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\- -.fl - |C| Detail | |P| Detail | -.fl - | | | | | | -.fl - | | | |\-| | -.fl - | | | |C| | -.fl - | | | | | | -.fl - | | | | | | -.fl - \-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-\-\-\-\-\-\-\-\- -.fl - javadoc *.java javadoc java.lang java.awt -.fl -\fP -.fi - -.LP -.LP Load one of the following two files as the starting page depending on whether you want HTML frames or not: -.LP .RS 3 .TP 2 o @@ -822,24 +500,14 @@ o \f2overview\-summary.html\fP (for no frames) .RE - -.LP .LP \f3Generated File Structure\fP .LP -.LP The generated class and interface files are organized in the same directory hierarchy that Java source files and class files are organized. This structure is one directory per subpackage. .LP -.LP For example, the document generated for the class \f2java.applet.Applet\fP class would be located at \f2java/applet/Applet.html\fP. The file structure for the java.applet package follows, given that the destination directory is named \f2apidocs\fP. All files that contain the word "frame" appear in the upper\-left or lower\-left frames, as noted. All other HTML files appear in the right\-hand frame. .LP -.RS 3 - -.LP -.LP NOTE \- Directories are shown in \f3bold\fP. The asterisks (\f2*\fP) indicate the files and directories that are \f2omitted\fP when the arguments to javadoc are source filenames (*.java) rather than package names. Also when arguments are source filenames, \f2package\-list\fP is created but is empty. The doc\-files directory will not be created in the destination unless it exists in the source tree. -.LP -.RE .nf \f3 .fl @@ -922,44 +590,31 @@ AudioClip.html Page for AudioClip source code .fl .fi - -.LP .SS Generated API Declarations .LP -.LP The Javadoc tool generates a declaration at the start of each class, interface, field, constructor, and method description for that API item. For example, the declaration for the \f2Boolean\fP class is: .LP -.LP \f2public final class Boolean\fP .br \f2extends Object\fP .br \f2implements Serializable\fP .LP -.LP and the declaration for the \f2Boolean.valueOf\fPmethod is: .LP -.LP \f2public static Boolean valueOf(String s)\fP .LP -.LP The Javadoc tool can include the modifiers \f2public\fP, \f2protected\fP, \f2private\fP, \f2abstract\fP, \f2final\fP, \f2static\fP, \f2transient\fP, and \f2volatile\fP, but not \f2synchronized\fP or \f2native\fP. These last two modifiers are considered implementation detail and not part of the API specification. .LP -.LP Rather than relying on the keyword \f2synchronized\fP, APIs should document their concurrency semantics in the comment's main description, as in "a single \f2Enumeration\fP cannot be used by multiple threads concurrently". The document should not describe how to achieve these semantics. As another example, while \f2Hashtable\fP should be thread\-safe, there's no reason to specify that we achieve this by synchronizing all of its exported methods. We should reserve the right to synchronize internally at the bucket level, thus offering higher concurrency. -.LP .SH "DOCUMENTATION COMMENTS" .LP -.LP The original "Documentation Comment Specification" can be found under related documentation. -.LP .SS Commenting the Source Code .LP -.LP You can include \f2documentation comments\fP ("doc comments") in the source code, ahead of declarations for any class, interface, method, constructor, or field. You can also create doc comments for each package and another one for the overview, though their syntax is slightly different. Doc comments are also known informally as "Javadoc comments" (but this term violates its trademark usage). A doc comment consists of the characters between the characters \f2/**\fP that begin the comment and the characters \f2*/\fP that end it. Leading asterisks are allowed on each line and are described further below. The text in a comment can continue onto multiple lines. -.LP .nf \f3 .fl @@ -973,11 +628,8 @@ .fl \fP .fi - -.LP .LP To save space you can put a comment on one line: -.LP .nf \f3 .fl @@ -985,14 +637,10 @@ .fl \fP .fi - -.LP .LP \f3Placement of comments\fP \- Documentation comments are recognized only when placed immediately before class, interface, constructor, method, or field declarations \-\- see the class example, method example, and field example. Documentation comments placed in the body of a method are ignored. Only one documentation comment per declaration statement is recognized by the Javadoc tool. .LP -.LP A common mistake is to put an \f2import\fP statement between the class comment and the class declaration. Avoid this, as the Javadoc tool will ignore the class comment. -.LP .nf \f3 .fl @@ -1014,11 +662,8 @@ .fl \fP .fi - -.LP .LP \f3A doc comment is composed of a \fP\f4main description\fP\f3 followed by a \fP\f4tag section\fP \- The \f2main description\fP begins after the starting delimiter \f2/**\fP and continues until the tag section. The \f2tag section\fP starts with the first block tag, which is defined by the first \f2@\fP character that begins a line (ignoring leading asterisks, white space, and leading separator \f2/**\fP). It is possible to have a comment with only a tag section and no main description. The main description cannot continue after the tag section begins. The argument to a tag can span multiple lines. There can be any number of tags \-\- some types of tags can be repeated while others cannot. For example, this \f2@see\fP starts the tag section: -.LP .nf \f3 .fl @@ -1032,11 +677,8 @@ .fl \fP .fi - -.LP .LP \f3Block tags and in\-line tags\fP \- A \f2tag\fP is a special keyword within a doc comment that the Javadoc tool can process. There are two kinds of tags: block tags, which appear as \f2@tag\fP (also known as "standalone tags"), and in\-line tags, which appear within curly braces, as \f2{@tag}\fP. To be interpreted, a block tag must appear at the beginning of a line, ignoring leading asterisks, white space, and separator (\f2/**\fP). This means you can use the \f2@\fP character elsewhere in the text and it will not be interpreted as the start of a tag. If you want to start a line with the \f2@\fP character and not have it be interpreted, use the HTML entity \f2@\fP. Each block tag has associated text, which includes any text following the tag up to, but not including, either the next tag, or the end of the doc comment. This associated text can span multiple lines. An in\-line tag is allowed and interpreted anywhere that text is allowed. The following example contains the block tag \f2@deprecated\fP and in\-line tag \f2{@link}\fP. -.LP .nf \f3 .fl @@ -1048,17 +690,12 @@ .fl \fP .fi - -.LP .LP \f3Comments are written in HTML\fP \- The text must be written in HTML, in that they should use HTML entities and can use HTML tags. You can use whichever version of HTML your browser supports; we have written the standard doclet to generate HTML 3.2\-compliant code elsewhere (outside of the documentation comments) with the inclusion of cascading style sheets and frames. (We preface each generated file with "HTML 4.0" because of the frame sets.) .LP -.LP For example, entities for the less\-than (\f2<\fP) and greater\-than (\f2>\fP) symbols should be written \f2<\fP and \f2>\fP. Likewise, the ampersand (\f2&\fP) should be written \f2&\fP. The bold HTML tag \f2\fP is shown in the following example. .LP -.LP Here is a doc comment: -.LP .nf \f3 .fl @@ -1072,20 +709,12 @@ .fl \fP .fi - -.LP .LP \f3Leading asterisks\fP \- When javadoc parses a doc comment, leading asterisk (\f2*\fP) characters on each line are discarded; blanks and tabs preceding the initial asterisk (\f2*\fP) characters are also discarded. Starting with 1.4, if you omit the leading asterisk on a line, the leading white space is no longer removed. This enables you to paste code examples directly into a doc comment inside a \f2<PRE>\fP tag, and its indentation will be honored. Spaces are generally interpreted by browsers more uniformly than tabs. Indentation is relative to the left margin (rather than the separator \f2/**\fP or \f2<PRE>\fP tag). .LP -.LP \f3First sentence\fP \- The first sentence of each doc comment should be a summary sentence, containing a concise but complete description of the declared entity. This sentence ends at the first period that is followed by a blank, tab, or line terminator, or at the first block tag. The Javadoc tool copies this first sentence to the member summary at the top of the HTML page. .LP -.LP \f3Declaration with multiple fields\fP \- Java allows declaring multiple fields in a single statement, but this statement can have only one documentation comment, which is copied for all fields. Therefore if you want individual documentation comments for each field, you must declare each field in a separate statement. For example, the following documentation comment doesn't make sense written as a single declaration and would be better handled as two declarations: -.LP -.RS 3 - -.LP .nf \f3 .fl @@ -1099,51 +728,32 @@ .fl \fP .fi -.RE - -.LP .LP The Javadoc tool generates the following documentation from the above code: -.LP -.RS 3 - -.LP .nf \f3 .fl public int \fP\f3x\fP .fl .fi - -.LP .RS 3 The horizontal and vertical distances of point (x,y) .RE - -.LP .nf \f3 .fl public int \fP\f3y\fP .fl .fi - -.LP .RS 3 The horizontal and vertical distances of point (x,y) .RE - -.LP -.RE .LP \f3Use header tags carefully\fP \- When writing documentation comments for members, it's best not to use HTML heading tags such as <H1> and <H2>, because the Javadoc tool creates an entire structured document and these structural tags might interfere with the formatting of the generated document. However, it is fine to use these headings in class and package comments to provide your own structure. -.LP .SS Automatic Copying of Method Comments .LP -.LP The Javadoc tool has the ability to copy or "inherit" method comments in classes and interfaces under the following two circumstances. Constructors, fields and nested classes do not inherit doc comments. -.LP .RS 3 .TP 2 o @@ -1156,14 +766,10 @@ o \f3Explicitly inherit comment with {@inheritDoc} tag\fP \- Insert the inline tag \f2{@inheritDoc}\fP in a method main description or \f2@return\fP, \f2@param\fP or \f2@throws\fP tag comment \-\- the corresponding inherited main description or tag comment is copied into that spot. .RE - -.LP .LP The source file for the inherited method need only be on the path specified by \-sourcepath for the doc comment to actually be available to copy. Neither the class nor its package needs to be passed in on the command line. This contrasts with 1.3.x and earlier releases, where the class had to be a documented class .LP -.LP \f3Inherit from classes and interfaces\fP \- Inheriting of comments occurs in all three possible cases of inheritance from classes and interfaces: -.LP .RS 3 .TP 2 o @@ -1175,17 +781,12 @@ o When a method in a class implements a method in an interface .RE - -.LP .LP In the first two cases, for method overrides, the Javadoc tool generates a subheading "Overrides" in the documentation for the overriding method, with a link to the method it is overriding, whether or not the comment is inherited. .LP -.LP In the third case, when a method in a given class implements a method in an interface, the Javadoc tool generates a subheading "Specified by" in the documentation for the overriding method, with a link to the method it is implementing. This happens whether or not the comment is inherited. .LP -.LP \f3Algorithm for Inheriting Method Comments\fP \- If a method does not have a doc comment, or has an {@inheritDoc} tag, the Javadoc tool searches for an applicable comment using the following algorithm, which is designed to find the most specific applicable doc comment, giving preference to interfaces over superclasses: -.LP .RS 3 .TP 3 1. @@ -1205,16 +806,11 @@ If step 3a failed to find a doc comment, recursively apply this entire algorithm to the superclass. .RE .RE - -.LP .SH "JAVADOC TAGS" .LP -.LP The Javadoc tool parses special tags when they are embedded within a Java doc comment. These doc tags enable you to autogenerate a complete, well\-formatted API from your source code. The tags start with an "at" sign (\f2@\fP) and are case\-sensitive \-\- they must be typed with the uppercase and lowercase letters as shown. A tag must start at the beginning of a line (after any leading spaces and an optional asterisk) or it is treated as normal text. By convention, tags with the same name are grouped together. For example, put all \f2@see\fP tags together. .LP -.LP Tags come in two types: -.LP .RS 3 .TP 2 o @@ -1223,8 +819,6 @@ o \f3Inline tags\fP \- Can be placed anywhere in the main description or in the comments for block tags. Inline tags are denoted by curly braces: \f2{@tag}\fP. .RE - -.LP .LP For information about tags we might introduce in future releases, see .na @@ -1232,13 +826,8 @@ .fi http://java.sun.com/j2se/javadoc/proposed\-tags.html. .LP -.LP The current tags are: .LP -.RS 3 - -.LP -.LP .TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 @@ -1350,7 +939,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 1122 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 873 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1450,53 +1039,34 @@ .35 .TE .if \n-(b.=0 .nr c. \n(.c-\n(d.-42 - -.LP .LP For custom tags, see the \-tag option. -.LP -.RE .RS 3 .TP 3 @author\ name\-text Adds an "Author" entry with the specified \f2name\-text\fP to the generated docs when the \-author option is used. A doc comment may contain multiple \f2@author\fP tags. You can specify one name per \f2@author\fP tag or multiple names per tag. In the former case, the Javadoc tool inserts a comma (\f2,\fP) and space between names. In the latter case, the entire text is simply copied to the generated document without being parsed. Therefore, you can use multiple names per line if you want a localized name separator other than comma. +.RE .LP For more details, see Where Tags Can Be Used and .na \f2writing @author tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@author. -.LP -.TP 3 -@deprecated\ deprecated\-text -.RS 3 - -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author. .LP -Note: You can deprecate a program element using the -.na -\f2@Deprecated annotation\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/deprecation.html. -.LP +.RS 3 +.TP 3 +@deprecated\ deprecated\-text Note: You can deprecate a program element using the @Deprecated annotation. .RE -.RE -.RS 3 - -.LP .LP Adds a comment indicating that this API should no longer be used (even though it may continue to work). The Javadoc tool moves the \f2deprecated\-text\fP ahead of the main description, placing it in italics and preceding it with a bold warning: "Deprecated". This tag is valid in all doc comments: overview, package, class, interface, constructor, method and field. .LP -.LP The first sentence of \f2deprecated\-text\fP should at least tell the user when the API was deprecated and what to use as a replacement. The Javadoc tool copies just the first sentence to the summary section and index. Subsequent sentences can also explain why it has been deprecated. You should include a \f2{@link}\fP tag (for Javadoc 1.2 or later) that points to the replacement API: .LP -.LP For more details, see .na \f2writing @deprecated tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@deprecated. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated. .RS 3 .TP 2 o @@ -1518,19 +1088,13 @@ o For Javadoc 1.1, the standard format is to create a \f2@see\fP tag (which cannot be in\-line) for each \f2@deprecated\fP tag. .RE - -.LP .LP For more about deprecation, see .na \f2The @deprecated tag\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/deprecation/index.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html. .LP - -.LP -.RE .RS 3 .TP 3 {@code\ text} @@ -1700,7 +1264,7 @@ .na \f2writing {@link} tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#{@link}. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}. .LP .TP 3 {@linkplain\ package.class#member\ label} @@ -1716,13 +1280,8 @@ .fi .LP This would display as: -.RS 3 - .LP -.LP -Refer to the overridden method. -.LP -.RE +Refer to the overridden method. .LP .TP 3 {@literal\ text} @@ -1799,7 +1358,7 @@ .na \f2writing @param tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@param. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param. .LP .TP 3 @return\ description @@ -1809,7 +1368,7 @@ .na \f2writing @return tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@return. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return. .LP .TP 3 @see\ reference @@ -1834,18 +1393,12 @@ .RS 3 .RS 3 .RS 3 - -.LP -.RS 3 .RS 3 .TP 3 See Also: "The Java Programming Language" .RE .RE - -.LP -.RE .TP 3 @see <a href="URL#value">label</a> Adds a link as defined by \f2URL\fP#\f2value\fP. The \f2URL\fP#\f2value\fP is a relative or absolute URL. The Javadoc tool distinguishes this from other cases by looking for a less\-than symbol (\f2<\fP) as the first character. For example: @@ -1858,14 +1411,10 @@ .fi This generates a link such as: .RS 3 -.RS 3 .TP 3 See Also: Java Spec .RE - -.LP -.RE .TP 3 @see\ package.class#member\ label Adds a link, with visible text \f2label\fP, that points to the documentation for the specified name in the Java Language that is referenced. The \f2label\fP is optional; if omitted, the name appears instead as the visible text, suitably shortened \-\- see How a name is displayed. Use \-noqualifier to globally remove the package name from this visible text. Use the label when you want the visible text to be different from the auto\-generated visible text. @@ -1885,7 +1434,6 @@ .RE .LP \f3Example\fP \- In this example, an \f2@see\fP tag (in the \f2Character\fP class) refers to the \f2equals\fP method in the \f2String\fP class. The tag includes both arguments: the name "\f2String#equals(Object)\fP" and the label "\f2equals\fP". -.RS 3 .nf \f3 .fl @@ -1897,11 +1445,7 @@ .fl \fP .fi -.RE The standard doclet produces HTML something like this: -.RS 3 - -.LP .nf \f3 .fl @@ -1915,19 +1459,12 @@ .fl \fP .fi -.RE Which looks something like this in a browser, where the label is the visible link text: .RS 3 - -.LP -.RS 3 .TP 3 See Also: equals .RE - -.LP -.RE .LP \f3Specifying a name\fP \- This \f2package.class\fP\f2#\fP\f2member\fP name can be either fully\-qualified, such as \f2java.lang.String#toUpperCase()\fP or not, such as \f2String#toUpperCase()\fP or \f2#toUpperCase()\fP. If less than fully\-qualified, the Javadoc tool uses the normal Java compiler search order to find it, further described below in Search order for @see. The name can contain whitespace within parentheses, such as between method arguments. .LP @@ -2079,7 +1616,7 @@ .nr 40 \n(79+(0*\n(38) .nr 80 +\n(40 .nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1665 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1364 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2186,7 +1723,7 @@ .LP \f3Search order for @see\fP \- the Javadoc tool will process a \f2@see\fP tag that appears in a source file (.java), package file (package.html or package\-info.java) or overview file (overview.html). In the latter two files, you must fully\-qualify the name you supply with \f2@see\fP. In a source file, you can specify a name that is fully\-qualified or partially\-qualified. .LP -When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in Chapter 6, "Names" of the \f2Java Language Specification\fP, Second Edition. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order: +When the Javadoc tool encounters a \f2@see\fP tag in a \f2.java\fP file that is \f2not\fP fully qualified, it searches for the specified name in the same order as the Java compiler would (except the Javadoc tool will not detect certain namespace ambiguities, since it assumes the source code is free of these errors). This search order is formally defined in the \f2Java Language Specification\fP. The Javadoc tool searches for that name through all related and imported classes and packages. In particular, it searches in this order: .RS 3 .TP 3 1. @@ -2425,7 +1962,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 1741 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 1440 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2598,14 +2135,9 @@ .na \f2writing @see tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@see. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see. .RE .RE -.RS 3 - -.LP -.LP - .LP .RS 3 .TP 3 @@ -2634,11 +2166,11 @@ .na \f2Documenting Serializable Fields and Data for a Class\fP @ .fi -http://java.sun.com/javase/6/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the +http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the .na \f2Serialization FAQ\fP @ .fi -http://java.sun.com/products/jdk/serialization/faq/#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see +http://java.sun.com/javase/technologies/core/basic/serializationFAQ.jsp#javadoc_warn_missing, which covers common questions, such as "Why do I see javadoc warnings stating that I am missing @serial tags for private fields if I am not running javadoc with the \-private switch?". Also see .na \f2Sun's criteria\fP @ .fi @@ -2681,7 +2213,7 @@ .na \f2writing @throws tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@exception. +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception. .LP .TP 3 {@value\ package.class#field} @@ -2727,7 +2259,7 @@ .na \f2Constant Field Values\fP @ .fi -http://java.sun.com/javase/6/docs/api/constant\-values.html page. +http://download.oracle.com/javase/7/docs/api/constant\-values.html page. .LP .TP 3 @version\ version\-text @@ -2739,376 +2271,111 @@ .na \f2writing @version tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#@version. -.RE - -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version. .RE .SS Where Tags Can Be Used .LP -.LP The following sections describe where the tags can be used. Note that these tags can be used in all doc comments: \f2@see\fP, \f2@since\fP, \f2@deprecated\fP, \f2{@link}\fP, \f2{@linkplain}\fP, and \f2{@docroot}\fP. -.LP -.RS 3 - -.LP .SS Overview Documentation Tags .LP -.LP Overview tags are tags that can appear in the documentation comment for the overview page (which resides in the source file typically named \f2overview.html\fP). Like in any other documentation comments, these tags must appear after the main description. .LP -.LP \f3NOTE\fP \- The \f2{@link}\fP tag has a bug in overview documents in version 1.2 \-\- the text appears properly but has no link. The \f2{@docRoot}\fP tag does not currently work in overview documents. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Overview Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1962 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Overview Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-20 - -.LP +\f3Overview Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE .SS Package Documentation Tags .LP -.LP Package tags are tags that can appear in the documentation comment for a package (which resides in the source file named \f2package.html\fP or \f2package\-info.java\fP). The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@serial\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Package Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 1994 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Package Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-22 - -.LP +\f3Package Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE .SS Class and Interface Documentation Tags .LP -.LP The following are tags that can appear in the documentation comment for a class or interface. The \f2@serial\fP tag can only be used here with the \f2include\fP or \f2exclude\fP argument. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@serial\fP -.br -\f2@author\fP -.br -\f2@version\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Class/Interface Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2028 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Class/Interface Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-24 - -.LP +\f3Class/Interface Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@author\fP +.TP 2 +o +\f2@version\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE \f3An example of a class comment:\fP -.LP .nf \f3 .fl @@ -3146,129 +2413,42 @@ .fl \fP .fi - -.LP .SS Field Documentation Tags .LP -.LP -The following are the tags that can appear in the documentation comment for a field. -.LP +The following are the tags that can appear in .LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@serial\fP -.br -\f2@serialField\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@docRoot}\fP -.br -\f2{@value}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Field Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2103 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Field Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-24 - -.LP +\f3Field Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@serial\fP +.TP 2 +o +\f2@serialField\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@docRoot}\fP +.TP 2 +o +\f2{@value}\fP +.RE \f3An example of a field comment:\fP -.LP .nf \f3 .fl @@ -3286,133 +2466,48 @@ .fl \fP .fi - -.LP .SS Constructor and Method Documentation Tags .LP -.LP The following are the tags that can appear in the documentation comment for a constructor or method, except for \f2@return\fP, which cannot appear in a constructor, and \f2{@inheritDoc}\fP, which has certain restrictions. The \f2@serialData\fP tag can only be used in the doc comment for certain serialization methods. .LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 34 \n(.lu -.eo -.am 80 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/2u -.if \n(.l<\n(80 .ll \n(80u -.in 0 -\f2@see\fP -.br -\f2@since\fP -.br -\f2@deprecated\fP -.br -\f2@param\fP -.br -\f2@return\fP -.br -\f2@throws\fP and \f2@exception\fP -.br -\f2@serialData\fP -.br -\f2{@link}\fP -.br -\f2{@linkplain}\fP -.br -\f2{@inheritDoc}\fP -.br -\f2{@docRoot}\fP -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 38 \w\f3Method/Constructor Tags\fP -.if \n(80<\n(38 .nr 80 \n(38 -.80 -.rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 2162 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f3Method/Constructor Tags\fP -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(80u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(40u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-28 - -.LP +\f3Method/Constructor Tags\fP +.RS 3 +.TP 2 +o +\f2@see\fP +.TP 2 +o +\f2@since\fP +.TP 2 +o +\f2@deprecated\fP +.TP 2 +o +\f2@param\fP +.TP 2 +o +\f2@return\fP +.TP 2 +o +\f2@throws\fP and \f2@exception\fP +.TP 2 +o +\f2@serialData\fP +.TP 2 +o +\f2{@link}\fP +.TP 2 +o +\f2{@linkplain}\fP +.TP 2 +o +\f2{@inheritDoc}\fP +.TP 2 +o +\f2{@docRoot}\fP +.RE \f3An example of a method doc comment:\fP -.LP .nf \f3 .fl @@ -3446,23 +2541,12 @@ .fl \fP .fi -.RE - -.LP .SH "OPTIONS" .LP - -.LP -.LP The javadoc tool uses doclets to determine its output. The Javadoc tool uses the default standard doclet unless a custom doclet is specified with the \-doclet option. The Javadoc tool provides a set of command\-line options that can be used with any doclet \-\- these options are described below under the sub\-heading Javadoc Options. The standard doclet provides an additional set of command\-line options that are described below under the sub\-heading Options Provided by the Standard Doclet. All option names are case\-insensitive, though their arguments can be case\-sensitive. .LP -.LP The options are: .LP -.RS 3 - -.LP -.LP .TS .if \n+(b.=1 .nr d. \n(.c-\n(c.-1 .de 35 @@ -3615,6 +2699,8 @@ .br \-\f2sourcepath\fP .br +\-sourcetab +.br \-splitindex .br \-stylesheetfile @@ -3627,6 +2713,8 @@ .br \-tagletpath .br +\-top +.br \-title .br \-use @@ -3673,7 +2761,7 @@ .nr 42 \n(81+(3*\n(38) .nr 82 +\n(42 .nr TW \n(82 -.if t .if \n(TW>\n(.li .tm Table at line 2340 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 2015 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3729,53 +2817,47 @@ .rm b+ .rm c+ .TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-123 - -.LP -.RE +.if \n-(b.=0 .nr c. \n(.c-\n(d.-127 .LP Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options. -.LP .SS Javadoc Options -.LP .RS 3 .TP 3 \-overview \ path/filename -Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the \f2\-sourcepath\fP. -.LP -While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example. -.LP -For information about the file specified by \f2path/filename\fP, see overview comment file. -.LP -Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) -.LP -The title on the overview page is set by \f2\-doctitle\fP. -.LP +Specifies that javadoc should retrieve the text for the overview documentation from the "source" file specified by \f2path/filename\fP and place it on the Overview page (\f2overview\-summary.html\fP). The \f2path/filename\fP is relative to the current directory. +.br +.br +While you can use any name you want for \f2filename\fP and place it anywhere you want for \f2path\fP, a typical thing to do is to name it \f2overview.html\fP and place it in the source tree at the directory that contains the topmost package directories. In this location, no \f2path\fP is needed when documenting packages, since \f2\-sourcepath\fP will point to this file. For example, if the source tree for the \f2java.lang\fP package is \f2/src/classes/java/lang/\fP, then you could place the overview file at \f2/src/classes/overview.html\fP. See Real World Example. +.br +.br +For information about the file specified by \f2path/filename\fP, see overview comment file. +.br +.br +Note that the overview page is created only if you pass into javadoc two or more package names. For further explanation, see HTML Frames.) +.br +.br +The title on the overview page is set by \f2\-doctitle\fP. .TP 3 \-public -Shows only public classes and members. -.LP +Shows only public classes and members. .TP 3 \-protected -Shows only protected and public classes and members. This is the default. -.LP +Shows only protected and public classes and members. This is the default. .TP 3 \-package -Shows only package, protected, and public classes and members. -.LP +Shows only package, protected, and public classes and members. .TP 3 \-private -Shows all classes and members. -.LP +Shows all classes and members. .TP 3 \-help -Displays the online help, which lists these javadoc and doclet command line options. -.LP +Displays the online help, which lists these javadoc and doclet command line options. .TP 3 \-doclet\ class -Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option. -.LP +Specifies the class file that starts the doclet used in generating the documentation. Use the fully\-qualified name. This doclet defines the content and formats the output. If the \f4\-doclet\fP option is not used, javadoc uses the standard doclet for generating the default HTML format. This class must contain the \f2start(Root)\fP method. The path to this starting class is defined by the \f2\-docletpath\fP option. +.br +.br For example, to call the MIF doclet, use: .nf \f3 @@ -3784,17 +2866,16 @@ .fl \fP .fi -.LP For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi -http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP +http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. .TP 3 \-docletpath\ classpathlist -Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path. -.LP +Specifies the path to the doclet starting class file (specified with the \f2\-doclet\fP option) and any jar files it depends on. If the starting class file is in a jar file, then this specifies the path to that jar file, as shown in the example below. You can specify an absolute path or a path relative to the current directory. If \f2classpathlist\fP contains multiple paths or jar files, they should be separated with a colon (:) on Solaris and a semi\-colon (;) on Windows. This option is not necessary if the doclet starting class is already in the search path. +.br +.br Example of path to jar file that contains the starting doclet class file. Notice the jar filename is included. .nf \f3 @@ -3815,207 +2896,33 @@ .na \f2MIF Doclet documentation\fP @ .fi -http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP +http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. .TP 3 \-1.1 -\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP -.LP +\f2This feature has been removed from Javadoc 1.4. There is no replacement for it. This option created documentation with the appearance and functionality of documentation generated by Javadoc 1.1 (it never supported nested classes). If you need this option, use Javadoc 1.2 or 1.3 instead.\fP .TP 3 \-source release Specifies the version of source code accepted. The following values for \f2release\fP are allowed: -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 81 -.nr 34 \n(.lu -.eo -.am 81 -.br -.di a+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used. -.br -.di -.nr a| \n(dn -.nr a- \n(dl -.. -.ec \ -.eo -.am 81 -.br -.di b+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc accepts code containing assertions, which were introduced in JDK 1.4. -.br -.di -.nr b| \n(dn -.nr b- \n(dl -.. -.ec \ -.eo -.am 81 -.br -.di c+ -.35 -.ft \n(.f -.ll \n(34u*1u/3u -.if \n(.l<\n(81 .ll \n(81u -.in 0 -javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. -.br -.di -.nr c| \n(dn -.nr c- \n(dl -.. -.ec \ -.35 -.nf -.ll \n(34u -.nr 80 0 -.nr 31 0 -.nr 32 0 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.5\fP -.if \n(32<\n(38 .nr 32 \n(38 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.4\fP -.if \n(32<\n(38 .nr 32 \n(38 -.nr 38 \w\f31 -.if \n(31<\n(38 .nr 31 \n(38 -.nr 38 \w.3\fP -.if \n(32<\n(38 .nr 32 \n(38 -.80 -.rm 80 -.nr 60 \n(31 -.nr 38 \n(60+\n(32 -.if \n(38>\n(80 .nr 80 \n(38 -.if \n(38<\n(80 .nr 60 +(\n(80-\n(38)/2 -.nr 81 0 -.81 -.rm 81 -.nr 38 \n(a- -.if \n(81<\n(38 .nr 81 \n(38 -.nr 38 \n(b- -.if \n(81<\n(38 .nr 81 \n(38 -.nr 38 \n(c- -.if \n(81<\n(38 .nr 81 \n(38 -.35 -.nf -.ll \n(34u -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr 60 +\n(40 -.nr 41 \n(80+(3*\n(38) -.nr 81 +\n(41 -.nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 2450 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.ne \n(a|u+\n(.Vu -.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.5\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.a+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.ne \n(b|u+\n(.Vu -.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.4\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.b+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.ne \n(c|u+\n(.Vu -.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) -.ta \n(60u \n(80u \n(81u -.nr 31 \n(.f -.nr 35 1m -\&\h'|\n(40u'\f31.3\fP\h'|\n(41u' -.mk ## -.nr 31 \n(## -.sp |\n(##u-1v -.nr 37 \n(41u -.in +\n(37u -.c+ -.in -\n(37u -.mk 32 -.if \n(32>\n(31 .nr 31 \n(32 -.sp |\n(31u -.fc -.nr T. 1 -.T# 1 -.35 -.rm a+ -.rm b+ -.rm c+ -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-14 -.LP -Use the value of \f2release\fP corresponding to that used when compiling the code with javac. -.LP +.RS 3 +.TP 2 +o +\f31.5\fP \- javadoc accepts code containing generics and other language features introduced in JDK 1.5. The compiler defaults to the 1.5 behavior if the \f3\-source\fP flag is not used. +.TP 2 +o +\f31.4\fP \- javadoc accepts code containing assertions, which were introduced in JDK 1.4. +.TP 2 +o +\f31.3\fP \- javadoc does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. +.RE +Use the value of \f2release\fP corresponding to that used when compiling the code with javac. .TP 3 \-sourcepath\ sourcepathlist -Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented. -.LP -Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files. -.LP +Specifies the search paths for finding source files (\f2.java\fP) when passing package names or \f2\-subpackages\fP into the \f2javadoc\fP command. The \f2sourcepathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Note that this option is not only used to locate the source files being documented, but also to find source files that are not being documented but whose comments are inherited by the source files being documented. +.br +.br +Note that you can use the \f2\-sourcepath\fP option only when passing package names into the javadoc command \-\- it will not locate \f2.java\fP files passed into the \f2javadoc\fP command. (To locate \f2.java\fP files, cd to that directory or include the path ahead of each file, as shown at Documenting One or More Classes.) If \f2\-sourcepath\fP is omitted, javadoc uses the class path to find the source files (see \-classpath). Therefore, the default \-sourcepath is the value of class path. If \-classpath is omitted and you are passing package names into javadoc, it looks in the current directory (and subdirectories) for the source files. +.br +.br Set \f2sourcepathlist\fP to the root directory of the source tree for the package you are documenting. For example, suppose you want to document a package called \f2com.mypackage\fP whose source files are located at: .nf \f3 @@ -4031,8 +2938,9 @@ % \fP\f3javadoc \-sourcepath /home/user/src/ com.mypackage\fP .fl .fi -This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP. -.LP +This is easy to remember by noticing that if you concatenate the value of sourcepath and the package name together and change the dot to a slash "/", you end up with the full path to the package: \f2/home/user/src/com/mypackage\fP. +.br +.br To point to two source paths: .nf \f3 @@ -4040,17 +2948,18 @@ % \fP\f3javadoc \-sourcepath /home/user1/src:/home/user2/src com.mypackage\fP .fl .fi -.LP .TP 3 \-classpath\ classpathlist Specifies the paths where javadoc will look for referenced classes (\f2.class\fP files) \-\- these are the documented classes plus any classes referenced by those classes. The \f2classpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. Follow the instructions in .na \f2class path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP. -.LP -If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP. +.br +.br +If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP. +.br +.br For example, if you want to document \f2com.mypackage\fP, whose source files reside in the directory \f2/home/user/src/com/mypackage\fP, and if this package relies on a library in \f2/home/user/lib\fP, you would specify: .nf \f3 @@ -4058,23 +2967,25 @@ % \fP\f3javadoc \-classpath /home/user/lib \-sourcepath /home/user/src com.mypackage\fP .fl .fi -As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory. -.LP +As with other tools, if you do not specify \f2\-classpath\fP, the Javadoc tool uses the CLASSPATH environment variable, if it is set. If both are not set, the Javadoc tool searches for classes from the current directory. +.br +.br For an in\-depth description of how the Javadoc tool uses \f2\-classpath\fP to find user classes as it relates to extension classes and bootstrap classes, see .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html. -.LP -As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). -.br -.br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. +.br +.br +As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations). +.br +.br +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-subpackages\ \ package1:package2:... -Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files. -.LP +Generates documentation from source files in the specified packages and recursively in their subpackages. This option is useful when adding new subpackages to the source code, as they are automatically included. Each \f2package\fP argument is any top\-level subpackage (such as \f2java\fP) or fully qualified package (such as \f2javax.swing\fP) that does not need to contain source files. Arguments are separated by colons (on all operating systmes). Wildcards are not needed or allowed. Use \f2\-sourcepath\fP to specify where to find the packages. This option is smart about not processing source files that are in the source tree but do not belong to the packages, as described at processing of source files. +.br +.br For example: .nf \f3 @@ -4082,10 +2993,10 @@ % \fP\f3javadoc \-d docs \-sourcepath /home/user/src \-subpackages java:javax.swing\fP .fl .fi -This command generates documentation for packages named "java" and "javax.swing" and all their subpackages. -.LP -You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages. -.LP +This command generates documentation for packages named "java" and "javax.swing" and all their subpackages. +.br +.br +You can use \f2\-subpackages\fP in conjunction with \f2\-exclude\fP to exclude specific packages. .TP 3 \-exclude\ \ packagename1:packagename2:... Unconditionally excludes the specified packages and their subpackages from the list formed by \f2\-subpackages\fP. It excludes those packages even if they would otherwise be included by some previous or later \f2\-subpackages\fP option. For example: @@ -4095,36 +3006,32 @@ % \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP .fl .fi -would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP). -.LP +would include \f2java.io\fP, \f2java.util\fP, and \f2java.math\fP (among others), but would exclude packages rooted at \f2java.net\fP and \f2java.lang\fP. Notice this excludes \f2java.lang.ref\fP, a subpackage of \f2java.lang\fP). .TP 3 \-bootclasspath\ classpathlist Specifies the paths where the boot classes reside. These are nominally the Java platform classes. The bootclasspath is part of the search path the Javadoc tool will use to look up source and class files. See .na \f2How Classes Are Found\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:). -.LP +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:). .TP 3 \-extdirs\ dirlist -Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:). -.LP +Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:). .TP 3 \-verbose -Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file. -.LP +Provides more detailed messages while javadoc is running. Without the verbose option, messages appear for loading the source files, generating the documentation (one message per source file), and sorting. The verbose option causes the printing of additional messages specifying the number of milliseconds to parse each java source file. .TP 3 \-quiet -Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string. -.LP +Shuts off non\-error and non\-warning messages, leaving only the warnings and errors appear, making them easier to view. Also suppresses the version string. .TP 3 \-breakiterator\ Uses the internationalized sentence boundary of .na \f2java.text.BreakIterator\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index. -.LP +http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index. +.br +.br From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm: .RS 3 .TP 2 @@ -4134,31 +3041,22 @@ o Breakiterator sentence\-break algorithm \- In general, stops at a period, question mark or exclamation mark followed by a space if the next word starts with a capital letter. This is meant to handle most abbreviations (such as "The serial no. is valid", but won't handle "Mr. Smith"). Doesn't stop at HTML tags or sentences that begin with numbers or symbols. Stops at the last period in "../filename", even if embedded in an HTML tag. .RE -.RS 3 - -.LP -.LP -NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused. -.LP -.RE +NOTE: We have removed from 1.5.0 the breakiterator warning messages that were in 1.4.x and have left the default sentence\-break algorithm unchanged. That is, the \-breakiterator option is not the default in 1.5.0, nor do we expect it to become the default. This is a reversal from our former intention that the default would change in the "next major release" (1.5.0). This means if you have not modified your source code to eliminate the breakiterator warnings in 1.4.x, then you don't have to do anything, and the warnings go away starting with 1.5.0. The reason for this reversal is because any benefit to having breakiterator become the default would be outweighed by the incompatible source change it would require. We regret any extra work and confusion this has caused. .TP 3 \-locale\ language_country_variant -.RS 3 -.LP \f3Important\fP \- The \f2\-locale\fP option must be placed \f2ahead\fP (to the left) of any options provided by the standard doclet or any other doclet. Otherwise, the navigation bars will appear in English. This is the only command\-line option that is order\-dependent. -.LP -.RE -.LP -Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant). -.LP -Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes. -.LP +.br +.br +Specifies the locale that javadoc uses when generating documentation. The argument is the name of the locale, as described in java.util.Locale documentation, such as \f2en_US\fP (English, United States) or \f2en_US_WIN\fP (Windows variant). +.br +.br +Specifying a locale causes javadoc to choose the resource files of that locale for messages (strings in the navigation bar, headings for lists and tables, help file contents, comments in stylesheet.css, and so forth). It also specifies the sorting order for lists sorted alphabetically, and the sentence separator to determine the end of the first sentence. It does not determine the locale of the doc comment text specified in the source files of the documented classes. .TP 3 \-encoding\ name -Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used. -.LP -Also see \-docencoding and \-charset. -.LP +Specifies the encoding name of the source files, such as \f2EUCJIS/SJIS\fP. If this option is not specified, the platform default converter is used. +.br +.br +Also see \-docencoding and \-charset. .TP 3 \-Jflag Passes \f2flag\fP directly to the runtime system java that runs javadoc. Notice there must be no space between the \f2J\fP and the \f2flag\fP. For example, if you need to ensure that the system sets aside 32 megabytes of memory in which to process the generated documentation, then you would call the \f2\-Xmx\fP option of java as follows (\f2\-Xms\fP is optional, as it only sets the size of initial memory, which is useful if you know the minimum amount of memory required): @@ -4183,12 +3081,12 @@ .RE .SS Options Provided by the Standard Doclet -.LP .RS 3 .TP 3 \-d\ directory -Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run. -.LP +Specifies the destination directory where javadoc saves the generated HTML files. (The "d" means "destination.") Omitting this option causes the files to be saved to the current directory. The value \f2directory\fP can be absolute, or relative to the current working directory. As of 1.4, the destination directory is automatically created when javadoc is run. +.br +.br For example, the following generates the documentation for the package \f2com.mypackage\fP and saves the results in the \f2/home/user/doc/\fP directory: .nf \f3 @@ -4196,28 +3094,27 @@ % \fP\f3javadoc \-d /home/user/doc com.mypackage\fP .fl .fi -.LP .TP 3 \-use -Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C. -.LP -For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP. -.LP -Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP. -.LP -You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar. +Includes one "Use" page for each documented class and package. The page describes what packages, classes, methods, constructors and fields use any API of the given class or package. Given class C, things that use class C would include subclasses of C, fields declared as C, methods that return C, and methods and constructors with parameters of type C. +.br +.br +For example, let us look at what might appear on the "Use" page for String. The \f2getName()\fP method in the \f2java.awt.Font\fP class returns type \f2String\fP. Therefore, \f2getName()\fP uses \f2String\fP, and you will find that method on the "Use" page for \f2String\fP. +.br +.br +Note that this documents only uses of the API, not the implementation. If a method uses \f2String\fP in its implementation but does not take a string as an argument or return a string, that is not considered a "use" of \f2String\fP. +.br +.br +You can access the generated "Use" page by first going to the class or package, then clicking on the "Use" link in the navigation bar. .TP 3 \-version -Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option. -.LP +Includes the @version text in the generated docs. This text is omitted by default. To tell what version of the Javadoc tool you are using, use the \f2\-J\-version\fP option. .TP 3 \-author -Includes the @author text in the generated docs. -.LP +Includes the @author text in the generated docs. .TP 3 \-splitindex -Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters. -.LP +Splits the index file into multiple files, alphabetically, one file per letter, plus a file for any index entries that start with non\-alphabetical characters. .TP 3 \-windowtitle\ title Specifies the title to be placed in the HTML <title> tag. This appears in the window title and in any browser bookmarks (favorite places) that someone creates for this page. This title should not contain any HTML tags, as the browser will not properly interpret them. Any internal quotation marks within \f2title\fP may have to be escaped. If \-windowtitle is omitted, the Javadoc tool uses the value of \-doctitle for this option. @@ -4238,8 +3135,7 @@ .fi .TP 3 \-title\ title -\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. -.LP +\f3This option no longer exists.\fP It existed only in Beta versions of Javadoc 1.2. It has been renamed to \f2\-doctitle\fP. This option is being renamed to make it clear that it defines the document title rather than the window title. .TP 3 \-header\ header Specifies the header text to be placed at the top of each output file. The header will be placed to the right of the upper navigation bar. \f2header\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2header\fP may have to be escaped. @@ -4249,28 +3145,30 @@ % \fP\f3javadoc \-header "Java 2 Platform v1.4" com.mypackage\fP .fl .fi -.LP .TP 3 \-footer\ footer Specifies the footer text to be placed at the bottom of each output file. The footer will be placed to the right of the lower navigation bar. \f2footer\fP may contain html tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2footer\fP may have to be escaped. -.LP +.TP 3 +\-top +Specifies the text to be placed at the top of each output file. .TP 3 \-bottom\ text -Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. -.LP +Specifies the text to be placed at the bottom of each output file. The text will be placed at the bottom of the page, below the lower navigation bar. The \f2text\fP may contain HTML tags and white space, though if it does, it must be enclosed in quotes. Any internal quotation marks within \f2text\fP may have to be escaped. .TP 3 \-link\ extdocURL -Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: -.LP +Creates links to existing javadoc\-generated documentation of external referenced classes. It takes one argument: .RS 3 .TP 2 o -\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. -.LP -You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. -.LP -When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. -.LP +\f4extdocURL\fP is the absolute or relative URL of the directory containing the external javadoc\-generated documentation you want to link to. Examples are shown below. The package\-list file must be found in this directory (otherwise, use \f2\-linkoffline\fP). The Javadoc tool reads the package names from the \f2package\-list\fP file and then links to those packages at that URL. When the Javadoc tool is run, the \f2extdocURL\fP value is copied literally into the \f2<A HREF>\fP links that are created. Therefore, \f2extdocURL\fP must be the URL to the \f2directory\fP, not to a file. +.br +.br +You can use an absolute link for \f2extdocURL\fP to enable your docs to link to a document on any website, or can use a relative link to link only to a relative location. If relative, the value you pass in should be the relative path from the destination directory (specified with \f2\-d\fP) to the directory containing the packages being linked to. +.br +.br +When specifying an absolute link you normally use an \f2http:\fP link. However, if you want to link to a file system that has no web server, you can use a \f2file:\fP link \-\- however, do this only if everyone wanting to access the generated documentation shares the same file system. +.br +.br In all cases, and on all operating systems, you should use a forward slash as the separator, whether the URL is absolute or relative, and "http:" or "file:" based (as specified in the .na \f2URL Memo\fP @ @@ -4288,8 +3186,11 @@ \f2\-link <directory>/<directory>/.../<name>\fP .RE .RE -.LP -You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. \f3Choosing between \-linkoffline and \-link\fP: +You can specify multiple \f2\-link\fP options in a given javadoc run to link to multiple documents. +.br +.br +\f3Choosing between \-linkoffline and \-link\fP: +.br .br Use \f2\-link\fP: .RS 3 @@ -4306,16 +3207,17 @@ o when using an absolute URL to the external API document, if your shell \f2does not allow\fP a program to open a connection to that URL for reading. This can occur if you are behind a firewall and the document you want to link to is on the other side. .RE -.LP +.br +.br \f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at .na -\f2http://java.sun.com/javase/6/docs/api/\fP @ +\f2http://download.oracle.com/javase/7/docs/api/\fP @ .fi -http://java.sun.com/javase/6/docs/api. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) .nf \f3 .fl - % \fP\f3javadoc \-link http://java.sun.com/javase/6/docs/api com.mypackage\fP + % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP .fl .fi \f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running: @@ -4325,17 +3227,21 @@ % \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP .fl .fi -.LP -Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). -.LP -\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. -.LP -Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) -.LP -This option can create links in several places in the generated documentation. -.LP -Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. -.LP +Notice the \f2\-link\fP argument is relative to the destination directory (\f2docs/spi\fP). +.br +.br +\f3Details\fP \- The \f2\-link\fP option enables you to link to classes referenced to by your code but \f2not\fP documented in the current javadoc run. For these links to go to valid pages, you must know where those HTML pages are located, and specify that location with \f2extdocURL\fP. This allows, for instance, third party documentation to link to \f2java.*\fP documentation on \f2http://java.sun.com\fP. +.br +.br +Omit the \f2\-link\fP option for javadoc to create links only to API within the documentation it is generating in the current run. (Without the \f2\-link\fP option, the Javadoc tool does not create links to documentation for external references, because it does not know if or where that documentation exists.) +.br +.br +This option can create links in several places in the generated documentation. +.br +.br +Another use is for cross\-links between sets of packages: Execute javadoc on one set of packages, then run javadoc again on another set of packages, creating links both ways between both sets. +.br +.br \f3How a Class Must be Referenced\fP \- For a link to an external referenced class to actually appear (and not just its text label), the class must be referenced in the following way. It is not sufficient for it to be referenced in the body of a method. It must be referenced in either an \f2import\fP statement or in a declaration. Here are examples of how the class \f2java.io.File\fP can be referenced: .RS 3 .TP 2 @@ -4353,16 +3259,17 @@ .br The reference and be in the return type or parameter type of a method, constructor, field, class or interface, or in an \f2implements\fP, \f2extends\fP or \f2throws\fP statement. .RE -.LP -An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. -.LP -\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. -.LP +An important corollary is that when you use the \f2\-link\fP option, there may be many links that unintentionally do not appear due to this constraint. (The text would appear without a hypertext link.) You can detect these by the warnings they emit. The most innocuous way to properly reference a class and thereby add the link would be to import that class, as shown above. +.br +.br +\f3Package List\fP \- The \f2\-link\fP option requires that a file named \f2package\-list\fP, which is generated by the Javadoc tool, exist at the URL you specify with \f2\-link\fP. The \f2package\-list\fP file is a simple text file that lists the names of packages documented at that location. In the earlier example, the Javadoc tool looks for a file named \f2package\-list\fP at the given URL, reads in the package names and then links to those packages at that URL. +.br +.br For example, the package list for the Java SE 6 API is located at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list. and starts as follows: +http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows: .nf \f3 .fl @@ -4384,31 +3291,39 @@ .fl \fP .fi -.LP -When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. -.LP -In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. -.LP -\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. -.LP -Specify a different link option for each external document to link to: -.LP -\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP -.LP -where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. -.LP -\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. -.LP -In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. -.LP +When javadoc is run without the \f2\-link\fP option, when it encounters a name that belongs to an external referenced class, it prints the name with no link. However, when the \f2\-link\fP option is used, the Javadoc tool searches the \f2package\-list\fP file at the specified \f2extdocURL\fP location for that package name. If it finds the package name, it prefixes the name with \f2extdocURL\fP. +.br +.br +In order for there to be no broken links, all of the documentation for the external references must exist at the specified URLs. The Javadoc tool will not check that these pages exist \-\- only that the package\-list exists. +.br +.br +\f3Multiple Links\fP \- You can supply multiple \f2\-link\fP options to link to any number of external generated documents. \ Javadoc 1.2 has a known bug which prevents you from supplying more than one \f2\-link\fP command. This was fixed in 1.2.2. +.br +.br +Specify a different link option for each external document to link to: +.br +.br +\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP +.br +.br +where \f2extdocURL1\fP,\ \f2extdocURL2\fP,\ ... \f2extdocURLn\fP point respectively to the roots of external documents, each of which contains a file named \f2package\-list\fP. +.br +.br +\f3Cross\-links\fP \- Note that "bootstrapping" may be required when cross\-linking two or more documents that have not previously been generated. In other words, if \f2package\-list\fP does not exist for either document, when you run the Javadoc tool on the first document, the \f2package\-list\fP will not yet exist for the second document. Therefore, to create the external links, you must re\-generate the first document after generating the second document. +.br +.br +In this case, the purpose of first generating a document is to create its \f2package\-list\fP (or you can create it by hand it if you're certain of the package names). Then generate the second document with its external links. The Javadoc tool prints a warning if a needed external \f2package\-list\fP file does not exist. .TP 3 \-linkoffline\ extdocURL\ packagelistLoc -This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. -.LP -More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. -.LP -Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. -.LP +This option is a variation of \f2\-link\fP; they both create links to javadoc\-generated documentation for external referenced classes. Use the \f2\-linkoffline\fP option when linking to a document on the web when the Javadoc tool itself is "offline" \-\- that is, it cannot access the document through a web connection. +.br +.br +More specifically, use \f2\-linkoffline\fP if the external document's \f2package\-list\fP file is not accessible or does not exist at the \f2extdocURL\fP location but does exist at a different location, which can be specified by \f2packageListLoc\fP (typically local). Thus, if \f2extdocURL\fP is accessible only on the World Wide Web, \f2\-linkoffline\fP removes the constraint that the Javadoc tool have a web connection when generating the documentation. +.br +.br +Another use is as a "hack" to update docs: After you have run javadoc on a full set of packages, then you can run javadoc again on onlya smaller set of changed packages, so that the updated files can be inserted back into the original set. Examples are given below. +.br +.br The \f2\-linkoffline\fP option takes two arguments \-\- the first for the string to be embedded in the \f2<a href>\fP links, the second telling it where to find \f2package\-list\fP: .RS 3 .TP 2 @@ -4418,35 +3333,39 @@ o \f4packagelistLoc\fP is the path or URL to the directory containing the \f2package\-list\fP file for the external documentation. This can be a URL (http: or file:) or file path, and can be absolute or relative. If relative, make it relative to the \f2current\fP directory from where javadoc was run. Do not include the \f2package\-list\fP filename. .RE -.LP -You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) -.LP -\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://java.sun.com/javase/6/docs/api\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at +You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.) +.br +.br +\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at .na -\f2http://java.sun.com/javase/6/docs/api/package\-list\fP @ +\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @ .fi -http://java.sun.com/javase/6/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) +http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) .nf \f3 .fl -% \fP\f3javadoc \-linkoffline http://java.sun.com/javase/6/docs/api . com.mypackage\fP +% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP .fl .fi -.LP -\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. -.LP -\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. -.LP -\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): -.LP +\f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example. +.br +.br +\f3Manually Creating a \fP\f4package\-list\fP\f3 File\fP \- If a \f2package\-list\fP file does not yet exist, but you know what package names your document will link to, you can create your own copy of this file by hand and specify its path with \f2packagelistLoc\fP. An example would be the previous case where the package list for \f2com.spipackage\fP did not exist when \f2com.apipackage\fP was first generated. This technique is useful when you need to generate documentation that links to new external documentation whose package names you know, but which is not yet published. This is also a way of creating \f2package\-list\fP files for packages generated with Javadoc 1.0 or 1.1, where \f2package\-list\fP files were not generated. Likewise, two companies can share their unpublished \f2package\-list\fP files, enabling them to release their cross\-linked documentation simultaneously. +.br +.br +\f3Linking to Multiple Documents\fP \- You can include \f2\-linkoffline\fP once for each generated document you want to refer to (each option is shown on a separate line for clarity): +.br +.br \f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP .br \f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP .br -\f2\ \ \ \ \ \ \ \ \ \ ...\fP -.LP -\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. -.LP +\f2\ \ \ \ \ \ \ \ \ \ ...\fP +.br +.br +\f3Updating docs\fP \- Another use for \f2\-linkoffline\fP option is useful if your project has dozens or hundreds of packages, if you have already run javadoc on the entire tree, and now, in a separate run, you want to quickly make some small changes and re\-run javadoc on just a small portion of the source tree. This is somewhat of a hack in that it works properly only if your changes are only to doc comments and not to declarations. If you were to add, remove or change any declarations from the source code, then broken links could show up in the index, package tree, inherited member lists, use page, and other places. +.br +.br First, you create a new destination directory (call it \f2update\fP) for this new small run. Let us say the original destination directory was named \f2html\fP. In the simplest example, cd to the parent of \f2html\fP. Set the first argument of \f2\-linkoffline\fP to the current directory "." and set the second argument to the relative path to \f2html\fP, where it can find \f2package\-list\fP, and pass in only the package names of the packages you want to update: .nf \f3 @@ -4454,14 +3373,15 @@ % \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP .fl .fi -When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. -.LP +When the Javadoc tool is done, copy these generated class pages in \f2update/com/package\fP (not the overview or index), over the original files in \f2html/com/package\fP. .TP 3 \-linksource\ -Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. -.LP -\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. -.LP +Creates an HTML version of each source file (with line numbers) and adds links to them from the standard HTML documentation. Links are created for classes, interfaces, constructors, methods and fields whose declarations are in a source file. Otherwise, links are not created, such as for default constructors and generated classes. +.br +.br +\f3This option exposes \fP\f4all\fP\f3 private implementation details in the included source files, including private classes, private fields, and the bodies of private methods, \fP\f4regardless of the \fP\f4\-public\fP\f3, \fP\f4\-package\fP\f3, \fP\f4\-protected\fP\f3 and \fP\f4\-private\fP\f3 options.\fP Unless you also use the \f2\-private\fP option, not all private classes or interfaces will necessarily be accessible via links. +.br +.br Each link appears on the name of the identifier in its declaration. For example, the link to the source code of the \f2Button\fP class would be on the word "Button": .nf \f3 @@ -4482,7 +3402,6 @@ .fl \fP .fi -.LP .TP 3 \-group\ groupheading\ packagepattern:packagepattern:... Separates packages on the overview page into whatever groups you specify, one group per table. You specify each group with a different \f2\-group\fP option. The groups appear on the page in the order specified on the command line; packages are alphabetized within a group. For a given \f2\-group\fP option, the packages matching the list of \f2packagepattern\fP expressions appear in a table with the heading \f2groupheading\fP. @@ -4494,16 +3413,12 @@ o \f4packagepattern\fP can be any package name, or can be the start of any package name followed by an asterisk (\f2*\fP). The asterisk is a wildcard meaning "match any characters". This is the only wildcard allowed. Multiple patterns can be included in a group by separating them with colons (\f2:\fP). .RE -.RS 3 - -.LP -.LP \f3NOTE: If using an asterisk in a pattern or pattern list, the pattern list must be inside quotes, such as \fP\f4"java.lang*:java.util"\fP -.LP -.RE -.LP -If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". -.LP +.br +.br +If you do not supply any \f2\-group\fP option, all packages are placed in one group with the heading "Packages". If the all groups do not include all documented packages, any leftover packages appear in a separate group with the heading "Other Packages". +.br +.br For example, the following option separates the four documented packages into core, extension and other packages. Notice the trailing "dot" does not appear in "java.lang*" \-\- including the dot, such as "java.lang.*" would omit the java.lang package. .nf \f3 @@ -4517,7 +3432,6 @@ .fi This results in the groupings: .RS 3 -.RS 3 .TP 3 Core Packages \f2java.lang\fP @@ -4530,38 +3444,27 @@ Other Packages \f2java.new\fP .RE - -.LP -.RE -.LP .TP 3 \-nodeprecated -Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. -.LP +Prevents the generation of any deprecated API at all in the documentation. This does what \-nodeprecatedlist does, plus it does not generate any deprecated API throughout the rest of the documentation. This is useful when writing code and you don't want to be distracted by the deprecated code. .TP 3 \-nodeprecatedlist -Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. -.LP +Prevents the generation of the file containing the list of deprecated APIs (deprecated\-list.html) and the link in the navigation bar to that page. (However, javadoc continues to generate the deprecated API throughout the rest of the document.) This is useful if your source code contains no deprecated API, and you want to make the navigation bar cleaner. .TP 3 \-nosince -Omits from the generated docs the "Since" sections associated with the @since tags. -.LP +Omits from the generated docs the "Since" sections associated with the @since tags. .TP 3 \-notree -Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. -.LP +Omits the class/interface hierarchy pages from the generated docs. These are the pages you reach using the "Tree" button in the navigation bar. The hierarchy is produced by default. .TP 3 \-noindex -Omits the index from the generated docs. The index is produced by default. -.LP +Omits the index from the generated docs. The index is produced by default. .TP 3 \-nohelp -Omits the HELP link in the navigation bars at the top and bottom of each page of output. -.LP +Omits the HELP link in the navigation bars at the top and bottom of each page of output. .TP 3 \-nonavbar -Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. -.LP +Prevents the generation of the navigation bar, header and footer, otherwise found at the top and bottom of the generated pages. Has no affect on the "bottom" option. The \f2\-nonavbar\fP option is useful when you are interested only in the content and have no need for navigation, such as converting the files to PostScript or PDF for print only. .TP 3 \-helpfile\ path/filename Specifies the path of an alternate help file \f2path/filename\fP that the HELP link in the top and bottom navigation bars link to. Without this option, the Javadoc tool automatically creates a help file \f2help\-doc.html\fP that is hard\-coded in the Javadoc tool. This option enables you to override this default. The \f2filename\fP can be any name and is not restricted to \f2help\-doc.html\fP \-\- the Javadoc tool will adjust the links in the navigation bar accordingly. For example: @@ -4582,8 +3485,7 @@ .fi .TP 3 \-serialwarn -Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. -.LP +Generates compile\-time warnings for missing @serial tags. By default, Javadoc 1.2.2 (and later versions) generates no serial warnings. (This is a reversal from earlier versions.) Use this option to display the serial warnings, which helps to properly document default serializable fields and \f2writeExternal\fP methods. .TP 3 \-charset\ name Specifies the HTML character set for this document. The name should be a preferred MIME name as given in the @@ -4609,10 +3511,10 @@ .na \f2HTML standard\fP @ .fi -http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) -.LP +http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2. (4197265 and 4137321) +.br +.br Also see \-encoding and \-docencoding. -.LP .TP 3 \-docencoding\ name Specifies the encoding of the generated HTML files. The name should be a preferred MIME name as given in the @@ -4626,12 +3528,12 @@ % \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP .fl .fi -Also see \-encoding and \-charset. -.LP +Also see \-encoding and \-charset. .TP 3 \-keywords -Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) -.LP +Adds HTML meta keyword tags to the generated file for each class. These tags can help the page be found by search engines that look for meta tags. (Most search engines that search the entire Internet do not look at meta tags, because pages can misuse them; but search engines offered by companies that confine their search to their own website can benefit by looking at meta tags.) +.br +.br The meta tags include the fully qualified name of the class and the unqualified names of the fields and methods. Constructors are not included because they are identical to the class name. For example, the class String starts with these keywords: .nf \f3 @@ -4646,16 +3548,21 @@ .fl \fP .fi -.LP .TP 3 \-tag\ \ tagname:Xaoptcmf:"taghead" -Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. -.LP -The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. -.LP -The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. -.LP -\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: \f4X\fP (disable tag) +Enables the Javadoc tool to interpret a simple, one\-argument custom block tag \f2@\fP\f2tagname\fP in doc comments. So the Javadoc tool can "spell\-check" tag names, it is important to include a \f2\-tag\fP option for every custom tag that is present in the source code, disabling (with \f2X\fP) those that are not being output in the current run. +.br +.br +The colon (\f4:\fP) is always the separator. To use a colon in \f2tagname\fP, see Use of Colon in Tag Name. +.br +.br +The \f2\-tag\fP option outputs the tag's heading \f2taghead\fP in bold, followed on the next line by the text from its single argument, as shown in the example below. Like any block tag, this argument's text can contain inline tags, which are also interpreted. The output is similar to standard one\-argument tags, such as \f2@return\fP and \f2@author\fP. Omitting \f2taghead\fP causes \f2tagname\fP to appear as the heading. +.br +.br +\f3Placement of tags\fP \- The \f4Xaoptcmf\fP part of the argument determines where in the source code the tag is allowed to be placed, and whether the tag can be disabled (using \f2X\fP). You can supply either \f4a\fP, to allow the tag in all places, or any combination of the other letters: +.br +.br +\f4X\fP (disable tag) .br \f4a\fP (all) .br @@ -4670,7 +3577,8 @@ \f4m\fP (methods) .br \f4f\fP (fields) -.LP +.br +.br \f3Examples of single tags\fP \- An example of a tag option for a tag that can be used anywhere in the source code is: .nf \f3 @@ -4715,8 +3623,9 @@ .fl \fP .fi -\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. -.LP +\f3Spell\-checking tag names (Disabling tags)\fP \- Some developers put custom tags in the source code that they don't always want to output. In these cases, it is important to list all tags that are present in the source code, enabling the ones you want to output and disabling the ones you don't want to output. The presence of \f2X\fP disables the tag, while its absence enables the tag. This gives the Javadoc tool enough information to know if a tag it encounters is unknown, probably the results of a typo or a misspelling. It prints a warning in these cases. +.br +.br You can add \f2X\fP to the placement values already present, so that when you want to enable the tag, you can simply delete the \f2X\fP. For example, if @todo is a tag that you want to suppress on output, you would use: .nf \f3 @@ -4733,13 +3642,15 @@ .fl \fP .fi -.LP -The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. -.LP -\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. -.LP -If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. -.LP +The syntax \f2\-tag todo:X\fP works even if \f2@todo\fP is defined by a taglet. +.br +.br +\f3Order of tags\fP \- The order of the \f2\-tag\fP (and \f2\-taglet\fP) options determine the order the tags are output. You can mix the custom tags with the standard tags to intersperse them. The tag options for standard tags are placeholders only for determining the order \-\- they take only the standard tag's name. (Subheadings for standard tags cannot be altered.) This is illustrated in the following example. +.br +.br +If \f2\-tag\fP is missing, then the position of \f2\-taglet\fP determines its order. If they are both present, then whichever appears last on the command line determines its order. (This happens because the tags and taglets are processed in the order that they appear on the command line. For example, if \f2\-taglet\fP and \f2\-tag\fP both have the name "todo", the one that appears last on the command line will determine its order. +.br +.br \f3Example of a complete set of tags\fP \- This example inserts "To Do" after "Parameters" and before "Throws" in the output. By using "X", it also specifies that @example is a tag that might be encountered in the source code that should not be output during this run. Notice that if you use @argfile, you can put the tags on separate lines in an argument file like this (no line continuation characters needed): .nf \f3 @@ -4758,21 +3669,23 @@ .fl \fP .fi -.LP -When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. -.LP -The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. -.LP -\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Sun will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Sun. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Sun later creates a standard tag of the same name. -.LP +When javadoc parses the doc comments, any tag encountered that is neither a standard tag nor passed in with \f2\-tag\fP or \f2\-taglet\fP is considered unknown, and a warning is thrown. +.br +.br +The standard tags are initially stored internally in a list in their default order. Whenever \f2\-tag\fP options are used, those tags get appended to this list \-\- standard tags are moved from their default position. Therefore, if a \f2\-tag\fP option is omitted for a standard tag, it remains in its default position. +.br +.br +\f3Avoiding Conflicts\fP \- If you want to slice out your own namespace, you can use a dot\-separated naming convention similar to that used for packages: \f2com.mycompany.todo\fP. Oracle will continue to create standard tags whose names do not contain dots. Any tag you create will override the behavior of a tag by the same name defined by Oracle. In other words, if you create a tag or taglet \f2@todo\fP, it will always have the same behavior you define, even if Oracle later creates a standard tag of the same name. +.br +.br \f3Annotations vs. Javadoc Tags\fP \- In general, if the markup you want to add is intended to affect or produce documentation, it should probably be a javadoc tag; otherwise, it should be an annotation. See .na \f2Comparing Annotations and Javadoc Tags\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#annotations -.LP -You can also create more complex block tags, or custom inline tags with the \-taglet option. -.LP +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations< +.br +.br +You can also create more complex block tags, or custom inline tags with the \-taglet option. .TP 3 \-taglet\ \ class Specifies the class file that starts the taglet used in generating the documentation for that tag. Use the fully\-qualified name for \f2class\fP. This taglet also defines the number of text arguments that the custom tag has. The taglet accepts those arguments, processes them, and generates the output. For extensive documentation with example taglets, see: @@ -4782,13 +3695,14 @@ .na \f2Taglet Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/taglet/overview.html +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html .RE -.LP -Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. -.LP -Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. -.LP +Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes. +.br +.br +Taglets can only determine where a tag should appear and in what form. All other decisions are made by the doclet. So a taglet cannot do things such as remove a class name from the list of included classes. However, it can execute side effects, such as printing the tag's text to a file or triggering another process. +.br +.br Use the \f2\-tagletpath\fP option to specify the path to the taglet. Here is an example that inserts the "To Do" taglet after "Parameters" and ahead of "Throws" in the generated pages: .nf \f3 @@ -4809,25 +3723,21 @@ .fl \fP .fi -.LP -Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. -.LP +Alternatively, you can use the \f2\-taglet\fP option in place of its \f2\-tag\fP option, but that may be harder to read. .TP 3 \-tagletpath\ \ tagletpathlist -Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. -.LP +Specifies the search paths for finding taglet class files (.class). The \f2tagletpathlist\fP can contain multiple paths by separating them with a colon (\f2:\fP). The Javadoc tool will search in all subdirectories of the specified paths. .TP 3 \-docfilessubdirs\ -Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. -.LP +Enables deep copying of "\f2doc\-files\fP" directories. In other words, subdirectories and all contents are recursively copied to the destination. For example, the directory \f2doc\-files/example/images\fP and all its contents would now be copied. There is also an option to exclude subdirectories. .TP 3 \-excludedocfilessubdir\ \ name1:name2... -Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. -.LP +Excludes any "\f2doc\-files\fP" subdirectories with the given names. This prevents the copying of SCCS and other source\-code\-control subdirectories. .TP 3 \-noqualifier\ \ all\ | \ packagename1:packagename2:... -Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. -.LP +Omits qualifying package name from ahead of class names in output. The argument to \f2\-noqualifier\fP is either "\f2all\fP" (all package qualifiers are omitted) or a colon\-separate list of packages, with wildcards, to be removed as qualifiers. The package name is removed from places where class or interface names appear. +.br +.br The following example omits all package qualifiers: .nf \f3 @@ -4852,8 +3762,7 @@ .fl \fP .fi -Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. -.LP +Where a package qualifier would appear due to the above behavior, the name can be suitably shortened \-\- see How a name is displayed. This rule is in effect whether or not \f2\-noqualifier\fP is used. .TP 3 \-notimestamp\ Suppresses the timestamp, which is hidden in an HTML comment in the generated HTML near the top of each page. Useful when you want to run javadoc on two source bases and diff them, as it prevents timestamps from causing a diff (which would otherwise be a diff on every page). The timestamp includes the javadoc version number, and currently looks like this: @@ -4864,53 +3773,40 @@ .fl \fP .fi -.LP .TP 3 \-nocomment\ Suppress the entire comment body, including the main description and all tags, generating only declarations. This option enables re\-using source files originally intended for a different purpose, to produce skeleton HTML documentation at the early stages of a new project. +.TP 3 +\-sourcetab tabLength +Specify the number of spaces each tab takes up in the source. .RE .SH "COMMAND LINE ARGUMENT FILES" .LP - -.LP -.LP To shorten or simplify the javadoc command line, you can specify one or more files that themselves contain arguments to the \f2javadoc\fP command (except \f2\-J\fP options). This enables you to create javadoc commands of any length on any operating system. .LP -.LP An argument file can include javac options and source filenames in any combination. The arguments within a file can be space\-separated or newline\-separated. If a filename contains embedded spaces, put the whole filename in double quotes. .LP -.LP Filenames within an argument file are relative to the current directory, not the location of the argument file. Wildcards (*) are not allowed in these lists (such as for specifying \f2*.java\fP). Use of the '\f2@\fP' character to recursively interpret files is not supported. The \f2\-J\fP options are not supported because they are passed to the launcher, which does not support argument files. .LP -.LP When executing javadoc, pass in the path and name of each argument file with the '\f2@\fP' leading character. When javadoc encounters an argument beginning with the character `\f2@\fP', it expands the contents of that file into the argument list. -.LP .SS Example \- Single Arg File .LP -.LP You could use a single argument file named "\f2argfile\fP" to hold all Javadoc arguments: -.LP .nf \f3 .fl % \fP\f3javadoc @argfile\fP .fl .fi - -.LP .LP This argument file could contain the contents of both files shown in the next example. -.LP .SS Example \- Two Arg Files .LP -.LP You can create two argument files \-\- one for the Javadoc options and the other for the package names or source filenames: (Notice the following lists have no line\-continuation characters.) .LP -.LP Create a file named "\f2options\fP" containing: -.LP .nf \f3 .fl @@ -4920,13 +3816,13 @@ .fl \-splitindex .fl - \-windowtitle 'Java(TM) SE 7 API Specification' -.fl - \-doctitle 'Java(TM) SE 7 API Specification' -.fl - \-header 'Java(TM); SE 7' -.fl - \-bottom 'Copyright 1993\-2009 Sun Microsystems, Inc. All Rights Reserved.' + \-windowtitle 'Java SE 7 API Specification' +.fl + \-doctitle 'Java SE 7 API Specification' +.fl + \-header 'Java(TM) SE 7' +.fl + \-bottom 'Copyright © 1993\-2011 Oracle and/or its affiliates. All rights reserved.' .fl \-group "Core Packages" "java.*" .fl @@ -4936,11 +3832,8 @@ .fl \fP .fi - -.LP .LP Create a file named "\f2packages\fP" containing: -.LP .nf \f3 .fl @@ -4952,120 +3845,85 @@ .fl \fP .fi - -.LP .LP You would then run javadoc with: -.LP .nf \f3 .fl % \fP\f3javadoc @options @packages\fP .fl .fi - -.LP .SS Example \- Arg Files with Paths .LP -.LP The argument files can have paths, but any filenames inside the files are relative to the current working directory (not \f2path1\fP or \f2path2\fP): -.LP .nf \f3 .fl % \fP\f3javadoc @path1/options @path2/packages\fP .fl .fi - -.LP .SS Example \- Option Arguments .LP -.LP Here's an example of saving just an argument to a javadoc option in an argument file. We'll use the \f2\-bottom\fP option, since it can have a lengthy argument. You could create a file named "\f2bottom\fP" containing its text argument: -.LP .nf \f3 .fl -'<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit a -.fl -bug or feature</a> Java is a trademark or registered trademark of -.fl -Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-2000 Sun -.fl -Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl -All Rights Reserved.' + +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners. .fl \fP .fi - -.LP .LP Then run the Javadoc tool with: -.LP .nf \f3 .fl % \fP\f3javadoc \-bottom @bottom @packages\fP .fl .fi - -.LP .LP Or you could include the \f2\-bottom\fP option at the start of the argument file, and then just run it as: -.LP .nf \f3 .fl % \fP\f3javadoc @bottom @packages\fP .fl .fi - -.LP - -.LP .SH "Name" Running -.LP .SH "RUNNING JAVADOC" .LP - -.LP -.LP \f3Version Numbers\fP \- The version number of javadoc can be determined using \f3javadoc \-J\-version\fP. The version number of the standard doclet appears in its output stream. It can be turned off with \f2\-quiet\fP. .LP -.LP \f3Public programmatic interface\fP \- To invoke the Javadoc tool from within programs written in the Java language. This interface is in \f2com.sun.tools.javadoc.Main\fP (and javadoc is re\-entrant). For more details, see .na \f2Standard Doclet\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically. .LP \f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the .na \f2MIF Doclet documentation\fP @ .fi http://java.sun.com/j2se/javadoc/mifdoclet/docs/mifdoclet.html. -.LP .SH "SIMPLE EXAMPLES" .LP - -.LP -.LP You can run javadoc on entire packages or individual source files. Each package name has a corresponding directory name. In the following examples, the source files are located at \f2/home/src/java/awt/*.java\fP. The destination directory is \f2/home/html\fP. -.LP .SS Documenting One or More Packages .LP -.LP To document a package, the source files (\f2*.java\fP) for that package must be located in a directory having the same name as the package. If a package name is made up of several identifiers (separated by dots, such as \f2java.awt.color\fP), each subsequent identifier must correspond to a deeper subdirectory (such as \f2java/awt/color\fP). You may split the source files for a single package among two such directory trees located at different places, as long as \f2\-sourcepath\fP points to them both \-\- for example \f2src1/java/awt/color\fP and \f2src2/java/awt/color\fP. .LP -.LP You can run javadoc either by changing directories (with \f2cd\fP) or by using \f2\-sourcepath\fP option. The examples below illustrate both alternatives. -.LP .RS 3 .TP 2 o @@ -5108,17 +3966,12 @@ .fl .fi .RE - -.LP .LP Result: All cases generate HTML\-formatted documentation for the public and protected classes and interfaces in packages \f2java.awt\fP and \f2java.awt.event\fP and save the HTML files in the specified destination directory (\f2/home/html\fP). Because two or more packages are being generated, the document has three HTML frames \-\- for the list of packages, the list of classes, and the main class pages. -.LP .SS Documenting One or More Classes .LP -.LP The second way to run the Javadoc tool is by passing in one or more source files (\f2.java\fP). You can run javadoc either of the following two ways \-\- by changing directories (with \f2cd\fP) or by fully\-specifying the path to the \f2.java\fP files. Relative paths are relative to the current directory. The \f2\-sourcepath\fP option is ignored when passing in source files. You can use command line wildcards, such as asterisk (*), to specify groups of classes. -.LP .RS 3 .TP 2 o @@ -5155,93 +4008,76 @@ .fi This example generates HTML\-formatted documentation for the class \f2Button\fP and classes beginning with \f2Graphics\fP. .RE - -.LP .SS Documenting Both Packages and Classes .LP -.LP You can document entire packages and individual classes at the same time. Here's an example that mixes two of the previous examples. You can use \f2\-sourcepath\fP for the path to the packages but not for the path to the individual classes. -.LP .nf \f3 .fl % \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP .fl .fi - -.LP .LP This example generates HTML\-formatted documentation for the package \f2java.awt\fP and class \f2Applet\fP. (The Javadoc tool determines the package name for \f2Applet\fP from the package declaration, if any, in the \f2Applet.java\fP source file.) -.LP .SH "REAL WORLD EXAMPLE" .LP - -.LP -.LP The Javadoc tool has many useful options, some of which are more commonly used than others. Here is effectively the command we use to run the Javadoc tool on the Java platform API. We use 180MB of memory to generate the documentation for the 1500 (approx.) public and protected classes in the Java SE Platform, Standard Edition, v1.2. .LP -.LP The same example is shown twice \-\- first as executed on the command line, then as executed from a makefile. It uses absolute paths in the option arguments, which enables the same \f2javadoc\fP command to be run from any directory. -.LP .SS Command Line Example .LP -.LP -This command line example is over 900 characters, which is too long for some shells, such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. -.LP +The following example may be too long for some shells such as DOS. You can use a command line argument file (or write a shell script) to workaround this limitation. .nf \f3 .fl -% javadoc \-sourcepath /java/jdk/src/share/classes \\ -.fl - \-overview /java/jdk/src/share/classes/overview.html \\ -.fl - \-d /java/jdk/build/api \\ -.fl - \-use \\ -.fl - \-splitIndex \\ -.fl - \-windowtitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-doctitle 'Java(TM) Platform, Standard Edition 7 API Specification' \\ -.fl - \-header 'Java(TM) SE 7' \\ -.fl - \-bottom '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl -a bug or feature</a> Java is a trademark or registered trademark of Sun Microsystems, -.fl -Inc. in the US and other countries. Copyright 1993\-1999 Sun Microsystems, Inc. -.fl -901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All Rights Reserved.' \\ +% javadoc \-sourcepath /java/jdk/src/share/classes \\ +.fl + \-overview /java/jdk/src/share/classes/overview.html \\ +.fl + \-d /java/jdk/build/api \\ +.fl + \-use \\ +.fl + \-splitIndex \\ +.fl + \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\ +.fl + \-header 'Java(TM) SE 7' \\ +.fl + \-bottom ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' \\ .fl \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\ .fl - \-group "Extension Packages" "javax.*" \\ -.fl - \-J\-Xmx180m \\ + \-group "Extension Packages" "javax.*" \\ +.fl + \-J\-Xmx180m \\ .fl @packages .fl \fP .fi - -.LP .LP where \f2packages\fP is the name of a file containing the packages to process, such as \f2java.applet java.lang\fP. None of the options should contain any newline characters between the single quotes. (For example, if you copy and paste this example, delete the newline characters from the \f2\-bottom\fP option.) See the other notes listed below. -.LP .SS Makefile Example .LP -.LP This is an example of a GNU makefile. For an example of a Windows makefile, see .na \f2creating a makefile for Windows\fP @ .fi http://java.sun.com/j2se/javadoc/faq/index.html#makefiles. -.LP .nf \f3 .fl @@ -5283,15 +4119,15 @@ .fl HEADER = 'Java(TM) SE 7' .fl -BOTTOM = '<a href="http://java.sun.com/cgi\-bin/bugreport.cgi">Submit -.fl - a bug or feature</a> Java is a trademark or registered trademark -.fl - of Sun Microsystems, Inc. in the US and other countries. Copyright 1993\-1999 -.fl - Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. -.fl - All Rights Reserved.' +BOTTOM = ' +.fl + <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a> +.fl + Copyright © 1993, 2011, Oracle and/or its affiliates. All rights reserved. +.fl + Oracle is a registered trademark of Oracle Corporation and/or its affiliates. +.fl + Other names may be trademarks of their respective owners.' .fl GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"' .fl @@ -5301,14 +4137,10 @@ .fl \fP .fi - -.LP .LP Single quotes are used to surround makefile arguments. .LP -.LP \f3NOTES\fP -.LP .RS 3 .TP 2 o @@ -5320,15 +4152,9 @@ o Other important options you might want to use but not needed in this example are \-\f2classpath\fP and \-\f2link\fP. .RE - -.LP .SH "TROUBLESHOOTING" -.LP - -.LP .SS General Troubleshooting -.LP .RS 3 .TP 2 o @@ -5347,37 +4173,23 @@ o \f3Documents only legal classes\fP \- When documenting a package, javadoc only reads files whose names are composed of legal class names. You can prevent javadoc from parsing a file by including, for example, a hyphen "\-" in its filename. .RE - -.LP .SS Errors and Warnings .LP -.LP Error and warning messages contain the filename and line number to the declaration line rather than to the particular line in the doc comment. -.LP .RS 3 .TP 2 o \f2"error: cannot read: Class1.java"\fP the Javadoc tool is trying to load the class Class1.java in the current directory. The class name is shown with its path (absolute or relative), which in this case is the same as \f2./Class1.java\fP. .RE - -.LP .SH "ENVIRONMENT" -.LP - -.LP .RS 3 .TP 3 CLASSPATH Environment variable that provides the path which javadoc uses to find user class files. This environment variable is overridden by the \f2\-classpath\fP option. Separate directories with a colon, for example: .:/home/classes:/usr/local/java/classes .RE - -.LP .SH "SEE ALSO" -.LP - -.LP .RS 3 .TP 2 o @@ -5399,75 +4211,24 @@ .na \f2Javadoc Home Page\fP @ .fi -http://java.sun.com/j2se/javadoc/index.jsp +http://www.oracle.com/technetwork/java/javase/documentation/index\-jsp\-135444.html .TP 2 o .na \f2How to Write Doc Comments for Javadoc\fP @ .fi -http://java.sun.com/j2se/javadoc/writingdoccomments/index.html +http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html .TP 2 o .na \f2Setting the Class Path\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#general +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general .TP 2 o .na \f2How Javac and Javadoc Find Classes\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) +http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) .RE - -.LP -.LP -.TS -.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 -.de 35 -.ps \n(.s -.vs \n(.vu -.in \n(.iu -.if \n(.u .fi -.if \n(.j .ad -.if \n(.j=0 .na -.. -.nf -.nr #~ 0 -.if n .nr #~ 0.6n -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.fc -.nr 33 \n(.s -.rm 80 -.nr 80 0 -.80 -.rm 80 -.nr 38 1n -.nr 79 0 -.nr 40 \n(79+(0*\n(38) -.nr 80 +\n(40 -.nr TW \n(80 -.if t .if \n(TW>\n(.li .tm Table at line 3869 file Input is too wide - \n(TW units -.fc -.nr #T 0-1 -.nr #a 0-1 -.eo -.de T# -.ds #d .d -.if \(ts\n(.z\(ts\(ts .ds #d nl -.mk ## -.nr ## -1v -.ls 1 -.ls -.. -.ec -.fc -.nr T. 1 -.T# 1 -.35 -.TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-3 - -.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javah.1 --- a/jdk/src/solaris/doc/sun/man/man1/javah.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javah.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,38 +19,28 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javah 1 "02 Jun 2010" +.TH javah 1 "10 May 2011" .LP .SH "Name" javah \- C Header and Stub File Generator .LP -.RS 3 - -.LP .LP \f3javah\fP produces C header files and C source files from a Java class. These files provide the connective glue that allow your Java and C code to interact. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . .fl -javah_g [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . . -.fl \fP .fi .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3javah\fP generates C header and source files that are needed to implement native methods. The generated header and source files are used by C programs to reference an object's instance variables from native source code. The .h file contains a struct definition whose layout parallels the layout of the corresponding class. The fields in the struct correspond to instance variables in the class. .LP @@ -63,13 +53,8 @@ .LP The new native method interface, Java Native Interface (JNI), does not require header information or stub files. \f3javah\fP can still be used to generate native method function proptotypes needed for JNI\-style native methods. \f3javah\fP produces JNI\-style output by default, and places the result in the .h file. .LP -.LP -\f3javah_g\fP is a non\-optimized version of \f3javah\fP suitable for use with debuggers like jdb(1). -.LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-o outputfile @@ -110,11 +95,10 @@ .fl \fP .fi -.LP As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations). .br .br -For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. +For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java 2 platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -132,8 +116,6 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH @@ -150,8 +132,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javap(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javap.1 --- a/jdk/src/solaris/doc/sun/man/man1/javap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1994, 2011, 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 @@ -19,27 +19,21 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javap 1 "02 Jun 2010" +.TH javap 1 "10 May 2011" .LP .SH "Name" javap \- The Java Class File Disassembler .LP -.RS 3 - -.LP .LP Disassembles class files. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl -javap [ \fP\f3options\fP\f3 ] class. . . +javap [ \fP\f3options\fP\f3 ] classes .fl \fP .fi @@ -47,13 +41,21 @@ .LP .SH "DESCRIPTION" .LP +.LP +The \f3javap\fP command disassembles one or more class files. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. +.LP +.RS 3 +.TP 3 +options +Command\-line options. +.TP 3 +classes +List of one or more classes (separated by spaces) to be processed for annotations (such as \f2DocFooter.class\fP). You may specify a class that can be found in the class path, by its file name (for example, \f2/home/user/myproject/src/DocFooter.class\fP), or with a URL (for example, \f2file:///home/user/myproject/src/DocFooter.class\fP). +.RE .LP .LP -The \f3javap\fP command disassembles a class file. Its output depends on the options used. If no options are used, \f3javap\fP prints out the package, protected, and public fields and methods of the classes passed to it. \f3javap\fP prints its output to stdout. For example, compile the following class declaration: -.LP -.RS 3 - +For example, compile the following class declaration: .LP .nf \f3 @@ -96,166 +98,160 @@ .fl \fP .fi -.RE .LP .LP -The output from \f3javap DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; + java.lang.String date; .fl - java.lang.String email; + java.lang.String email; .fl - public DocFooter(); + public DocFooter(); .fl - public void init(); + public void init(); .fl - public void paint(java.awt.Graphics); + public void paint(java.awt.Graphics); .fl } .fl \fP .fi -.RE .LP .LP -The output from \f3javap \-c DocFooter\fP yields: -.LP -.RS 3 - +The output from \f3javap \-c DocFooter.class\fP yields: .LP .nf \f3 .fl -Compiled from DocFooter.java +Compiled from "DocFooter.java" .fl public class DocFooter extends java.applet.Applet { .fl - java.lang.String date; -.fl - java.lang.String email; -.fl - public DocFooter(); + java.lang.String date; .fl - public void init(); + .fl - public void paint(java.awt.Graphics); -.fl -} + java.lang.String email; .fl .fl -Method DocFooter() + public DocFooter(); .fl - 0 aload_0 + Code: .fl - 1 invokespecial #1 <Method java.applet.Applet()> + 0: aload_0 .fl - 4 return + 1: invokespecial #1 // Method java/applet/Applet."<init>":()V +.fl + 4: return .fl .fl -Method void init() + public void init(); .fl - 0 aload_0 + Code: .fl - 1 sipush 500 + 0: aload_0 .fl - 4 bipush 100 + 1: sipush 500 .fl - 6 invokevirtual #2 <Method void resize(int, int)> + 4: bipush 100 .fl - 9 aload_0 + 6: invokevirtual #2 // Method resize:(II)V .fl - 10 aload_0 + 9: aload_0 .fl - 11 ldc #3 <String "LAST_UPDATED"> + 10: aload_0 .fl - 13 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 11: ldc #3 // String LAST_UPDATED .fl - 16 putfield #5 <Field java.lang.String date> + 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 19 aload_0 + 16: putfield #5 // Field date:Ljava/lang/String; .fl - 20 aload_0 + 19: aload_0 .fl - 21 ldc #6 <String "EMAIL"> + 20: aload_0 .fl - 23 invokevirtual #4 <Method java.lang.String getParameter(java.lang.String)> + 21: ldc #6 // String EMAIL .fl - 26 putfield #7 <Field java.lang.String email> + 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String; .fl - 29 return + 26: putfield #7 // Field email:Ljava/lang/String; +.fl + 29: return .fl .fl -Method void paint(java.awt.Graphics) + public void paint(java.awt.Graphics); .fl - 0 aload_1 + Code: .fl - 1 new #8 <Class java.lang.StringBuffer> + 0: aload_1 .fl - 4 dup + 1: new #8 // class java/lang/StringBuilder .fl - 5 invokespecial #9 <Method java.lang.StringBuffer()> + 4: dup .fl - 8 aload_0 + 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V .fl - 9 getfield #5 <Field java.lang.String date> + 8: aload_0 +.fl + 9: getfield #5 // Field date:Ljava/lang/String; .fl - 12 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 12: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 15 ldc #11 <String " by "> + 15: ldc #11 // String by .fl - 17 invokevirtual #10 <Method java.lang.StringBuffer append(java.lang.String)> + 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder; .fl - 20 invokevirtual #12 <Method java.lang.String toString()> + 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String; .fl - 23 bipush 100 + 23: bipush 100 +.fl + 25: bipush 15 .fl - 25 bipush 15 + 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 27 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 30: aload_1 .fl - 30 aload_1 + 31: aload_0 .fl - 31 aload_0 + 32: getfield #7 // Field email:Ljava/lang/String; .fl - 32 getfield #7 <Field java.lang.String email> + 35: sipush 290 .fl - 35 sipush 290 + 38: bipush 15 .fl - 38 bipush 15 + 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V .fl - 40 invokevirtual #13 <Method void drawString(java.lang.String, int, int)> + 43: return .fl - 43 return +} .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 -\-help +\-help \-\-help \-? Prints out help message for \f3javap\fP. .TP 3 +\-version +Prints out version information. +.TP 3 \-l Prints out line and local variable tables. .TP 3 @@ -268,14 +264,11 @@ \-package Shows only package, protected, and public classes and members. This is the default. .TP 3 -\-private +\-private \-p Shows all classes and members. .TP 3 \-Jflag Pass \f2flag\fP directly to the runtime system. Some examples: -.RS 3 - -.LP .nf \f3 .fl @@ -285,11 +278,16 @@ .fl \fP .fi -.RE .TP 3 \-s Prints internal type signatures. .TP 3 +\-sysinfo +Shows system information (path, size, date, MD5 hash) of the class being processed. +.TP 3 +\-constants +Shows static final constants. +.TP 3 \-c Prints out disassembled code, i.e., the instructions that comprise the Java bytecodes, for each of the methods in the class. These are documented in the .na @@ -301,22 +299,7 @@ Prints stack size, number of \f2locals\fP and \f2args\fP for methods. .TP 3 \-classpath path -Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.nf -\f3 -.fl - .:<your_path> -.fl -\fP -.fi -For example: -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi +Specifies the path \f3javap\fP uses to look up classes. Overrides the default or the CLASSPATH environment variable if it is set. .TP 3 \-bootclasspath path Specifies path from which to load bootstrap classes. By default, the bootstrap classes are the classes implementing the core Java platform located in \f2jre/lib/rt.jar\fP and several other jar files. @@ -326,32 +309,8 @@ .RE .LP -.SH "ENVIRONMENT VARIABLES" -.LP - -.LP -.RS 3 -.TP 3 -CLASSPATH -Used to provide the system a path to user\-defined classes. Directories are separated by colons, for example, For example: -.RS 3 - -.LP -.nf -\f3 -.fl -.:/home/avh/classes:/usr/local/java/classes -.fl -\fP -.fi -.RE -.RE - -.LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), jdb(1), javah(1), javadoc(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/javaws.1 --- a/jdk/src/solaris/doc/sun/man/man1/javaws.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/javaws.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2003, 2011, 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 @@ -19,30 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH javaws 1 "02 Jun 2010" +.TH javaws 1 "10 May 2011" .LP .SH "Name" \f2javaws\fP Command Line .LP -.LP -\ -.LP -.SS -NAME -.LP -.RS 3 - +.SH "NAME" .LP .LP \f2javaws\fP \- Java Web Start launcher command .LP -.RE -.SS -SYNOPSIS -.LP -.RS 3 - +.SH "SYNOPSIS" .LP .LP \f2javaws [run\-options] <jnlp>\fP @@ -50,49 +38,27 @@ .LP \f2javaws [control\-options]\fP .LP -.RE -.SS -PARAMETERS -.LP -.RS 3 - +.SH "PARAMETERS" .LP .LP \f2[run\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below. .LP -.RE .LP \f2<jnlp>\fP .LP -.RS 3 - -.LP .LP This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file. .LP -.RE .LP \f2[control\-options]\fP .LP -.RS 3 - -.LP .LP Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below. .LP -.RE -.RE -.SS -DESCRIPTION -.LP -.RS 3 - +.SH "DESCRIPTION" .LP .LP The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network. @@ -103,256 +69,154 @@ .LP The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release. .LP -.RE -.SS -RUN\-OPTIONS -.LP -.RS 3 - +.SH "RUN\-OPTIONS" .LP .LP \f2\-offline\fP .LP -.RS 3 - -.LP .LP -run Java Web Start in offline mode. +Run Java Web Start in offline mode. .LP -.RE .LP \f2\-Xnosplash\fP .LP -.RS 3 - +.LP +Do not display the initial splash screen. .LP .LP -disable the display of the initial splash screen. -.LP -.RE -.LP \f2\-open <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP. .LP -.RE .LP \f2\-print <arguments>\fP .LP -.RS 3 - -.LP .LP If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP. .LP -.RE .LP \f2\-online\fP .LP -.RS 3 - -.LP .LP -run in online mode (default behavior). +Use online mode (default behavior). .LP -.RE .LP \f2\-wait\fP .LP -.RS 3 - -.LP .LP -If specified, the \f2javaws\fP process will not exit until the application exits. +If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms. .LP -.RE .LP \f2\-verbose\fP .LP -.RS 3 - -.LP .LP -display additional output. +Display additional output. .LP -.RE .LP \f2\-J<option>\fP .LP -.RS 3 - -.LP .LP -supply options to the vm. +Supply options to the VM. .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP -.LP -run the application from the system cache only. .LP -.RE -.RE -.SS -CONTROL\-OPTIONS +Run the application from the system cache only. .LP -.RS 3 - +.SH "CONTROL\-OPTIONS" .LP .LP \f2\-viewer\fP .LP -.RS 3 - +.LP +Show the Cache Viewer in the Java Control Panel. .LP .LP -show the Cache Viewer in the java control panel +\f2\-clearcache\fP +.LP .LP -.RE +Remove all non\-installed applications from the cache. +.LP .LP \f2\-userConfig <property name>\fP .LP -.RS 3 - -.LP .LP -clear the specified deployment property. +Clear the specified deployment property. .LP -.RE .LP \f2\-userConfig <property name> <property value>\fP .LP -.RS 3 - -.LP .LP -set the specified deployment property to the specified value. +Set the specified deployment property to the specified value. .LP -.RE .LP \f2\-uninstall\fP .LP -.RS 3 - -.LP .LP -remove all applications from the cache. +Remove all applications from the cache. .LP -.RE .LP \f2\-uninstall <jnlp>\fP .LP -.RS 3 - -.LP .LP -remove the application from the cache. +Remove the application from the cache. .LP -.RE .LP \f2\-import [import\-options] <jnlp>\fP .LP -.RS 3 - -.LP .LP -import the application to the cache. +Import the application to the cache. .LP -.RE -\f3IMPORT\-OPTIONS\fP +.SH "IMPORT\-OPTIONS" .LP .LP \f2\-silent\fP .LP -.RS 3 - -.LP .LP -import silently (with no user interface). +Import silently (with no user interface). .LP -.RE .LP \f2\-system\fP .LP -.RS 3 - -.LP .LP -import application to the system cache. +Import application to the system cache. .LP -.RE .LP \f2\-codebase <url>\fP .LP -.RS 3 - -.LP .LP -retrieve resources from the given codebase. +Retrieve resources from the given codebase. .LP -.RE .LP \f2\-shortcut\fP .LP -.RS 3 - -.LP .LP -install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. +Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE .LP \f2\-association\fP .LP -.RS 3 - -.LP -.LP -install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RE -.RE -.SS -FILES +Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used. .LP -.RS 3 - +.SH "FILES" .LP .LP For information about the user and system cache and deployment.properties files, see .na \f2System\- and User\-Level Properties\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html. +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html. .LP -.RE -.SS -MORE INFORMATION -.LP -.RS 3 - +.SH "MORE INFORMATION" .LP .LP For more information about Java Web Start, see .na \f2Java Web Start\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html. -.LP -.RS 3 - -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html. .LP -\ -.LP -.RE -.RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jconsole.1 --- a/jdk/src/solaris/doc/sun/man/man1/jconsole.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jconsole.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jconsole 1 "02 Jun 2010" +.TH jconsole 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,41 +39,40 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 connection = pid | host:port | jmxUrl .RS 3 -\f2pid\fP\ \ \ Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See +.TP 2 +o +\f2pid\fP Process ID of a local Java VM. The Java VM must be running with the same user ID as the user ID running jconsole. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2host\fP:\f2port\fP\ \ Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See .na \f2JMX Monitoring and Management\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html for details. -.br -\f2jmxUrl\fP\ \ Address of the JMX agent to be connected to as described in +http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. +.TP 2 +o +\f2jmxUrl\fP Address of the JMX agent to be connected to as described in .na \f2JMXServiceURL\fP @ .fi -http://java.sun.com/javase/6/docs/api/javax/management/remote/JMXServiceURL.html. +http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. .RE .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jconsole\fP command launches a graphical console tool that enables you to monitor and manage Java applications and virtual machines on a local or remote machine. .LP @@ -84,17 +81,15 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-interval=n Set the update interval to \f2n\fP seconds (default is 4 seconds). .TP 3 -\-notile\ +\-notile Do not tile windows initially (for two or more connections). .TP 3 -\-pluginpath\ plugins +\-pluginpath plugins Specify a list of directories or JAR files which are searched for JConsole plugins. The \f2plugins\fP path should contain a provider\-configuration file named: .br .nf @@ -104,20 +99,19 @@ .fl \fP .fi -.LP containing one line for each plugin specifying the fully qualified class name of the class implementing the .na \f2com.sun.tools.jconsole.JConsolePlugin\fP @ .fi -http://java.sun.com/javase/6/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. +http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. .TP 3 -\-version\ +\-version Output version information and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jconsole is run. .RE @@ -130,13 +124,13 @@ .na \f2Using JConsole\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html .TP 2 o .na \f2Monitoring and Management for Java Platform\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/management/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jdb.1 --- a/jdk/src/solaris/doc/sun/man/man1/jdb.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jdb.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1995, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jdb 1 "02 Jun 2010" +.TH jdb 1 "10 May 2011" .LP .SH "Name" jdb \- The Java Debugger .LP -.RS 3 - -.LP .LP \f3jdb\fP helps you find and fix bugs in Java language programs. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified below. @@ -60,24 +51,18 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The Java Debugger, \f3jdb\fP, is a simple command\-line debugger for Java classes. It is a demonstration of the .na \f2Java Platform Debugger Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine. .LP .SS Starting a jdb Session .LP -.RS 3 - -.LP .LP There are many ways to start a jdb session. The most frequently used way is to have \f3jdb\fP launch a new Java Virtual Machine (VM) with the main class of the application to be debugged. This is done by substituting the command \f3jdb\fP for \f3java\fP in the command line. For example, if your application's main class is MyClass, you use the following command to debug it under JDB: .LP @@ -137,7 +122,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the .na \f21.4.2 documentation\fP @ .fi @@ -150,9 +135,6 @@ The following is a list of the basic \f3jdb\fP commands. The Java debugger supports other commands which you can list using \f3jdb\fP's \f2help\fP command. .LP .RS 3 - -.LP -.RS 3 .TP 3 help, or ? The most important \f3jdb\fP command, \f2help\fP displays the list of recognized commands with a brief description. @@ -164,10 +146,12 @@ Continues execution of the debugged application after a breakpoint, exception, or step. .TP 3 print -Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. -.LP -\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. -.LP +Displays Java objects and primitive values. For variables or fields of primitive types, the actual value is printed. For objects, a short description is printed. See the \f2dump\fP command below for getting more information about an object. +.br +.br +\f2NOTE: To display local variables, the containing class must have been compiled with the \fP\f2javac(1)\fP\f2 \fP\f2\-g\fP option. +.br +.br \f2print\fP supports many simple Java expressions including those with method invocations, for example: .RS 3 .TP 2 @@ -188,15 +172,13 @@ .RE .TP 3 dump -For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. -.LP -The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. +For primitive values, this command is identical to \f2print\fP. For objects, it prints the current value of each field defined in the object. Static and instance fields are included. +.br +.br +The \f2dump\fP command supports the same set of expressions as the \f2print\fP command. .TP 3 threads List the threads that are currently running. For each thread, its name and current status are printed, as well as an index that can be used for other commands, for example: -.RS 3 - -.LP .nf \f3 .fl @@ -204,26 +186,22 @@ .fl \fP .fi -.RE In this example, the thread index is 4, the thread is an instance of java.lang.Thread, the thread name is "main", and it is currently running, .TP 3 thread Select a thread to be the current thread. Many \f3jdb\fP commands are based on the setting of the current thread. The thread is specified with the thread index described in the \f2threads\fP command above. .TP 3 where -\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. -.LP -If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. +\f2where\fP with no arguments dumps the stack of the current thread. \f2where all\fP dumps the stack of all threads in the current thread group. \f2where\fP \f2threadindex\fP dumps the stack of the specified thread. +.br +.br +If the current thread is suspended (either through an event such as a breakpoint or through the \f2suspend\fP command), local variables and fields can be displayed with the \f2print\fP and \f2dump\fP commands. The \f2up\fP and \f2down\fP commands select which stack frame is current. .RE .LP -.RE .SS Breakpoints .LP -.RS 3 - -.LP .LP Breakpoints can be set in \f3jdb\fP at line numbers or at the first instruction of a method, for example: .LP @@ -249,23 +227,15 @@ .LP The \f2clear\fP command removes breakpoints using a syntax as in "\f2clear\ MyClass:45\fP". Using the \f2clear\fP or command with no argument displays a list of all breakpoints currently set. The \f2cont\fP command continues execution. .LP -.RE .SS Stepping .LP -.RS 3 - -.LP .LP The \f2step\fP commands advances execution to the next line whether it is in the current stack frame or a called method. The \f2next\fP command advances execution to the next line in the current stack frame. .LP -.RE .SS Exceptions .LP -.RS 3 - -.LP .LP When an exception occurs for which there isn't a catch statement anywhere in the throwing thread's call stack, the VM normally prints an exception trace and exits. When running under \f3jdb\fP, however, control returns to \f3jdb\fP at the offending throw. You can then use \f3jdb\fP to diagnose the cause of the exception. .LP @@ -278,12 +248,8 @@ .LP \f2NOTE: The \fP\f2ignore\fP command does not cause the debugged VM to ignore specific exceptions, only the debugger. .LP -.RE -.RE .SH "Command Line Options" .LP - -.LP .LP When you use \f3jdb\fP in place of the Java application launcher on the command line, \f3jdb\fP accepts many of the same options as the java command, including \f2\-D\fP, \f2\-classpath\fP, and \f2\-X<option>\fP. .LP @@ -335,7 +301,7 @@ .na \f2documentation\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html on these connection alternatives. +http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives. .LP .SS Options Forwarded to Debuggee Process @@ -358,8 +324,6 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP javac(1), java(1), javah(1), javap(1), javadoc(1). .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jhat.1 --- a/jdk/src/solaris/doc/sun/man/man1/jhat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jhat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jhat 1 "02 Jun 2010" +.TH jhat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,17 +39,17 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options Options, if used, should follow immediately after the command name. -.br .TP 3 heap\-dump\-file Java binary heap dump file to be browsed. For a dump file that contains multiple heap dumps, you may specify which dump in the file by appending "#<number> to the file name, i.e. "foo.hprof#3". -.SH "DESCRIPTION" +.RE + +.LP +.SH "DESCRIPTION" .LP .LP The \f3jhat\fP command parses a java heap dump file and launches a webserver. jhat enables you to browse heap dumps using your favorite webbrowser. jhat supports pre\-designed queries (such as 'show all instances of a known class "Foo"') as well as \f3OQL\fP (\f3O\fPbject \f3Q\fPuery \f3L\fPanguage) \- a SQL\-like query language to query heap dumps. Help on OQL is available from the OQL help page shown by jhat. With the default port, OQL help is available at http://localhost:7000/oqlhelp/ @@ -69,7 +67,7 @@ .na \f2HotSpotDiagnosticMXBean\fP @ .fi -http://java.sun.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; +http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; .TP 2 o Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option; @@ -86,7 +84,8 @@ .LP \f3NOTE:\fP This tool is \f3experimental\fP and may \f3not\fP be available in future versions of the JDK. .LP -.SH "OPTIONS" +.SH "OPTIONS" +.LP .RS 3 .TP 3 \-stack false/true @@ -107,21 +106,22 @@ \-debug int Set debug level for this tool. 0 means no debug output. Set higher values for more verbose modes. .TP 3 -\-version\ +\-version Report version number and exit. .TP 3 -\-h\ +\-h Output help message and exit. .TP 3 -\-help\ +\-help Output help message and exit. .TP 3 -\-J<flag>\ +\-J<flag> Pass <flag> to the Java virtual machine on which jhat is run. For example, \-J\-Xmx512m to use a maximum heap size of 512MB. .RE .LP -.SH "SEE ALSO" +.SH "SEE ALSO" +.LP .RS 3 .TP 2 o @@ -136,5 +136,6 @@ .fi http://java.sun.com/developer/technicalArticles/Programming/HPROF.html .RE -.RE + +.LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jinfo.1 --- a/jdk/src/solaris/doc/sun/man/man1/jinfo.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jinfo.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jinfo 1 "02 Jun 2010" +.TH jinfo 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,54 +41,55 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option Options are mutually exclusive. Option, if used, should follow immediately after the command name. +.RE + +.LP .RS 3 .TP 3 pid process id for which the configuration info is to be printed. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. .RE + +.LP .RS 3 .TP 3 executable Java executable from which the core dump was produced. .RE + +.LP .RS 3 .TP 3 core core file for which the configuration info is to be printed. .RE + +.LP .RS 3 .TP 3 remote\-hostname\-or\-IP remote debug server's (see jsadebugd(1)) hostname or IP address. .RE + +.LP .RS 3 .TP 3 server\-id optional unique id, if multiple debug servers are running on the same remote host. .RE -.RE .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jinfo\fP prints Java configuration information for a given Java process or core file or a remote debug server. Configuration information includes Java System properties and Java virtual machine command line flags. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br - +jinfo \-J\-d64 \-sysprops pid .LP -.RS 3 - -.LP -jinfo \-J\-d64 \-sysprops pid -.RE .LP \f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' need to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP .LP @@ -99,8 +98,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jmap.1 --- a/jdk/src/solaris/doc/sun/man/man1/jmap.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jmap.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jmap 1 "02 Jun 2010" +.TH jmap 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -43,8 +41,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 option @@ -74,14 +70,9 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jmap\fP prints shared object memory maps or heap memory details of a given process or core file or a remote debug server. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .LP -.RS 3 - -.LP .nf \f3 .fl @@ -89,10 +80,11 @@ .fl \fP .fi -.RE .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP +\f3NOTE: This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +.LP .LP \f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP @@ -101,12 +93,10 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 <no option> -When no option is used \f3jmap\fP prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. +When no option is used jmap prints shared object mappings. For each shared object loaded in the target VM, start address, the size of the mapping, and the full path of the shared object file are printed. This is similar to the Solaris \f3pmap\fP utility. .br .TP 3 \-dump:[live,]format=b,file=<filename> diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jps.1 --- a/jdk/src/solaris/doc/sun/man/man1/jps.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jps.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jps 1 "02 Jun 2010" +.TH jps 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,8 +39,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -55,8 +51,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jps\fP tool lists the instrumented HotSpot Java Virtual Machines (JVMs) on the target system. The tool is limited to reporting information on JVMs for which it has the access permissions. .LP @@ -77,8 +71,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jps\fP command supports a number of options that modify the output of the command. These options are subject to change or removal in the future. .LP @@ -107,9 +99,6 @@ .SS HOST IDENTIFIER .LP -.RS 3 - -.LP .LP The host identifier, or \f2hostid\fP is a string that indicates the target system. The syntax of the \f2hostid\fP string largely corresponds to the syntax of a URI: .LP @@ -140,11 +129,8 @@ .RE .LP -.RE .SH "OUTPUT FORMAT" .LP - -.LP .LP The output of the \f3jps\fP command follows the following pattern: .LP @@ -169,8 +155,6 @@ .LP .SH "EXAMPLES" .LP - -.LP .LP This section provides examples of the \f3jps\fP command. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jrunscript.1 --- a/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jrunscript.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2006, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jrunscript 1 "02 Jun 2010" +.TH jrunscript 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jrunscript\fP is a command line script shell. jrunscript supports both an interactive (read\-eval\-print) mode and a batch (\-f option) mode of script execution. This is a scripting language independent shell. By default, JavaScript is the language used, but the \-l option can be used to specify a different language. Through Java to scripting language communication, jrunscript supports "exploratory programming" style. .LP @@ -63,8 +57,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath path @@ -112,10 +104,8 @@ .LP .SH "EXAMPLES" .LP -\f3Executing inline scripts\fP -.LP -.RS 3 - +.SS +Executing inline scripts .LP .nf \f3 @@ -126,13 +116,10 @@ .fl \fP .fi -.RE .LP -\f3Use specified language and evaluate given script file\fP -.LP -.RS 3 - +.SS +Use specified language and evaluate given script file .LP .nf \f3 @@ -141,42 +128,42 @@ .fl \fP .fi -.RE .LP -\f3Interactive mode\fP -.LP -.RS 3 - +.SS +Interactive mode .LP .nf \f3 .fl jrunscript .fl -js>print('hello world'); +js> print('Hello World\\n'); +.fl +Hello World .fl -hello world +js> 34 + 55 .fl -js>34 + 55 +89.0 .fl -89 +js> t = new java.lang.Thread(function() { print('Hello World\\n'); }) +.fl +Thread[Thread\-0,5,main] .fl -js> thread(function() { print('hello world'); } +js> t.start() .fl -hello world +js> Hello World +.fl + .fl js> .fl \fP .fi -.RE .LP -\f3Run script file with script arguments\fP -.LP -.RS 3 - +.SS +Run script file with script arguments .LP .nf \f3 @@ -185,13 +172,16 @@ .fl \fP .fi -.RE .LP test.js is script file to execute and arg1, arg2 and arg3 are passed to script as script arguments. Script can access these using "arguments" array. .SH "SEE ALSO" .LP .LP -If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in jsdocs. +If JavaScript is used, then before evaluating any user defined script, jrunscript initializes certain built\-in functions and objects. These JavaScript built\-ins are documented in +.na +\f2jsdocs\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 --- a/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jsadebugd 1 "02 Jun 2010" +.TH jsadebugd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -41,35 +39,16 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 pid process id of the process to which the debug server should attach. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) may be used. At most one instance of the debug server may be attached to a single process. -.RE - -.LP -.RS 3 .TP 3 executable -.RE - -.LP -.RS 3 -.TP 3 Java executable from which the core dump was produced -.RE - -.LP -.RS 3 .TP 3 core Core file to which the debug server should attach. -.RE - -.LP -.RS 3 .TP 3 server\-id Optional unique id, needed if multiple debug servers are started on the same machine. This ID must be used by remote clients to identify the particular debug server to attach. Within a single machine, this ID must be unique. @@ -78,17 +57,12 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jsadebugd\fP attaches to a Java process or core file and acts as a debug server. Remote clients such as jstack(1), jmap(1), and jinfo(1) can attach to the server using Java Remote Method Invocation (RMI). Before starting \f2jsadebugd\fP, .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi must be started with: -.LP -.RS 3 - +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with: .LP .nf \f3 @@ -97,17 +71,16 @@ .fl \fP .fi -.RE .LP .LP where \f2$JAVA_HOME\fP is the JDK installation directory. If rmiregistry was not started, jsadebugd will start an rmiregistry in a standard (1099) port internally. Debug server may be stopped by sending SIGINT (pressing Ctrl\-C) to it. .LP .LP -\f3NOTE \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \fP\f4PATH\fP\f3 environment variable should contain the location of \fP\f4jvm.dll\fP\f3 used by the target process or the location from which the Crash Dump file was produced.\fP +\f3NOTE\fP \- This utility is unsupported and may or may not be available in future versions of the JDK. In Windows Systems where dbgeng.dll is not present, 'Debugging Tools For Windows' needs to be installed to have these tools working. Also, \f2PATH\fP environment variable should contain the location of \f2jvm.dll\fP used by the target process or the location from which the Crash Dump file was produced. .LP .LP -\f3For example, \fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP +For example, \f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP .LP .SH "SEE ALSO" .LP @@ -129,7 +102,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jstack.1 --- a/jdk/src/solaris/doc/sun/man/man1/jstack.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jstack.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstack 1 "02 Jun 2010" +.TH jstack 1 "10 May 2011" .LP .SH "Name" @@ -29,8 +29,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,8 +43,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .LP Options are mutually exclusive. Option, if used, should follow immediately after the command name. See OPTIONS. .LP @@ -78,16 +74,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP \f3jstack\fP prints Java stack traces of Java threads for a given Java process or core file or a remote debug server. For each Java frame, the full class name, method name, 'bci' (byte code index) and line number, if available, are printed. With the \-m option, jstack prints both Java and native frames of all threads along with the 'pc' (program counter). For each native frame, the closest native symbol to 'pc', if available, is printed. C++ mangled names are not demangled. To demangle C++ names, the output of this command may be piped to \f3c++filt\fP. If the given process is running on a 64\-bit VM, you may need to specify the \f2\-J\-d64\fP option, e.g.: .br .LP -.RS 3 - -.LP .nf \f3 .fl @@ -95,7 +86,6 @@ .fl \fP .fi -.RE .LP .LP @@ -106,8 +96,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-F @@ -118,7 +106,7 @@ .na \f2ownable synchronizers\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. +http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. .TP 3 \-m prints mixed mode (both Java and native C/C++ frames) stack trace. @@ -154,8 +142,6 @@ .LP .SH "KNOWN BUGS" .LP - -.LP .LP Mixed mode stack trace, the \-m option, does not work with the remote debug server. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jstat.1 --- a/jdk/src/solaris/doc/sun/man/man1/jstat.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jstat.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstat 1 "02 Jun 2010" +.TH jstat 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -39,8 +37,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 generalOption @@ -60,17 +56,15 @@ The syntax of the vmid string largely corresponds to the syntax of a URI. The \f2vmid\fP can vary from a simple integer representing a local JVM to a more complex construction specifying a communications protocol, port number, and other implementation\-specific values. See Virtual Machine Identifier for details. .TP 3 interval[s|ms] -Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds.\ Must be a positive integer.\ If specified, \f3jstat\fP will produce its output at each interval. +Sampling interval in the specified units, seconds (s) or milliseconds (ms). Default units are milliseconds. Must be a positive integer. If specified, \f3jstat\fP will produce its output at each interval. .TP 3 count -Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated.\ Must be a positive integer. +Number of samples to display. Default value is infinity; that is, \f3jstat\fP displays statistics until the target JVM terminates or the \f3jstat\fP command is terminated. Must be a positive integer. .RE .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstat\fP tool displays performance statistics for an instrumented HotSpot Java virtual machine (JVM). The target JVM is identified by its virtual machine identifier, or \f2vmid\fP option described below. .LP @@ -82,9 +76,6 @@ .SS VIRTUAL MACHINE IDENTIFIER .LP -.RS 3 - -.LP .LP The syntax of the \f2vmid\fP string largely corresponds to the syntax of a URI: .LP @@ -115,11 +106,8 @@ .RE .LP -.RE .SH "OPTIONS" .LP - -.LP .LP The \f3jstat\fP command supports two types of options, general options and output options. General options cause \f3jstat\fP to display simple usage and version information. Output options determine the content and format of the statistical output. .br @@ -150,14 +138,11 @@ .SS OUTPUT OPTIONS .LP -.RS 3 - +.LP +If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J). The \f2statOption\fP must come first. .LP .LP -If you do not specify a general option, then you can specify output options. Output options determine the content and format of \f3jstat\fP's output, and consist of a single \f2statOption\fP, plus any of the other output options (\-h, \-t, and \-J).\ The \f2statOption\fP must come first. -.LP -.LP -Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns.\ Use the \f3\-h\fP option to set the frequency at which the header is displayed.\ Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. +Output is formatted as a table, with columns are separated by spaces. A header row with titles describes the columns. Use the \f3\-h\fP option to set the frequency at which the header is displayed. Column header names are generally consistent between the different options. In general, if two options provide a column with the same name, then the data source for the two columns are the same. .LP .LP Use the \f3\-t\fP option to display a time stamp column, labeled \f2Timestamp\fP as the first column of output. The \f2Timestamp\fP column contains the elapsed time, in seconds, since startup of the target JVM. The resolution of the time stamp is dependent on various factors and is subject to variation due to delayed thread scheduling on heavily loaded systems. @@ -171,7 +156,7 @@ .RS 3 .TP 3 \-statOption -Determines the statistics information that \f3jstat\fP displays. The following table lists the available options.\ Use the \f3\-options\fP general option to display the list of options for a particular platform installation. +Determines the statistics information that \f3jstat\fP displays. The following table lists the available options. Use the \f3\-options\fP general option to display the list of options for a particular platform installation. .br .br .LP @@ -457,7 +442,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 230 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 215 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -697,13 +682,9 @@ .RE .LP -.RE .SS STATOPTIONS AND OUTPUT .LP -.RS 3 - -.LP .LP The following tables summarize the columns that \f3jstat\fP outputs for each \f2statOption\fP. .br @@ -825,7 +806,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 280 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 261 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1082,7 +1063,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 316 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 297 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -1546,7 +1527,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 386 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 367 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2170,7 +2151,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 460 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 441 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2550,7 +2531,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 483 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 464 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -2866,7 +2847,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 537 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 518 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3094,15 +3075,14 @@ .rm 80 81 .nr 34 \n(.lu .eo -.am 80 +.am 81 .br .di a+ .35 .ft \n(.f .ll \n(34u*1u/3u -.if \n(.l<\n(80 .ll \n(80u +.if \n(.l<\n(81 .ll \n(81u .in 0 -NGCMN\ \ \ \ \ \ \ \ \ T}~T{ Minimum new generation capacity (KB). .br .di @@ -3262,9 +3242,11 @@ .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \w\f3Column\fP .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGCMX \ \ \ +.nr 38 \wNGCMN .if \n(80<\n(38 .nr 80 \n(38 -.nr 38 \wNGC \ \ \ +.nr 38 \wNGCMX +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \wNGC .if \n(80<\n(38 .nr 80 \n(38 .nr 38 \wS0CMX .if \n(80<\n(38 .nr 80 \n(38 @@ -3284,8 +3266,6 @@ .if \n(80<\n(38 .nr 80 \n(38 .80 .rm 80 -.nr 38 \n(a- -.if \n(80<\n(38 .nr 80 \n(38 .nr 81 0 .nr 38 \w\f3Description\fP .if \n(81<\n(38 .nr 81 \n(38 @@ -3293,6 +3273,8 @@ .if \n(81<\n(38 .nr 81 \n(38 .81 .rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(b- .if \n(81<\n(38 .nr 81 \n(38 .nr 38 \n(c- @@ -3321,7 +3303,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 593 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 572 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -3348,11 +3330,11 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'\h'|\n(41u' +\&\h'|\n(40u'NGCMN\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v -.nr 37 \n(40u +.nr 37 \n(41u .in +\n(37u .a+ .in -\n(37u @@ -3364,7 +3346,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGCMX \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGCMX\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3380,7 +3362,7 @@ .ta \n(80u \n(81u .nr 31 \n(.f .nr 35 1m -\&\h'|\n(40u'NGC \ \ \\h'|\n(41u' +\&\h'|\n(40u'NGC\h'|\n(41u' .mk ## .nr 31 \n(## .sp |\n(##u-1v @@ -3522,7 +3504,7 @@ .rm i+ .rm j+ .TE -.if \n-(b.=0 .nr c. \n(.c-\n(d.-49 +.if \n-(b.=0 .nr c. \n(.c-\n(d.-47 .LP .SS @@ -3717,7 +3699,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 635 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 614 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4062,7 +4044,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 677 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 656 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4407,7 +4389,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 719 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 698 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -4792,7 +4774,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 769 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 748 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -5091,7 +5073,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 795 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 774 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -5176,10 +5158,7 @@ .if \n-(b.=0 .nr c. \n(.c-\n(d.-19 .LP -.SS - -.LP -.SH "" +.SH "EXAMPLES" .LP .LP This section presents some examples of monitoring a local JVM with a \f2lvmid\fP of 21891. @@ -5355,7 +5334,6 @@ .LP The \f2lvmid\fP is combined with the name of the remote host to construct a \f2vmid\fP of \f240496@remote.domain\fP. This \f2vmid\fP results in the use of the \f3rmi\fP protocol to communicate to the default \f3jstatd\fP server on the remote host. The \f3jstatd\fP server is located using the \f3rmiregistry\fP on \f2remote.domain\fP that is bound to the default \f3rmiregistry\fP port (port 1099). .LP -.RE .SH "SEE ALSO" .LP .RS 3 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jstatd.1 --- a/jdk/src/solaris/doc/sun/man/man1/jstatd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/jstatd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH jstatd 1 "02 Jun 2010" +.TH jstatd 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -42,8 +40,6 @@ .LP .SH "PARAMETERS" .LP - -.LP .RS 3 .TP 3 options @@ -53,8 +49,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3jstatd\fP tool is an RMI server application that monitors for the creation and termination of instrumented HotSpot Java virtual machines (JVMs) and provides a interface to allow remote monitoring tools to attach to JVMs running on the local host. .LP @@ -66,8 +60,6 @@ .LP .SH "OPTIONS" .LP - -.LP .LP The \f3jstatd\fP command supports the following options: .LP @@ -89,8 +81,6 @@ .LP .SH "SECURITY" .LP - -.LP .LP The \f3jstatd\fP server can only monitor JVMs for which it has the appropriate native access permissions. Therefor the \f3jstatd\fP process must be running with the same user credentials as the target JVMs. Some user credentials, such as the \f2root\fP user in UNIX(TM) based systems, have permission to access the instrumentation exported by any JVM on the system. A \f3jstatd\fP process running with such credentials can monitor any JVM on the system, but introduces additional security concerns. .LP @@ -102,7 +92,7 @@ .na \f2Policy File Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html. .LP .LP The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server. @@ -145,15 +135,11 @@ .LP .SH "REMOTE INTERFACE" .LP - -.LP .LP The interface exported by the \f3jstatd\fP process is proprietary and is guaranteed to change. Users and developers are discouraged from writing to this interface. .LP .SH "EXAMPLES" .LP - -.LP .LP Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background. .LP @@ -264,7 +250,7 @@ .na \f2rmiregistry\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/jvisualvm.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/doc/sun/man/man1/jvisualvm.1 Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,104 @@ +." Copyright (c) 2008, 2011, 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. +." +.TH jvisualvm 1 "10 May 2011" + +.LP +.SH "Name" +\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool +.LP +.SH "SYNOPSIS" +.LP +.nf +\f3 +.fl + \fP\f3jvisualvm\fP [ \f2options\fP ] +.fl +.fi + +.LP +.SH "PARAMETERS" +.LP +.LP +Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below. +.LP +.SH "DESCRIPTION" +.LP +.LP +Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP. +.LP +.LP +Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins. +.LP +.SH "OPTIONS" +.LP +.LP +The following option is possible when you launch Java VisualVM. +.LP +.RS 3 +.TP 3 +\-J<jvm_option>\ +Pass this \f2<jvm_option>\fP to the JVM software. +.RE + +.LP +.SH "USAGE" +.LP +.LP +Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus. +.LP +.LP +Start Java VisualVM with the following command: +.LP +.nf +\f3 +.fl +% jvisualvm \fP\f4<options>\fP\f3 +.fl +\fP +.fi + +.LP +.SH "SEE ALSO" +.LP +.LP +For more details about Java VisualVM see the following pages. +.LP +.RS 3 +.TP 2 +o +.na +\f2Java VisualVM developers' site\fP @ +.fi +http://visualvm.java.net +.TP 2 +o +.na +\f2Java VisualVM in Java SE platform documentation\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html +.RE + +.LP +.LP +\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP +.LP + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/keytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/keytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/keytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998-2011 keytool tool, 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 @@ -19,21 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH keytool 1 "02 Jun 2010" +.TH keytool 1 "10 May 2011" .LP .SH "Name" keytool \- Key and Certificate Management Tool .LP -.RS 3 - .LP Manages a keystore (database) of cryptographic keys, X.509 certificate chains, and trusted certificates. -.RE +.LP .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP \f3keytool\fP is a key and certificate management utility. It allows users to administer their own public/private key pairs and associated certificates for use in self\-authentication (where the user authenticates himself/herself to other users/services) or data integrity and authentication services, using digital signatures. It also allows users to cache the public keys (in the form of certificates) of their communicating peers. .LP A \f2certificate\fP is a digitally signed statement from one entity (person, company, etc.), saying that the public key (and some other information) of some other entity has a particular value. (See Certificates.) When data is digitally signed, the signature can be verified to check the data integrity and authenticity. \f2Integrity\fP means that the data has not been modified or tampered with, and \f2authenticity\fP means the data indeed comes from whoever claims to have created and signed it. @@ -57,14 +51,12 @@ \f3keytool\fP also enables users to administer secret keys used in symmetric encryption/decryption (e.g. DES). .LP .LP -\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. +\f3keytool\fP stores the keys and certificates in a \f2keystore\fP. .LP .SH "COMMAND AND OPTION NOTES" .LP - .LP -.LP -The various commands and their options are listed and described below . Note: +The various commands and their options are listed and described below. Note: .LP .RS 3 .TP 2 @@ -114,6 +106,7 @@ .fl \fP .fi +.LP is equivalent to .nf \f3 @@ -128,10 +121,9 @@ .SS Option Defaults .LP -.RS 3 - .LP -Below are the defaults for various option values. +Below are the defaults for various option values. +.LP .nf \f3 .fl @@ -153,12 +145,16 @@ .fl 1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA") .fl + 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC") +.fl 56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES") .fl 168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede") .fl .fl + +.fl \-validity 90 .fl @@ -169,7 +165,7 @@ .fl \-storetype the value of the "keystore.type" property in the security properties file, .fl - which is returned by the static \fP\f4getDefaultType\fP\f3 method in + which is returned by the static \fP\f4getDefaultType\fP\f3 method in .fl \fP\f4java.security.KeyStore\fP\f3 .fl @@ -181,25 +177,39 @@ .fl \-protected false .fl - -.fl \fP .fi .LP -In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA", and if the underlying private key is of type "RSA", \f2\-sigalg\fP defaults to "SHA256withRSA". Please consult the +.LP +In generating a public/private key pair, the signature algorithm (\f2\-sigalg\fP option) is derived from the algorithm of the underlying private key: +.LP +.RS 3 +.TP 2 +o +If the underlying private key is of type "DSA", the \f2\-sigalg\fP option defaults to "SHA1withDSA" +.TP 2 +o +If the underlying private key is of type "RSA", the \f2\-sigalg\fP option defaults to "SHA256withRSA". +.TP 2 +o +If the underlying private key is of type "EC", the \f2\-sigalg\fP option defaults to "SHA256withECDSA". +.RE + +.LP +.LP +Please consult the .na \f2Java Cryptography Architecture API Specification & Reference\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. -.RE +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from. +.LP .SS Common Options .LP -.RS 3 - .LP -The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +The \f2\-v\fP option can appear for all commands except \f2\-help\fP. If it appears, it signifies "verbose" mode; more information will be provided in the output. +.LP .LP There is also a \f2\-J\fP\f2javaoption\fP option that may appear for any command. If it appears, the specified \f2javaoption\fP string is passed through directly to the Java interpreter. This option should not contain any spaces. It is useful for adjusting the execution environment or memory usage. For a list of possible interpreter options, type \f2java \-h\fP or \f2java \-X\fP at the command line. .LP @@ -209,39 +219,59 @@ .RS 3 .TP 3 \-storetype storetype -This qualifier specifies the type of keystore to be instantiated. +.LP +This qualifier specifies the type of keystore to be instantiated. .TP 3 \-keystore keystore +.LP The keystore location. .LP If the JKS storetype is used and a keystore file does not yet exist, then certain \f3keytool\fP commands may result in a new keystore file being created. For example, if \f2keytool \-genkeypair\fP is invoked and the \f2\-keystore\fP option is not specified, the default keystore file named \f2.keystore\fP in the user's home directory will be created if it does not already exist. Similarly, if the \f2\-keystore \fP\f2ks_file\fP option is specified but \f2ks_file\fP does not exist, then it will be created .LP Note that the input stream from the \f2\-keystore\fP option is passed to the \f2KeyStore.load\fP method. If \f2NONE\fP is specified as the URL, then a null stream is passed to the \f2KeyStore.load\fP method. \f2NONE\fP should be specified if the \f2KeyStore\fP is not file\-based (for example, if it resides on a hardware token device). .TP 3 -\-storepass storepass +\-storepass[:env|:file] argument +.LP The password which is used to protect the integrity of the keystore. .LP -\f2storepass\fP must be at least 6 characters long. It must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. +If the modifier \f2env\fP or \f2file\fP is not specified, then the password has the value \f2argument\fP, which must be at least 6 characters long. Otherwise, the password is retrieved as follows: +.RS 3 +.TP 2 +o +\f2env\fP: Retrieve the password from the environment variable named \f2argument\fP +.TP 2 +o +\f2file\fP: Retrieve the password from the file named \f2argument\fP +.RE +.LP +\f3Note\fP: All other options that require passwords, such as \f2\-keypass\fP, \f2\-srckeypass\fP, \f2\-destkeypass\fP \f2\-srcstorepass\fP, and \f2\-deststorepass\fP, accept the \f2env\fP and \f2file\fP modifiers. (Remember to separate the password option and the modifier with a colon, (\f2:\fP).) +.LP +The password must be provided to all commands that access the keystore contents. For such commands, if a \f2\-storepass\fP option is not provided at the command line, the user is prompted for it. .LP When retrieving information from the keystore, the password is optional; if no password is given, the integrity of the retrieved information cannot be checked and a warning is displayed. .TP 3 \-providerName provider_name -Used to identify a cryptographic service provider's name when listed in the security properties file. +.LP +Used to identify a cryptographic service provider's name when listed in the security properties file. .TP 3 \-providerClass provider_class_name -Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. +.LP +Used to specify the name of cryptographic service provider's master class file when the service provider is not listed in the security properties file. .TP 3 \-providerArg provider_arg -Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. +.LP +Used in conjunction with \f2\-providerClass\fP. Represents an optional string input argument for the constructor of \f2provider_class_name\fP. .TP 3 \-protected +.LP Either \f2true\fP or \f2false\fP. This value should be specified as \f2true\fP if a password must be given via a protected authentication path such as a dedicated PIN reader. .LP Note: Since there are two keystores involved in \f2\-importkeystore\fP command, two options, namely, \f2\-srcprotected\fP and \f2\-destprotected\fP are provided for the source keystore and the destination keystore respectively. .TP 3 \-ext {name{:critical}{=value}} -Denotes an X.509 certificate extension. The option can be used in \f2\-genkeypair\fP and \f2\-gencert\fP to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2":critical"\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. -.RS 3 +.LP +Denotes an X.509 certificate extension. The option can be used in \-genkeypair and \-gencert to embed extensions into the certificate generated, or in \f2\-certreq\fP to show what extensions are requested in the certificate request. The option can appear multiple times. name can be a supported extension name (see below) or an arbitrary OID number. value, if provided, denotes the parameter for the extension; if omitted, denotes the default value (if defined) of the extension or the extension requires no parameter. The \f2:critical\fP modifier, if provided, means the extension's isCritical attribute is true; otherwise, false. You may use \f2:c\fP in place of \f2:critical\fP. +.RE .LP .LP @@ -478,7 +508,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 289 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 319 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 @@ -657,7 +687,7 @@ For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then. .LP .LP -A special name \f2"honored"\fP, used in \-gencert only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma\-seperated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. +A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default. .LP .LP If, besides the \-ext honored option, another named or OID \-ext option is provided, this extension will be added to those already honored. However, if this name (or OID) also appears in the honored value, its value and criticality overrides the one in the request. @@ -668,32 +698,61 @@ .LP \f3Note:\fP Users should be aware that some combinations of extensions (and other certificate fields) may not conform to the Internet standard. See Warning Regarding Certificate Conformance for details. .LP -.RE -.RE -.RE .SH "COMMANDS" .LP - -.LP .SS Creating or Adding Data to the Keystore .LP .RS 3 - +.TP 3 +\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP -.RS 3 -.TP 3 -\-gencert {\-infile infile} {\-outfile outfile} {\-dname dname} {\-ext ext}* {\-rfc} {\-alias alias} {\-sigalg sigalg} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] [\-keypass keypass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from \f2infile\fP (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into \f2outfile\fP (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. .LP -Generates a certificate as a response to a certificate request file (which can be created by the \f2keytool \-certreq\fP command). The command reads the request from infile (if omitted, from the standard input), signs it using alias's private key, and output the X.509 certificate into outfile (if omitted, to the standard output). If \f2\-rfc\fP is specified, output format is BASE64\-encoded PEM; otherwise, a binary DER is created. -.LP -\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. valDays tells the number of days for which the certificate should be considered valid. +\f2sigalg\fP specifies the algorithm that should be used to sign the certificate. \f2startdate\fP is the start time/date that the certificate is valid. \f2valDays\fP tells the number of days for which the certificate should be considered valid. .LP If \f2dname\fP is provided, it's used as the subject of the generated certificate. Otherwise, the one from the certificate request is used. .LP -\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +\f2ext\fP shows what X.509 extensions will be embedded in the certificate. Read Common Options for the grammar of \f2\-ext\fP. +.LP +The \f2\-gencert\fP command enables you to create certificate chains. The following example creates a certificate, \f2e1\fP, that contains three certificates in its certificate chain. +.LP +The following commands creates four key pairs named \f2ca\fP, \f2ca1\fP, \f2ca2\fP, and \f2e1\fP: +.nf +\f3 +.fl +keytool \-alias ca \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca1 \-dname CN=CA \-genkeypair +.fl +keytool \-alias ca2 \-dname CN=CA \-genkeypair +.fl +keytool \-alias e1 \-dname CN=E1 \-genkeypair +.fl +\fP +.fi +.LP +The following two commands create a chain of signed certificates; \f2ca\fP signs ca1 and \f2ca1 signs ca2\fP, all of which are self\-issued: +.nf +\f3 +.fl +keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert +.fl +keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert +.fl +\fP +.fi +.LP +The following command creates the certificate \f2e1\fP and stores it in the file \f2e1.cert\fP, which is signed by \f2ca2\fP. As a result, \f2e1\fP should contain \f2ca\fP, \f2ca1\fP, and \f2ca2\fP in its certificate chain: +.nf +\f3 +.fl +keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert +.fl +\fP +.fi .TP 3 -\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} +\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP Generates a key pair (a public key and associated private key). Wraps the public key into an X.509 v3 self\-signed certificate, which is stored as a single\-element certificate chain. This certificate chain and the private key are stored in a new keystore entry identified by \f2alias\fP. .LP @@ -704,30 +763,18 @@ \f2keypass\fP is a password used to protect the private key of the generated key pair. If no password is provided, the user is prompted for it. If you press RETURN at the prompt, the key password is set to the same password as that used for the keystore. \f2keypass\fP must be at least 6 characters long. .LP \f2startdate\fP specifies the issue time of the certificate, also known as the "Not Before" value of the X.509 certificate's Validity field. -.RS 3 - .LP -.LP -The option value can be set in one of these two forms: -.LP +The option value can be set in one of these two forms: .RS 3 .TP 3 1. -.LP -([+\-]\f2nnn\fP[ymdHMS])+ +([+\-]\f2nnn\fP[ymdHMS])+ .TP 3 2. -.LP -[yyyy/mm/dd] [HH:MM:SS] +[yyyy/mm/dd] [HH:MM:SS] .RE - -.LP .LP -With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: -.LP -.RS 3 - -.LP +With the first form, the issue time is shifted by the specified value from the current time. The value is a concatenation of a sequence of sub values. Inside each sub value, the plus sign ("+") means shifting forward, and the minus sign ("\-") means shifting backward. The time to be shifted is \f2nnn\fP units of years, months, days, hours, minutes, or seconds (denoted by a single character of "y", "m", "d", "H", "M", or "S" respectively). The exact value of the issue time is calculated using the \f2java.util.GregorianCalendar.add(int field, int amount)\fP method on each sub value, from left to right. For example, by specifying \f2"\-startdate \-1y+1m\-1d"\fP, the issue time will be: .nf \f3 .fl @@ -743,16 +790,10 @@ .fl \fP .fi -.RE - -.LP .LP -With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local timezone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. -.LP +With the second form, the user sets the exact issue time in two parts, year/month/day and hour:minute:second (using the local time zone). The user may provide only one part, which means the other part is the same as the current date (or time). User must provide the exact number of digits as shown in the format definition (padding with 0 if shorter). When both the date and time are provided, there is one (and only one) space character between the two parts. The hour should always be provided in 24 hour format. .LP -When the option is not provided, the start date is the current time. The option can be provided at most once. -.LP -.RE +When the option is not provided, the start date is the current time. The option can be provided at most once. .LP \f2valDays\fP specifies the number of days (starting at the date specified by \f2\-startdate\fP, or the current date if \f2\-startdate\fP is not specified) for which the certificate should be considered valid. .LP @@ -790,25 +831,17 @@ \f3If the alias points to a key entry\fP, then \f3keytool\fP assumes you are importing a certificate reply. .RE \f3Importing a New Trusted Certificate\fP -.RS 3 -.LP -Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. -.LP .LP -If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". +Before adding the certificate to the keystore, \f3keytool\fP tries to verify it by attempting to construct a chain of trust from that certificate to a self\-signed certificate (belonging to a root CA), using trusted certificates that are already available in the keystore. .LP -.LP -If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. +If the \f2\-trustcacerts\fP option has been specified, additional certificates are considered for the chain of trust, namely the certificates in a file named "cacerts". .LP -.RE +If \f3keytool\fP fails to establish a trust path from the certificate to be imported up to a self\-signed certificate (either from the keystore or the "cacerts" file), the certificate information is printed out, and the user is prompted to verify it, e.g., by comparing the displayed certificate fingerprints with the fingerprints obtained from some other (trusted) source of information, which might be the certificate owner himself/herself. Be very careful to ensure the certificate is valid prior to importing it as a "trusted" certificate! \-\- see WARNING Regarding Importing Trusted Certificates. The user then has the option of aborting the import operation. If the \f2\-noprompt\fP option is given, however, there will be no interaction with the user. \f3Importing a Certificate Reply\fP -.RS 3 .LP -When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). -.LP +When importing a certificate reply, the certificate reply is validated using trusted certificates from the keystore, and optionally using the certificates configured in the "cacerts" keystore file (if the \f2\-trustcacerts\fP option was specified). .LP -The methods of determining whether the certificate reply is trusted are described in the following: -.LP +The methods of determining whether the certificate reply is trusted are described in the following: .RS 3 .TP 2 o @@ -817,12 +850,8 @@ o \f3If the reply is a PKCS#7 formatted certificate chain or a sequence of X.509 certificates\fP, the chain is ordered with the user certificate first followed by zero or more CA certificates. If the chain ends with a self\-signed root CA certificate and \f2\-trustcacerts\fP option was specified, \f3keytool\fP will attempt to match it with any of the trusted certificates in the keystore or the "cacerts" keystore file. If the chain does not end with a self\-signed root CA certificate and the \f2\-trustcacerts\fP option was specified, \f3keytool\fP will try to find one from the trusted certificates in the keystore or the "cacerts" keystore file and add it to the end of the chain. If the certificate is not found and \f2\-noprompt\fP option is not specified, the information of the last certificate in the chain is printed out, and the user is prompted to verify it. .RE - .LP -.LP -If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. -.LP -.RE +If the public key in the certificate reply matches the user's public key already stored with under \f2alias\fP, the old certificate chain is replaced with the new certificate chain in the reply. The old chain can only be replaced if a valid \f2keypass\fP, the password used to protect the private key of the entry, is supplied. If no password is provided, and the private key password is different from the keystore password, the user is prompted for it. .LP This command was named \f2\-import\fP in previous releases. This old name is still supported in this release and will be supported in future releases, but for clarify the new name, \f2\-importcert\fP, is preferred going forward. .TP 3 @@ -842,14 +871,12 @@ .LP Prints the content of a PKCS #10 format certificate request, which can be generated by the keytool \-certreq command. The command reads the request from file; if omitted, from the standard input. .RE -.RE + +.LP .SS Exporting Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption} .LP @@ -879,14 +906,10 @@ .RE .LP -.RE .SS Displaying Data .LP .RS 3 - -.LP -.RS 3 .TP 3 \-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption} .LP @@ -896,27 +919,36 @@ .LP You cannot specify both \f2\-v\fP and \f2\-rfc\fP. .TP 3 -\-printcert {\-file cert_file | \-sslserver host[:port]} {\-rfc} {\-v} {\-Jjavaoption} +\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption} .LP +Reads the certificate from the file \f2cert_file\fP, the SSL server located at \f2host:port\fP, or the signed JAR file \f2JAR_file\fP (with the option \f2\-jarfile\fP and prints its contents in a human\-readable format. When no port is specified, the standard HTTPS port 443 is assumed. Note that \f2\-sslserver\fP and \f2\-file\fP options cannot be provided at the same time. Otherwise, an error is reported. If neither option is given, the certificate is read from stdin. .LP If \f2\-rfc\fP is specified, keytool prints the certificate in PEM mode as defined by the Internet RFC 1421 standard. .LP If the certificate is read from a file or stdin, it may be either binary encoded or in printable encoding format, as defined by the Internet RFC 1421 standard .LP -If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the JSSE Reference Guide for more information. +If the SSL server is behind a firewall, \f2\-J\-Dhttps.proxyHost=proxyhost\fP and \f2\-J\-Dhttps.proxyPort=proxyport\fP can be specified on the command line for proxy tunneling. See the +.na +\f2JSSE Reference Guide\fP @ +.fi +http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information. +.LP +\f3Note\fP: This option can be used independently of a keystore. +.TP 3 +\-printcrl \-file crl_ {\-v} +.LP +Reads the certificate revocation list (CRL) from the file \f2crl_file\fP. +.LP +A Certificate Revocation List (CRL) is a list of digital certificates which have been revoked by the Certificate Authority (CA) that issued them. The CA generates \f2crl_file\fP. .LP \f3Note\fP: This option can be used independently of a keystore. .RE .LP -.RE .SS Managing the Keystore .LP .RS 3 - -.LP -.RS 3 .TP 3 \-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption} .LP @@ -940,46 +972,45 @@ .RE .LP -.RE .SS Getting Help .LP .RS 3 - -.LP -.RS 3 .TP 3 \-help .LP -Lists the basic commands and their options. +Lists the basic commands and their options. +.LP +For more information about a specific command, enter the following, where \f2command_name\fP is the name of the command: +.nf +\f3 +.fl + keytool \-\fP\f4command_name\fP\f3 \-help +.fl +\fP +.fi .RE .LP -.RE .SH "EXAMPLES" .LP - -.LP .LP Suppose you want to create a keystore for managing your public/private key pair and certificates from entities you trust. .LP .SS Generating Your Key Pair .LP -.RS 3 - -.LP .LP The first thing you need to do is create a keystore and generate the key pair. You could use a command such as the following: .LP .nf \f3 .fl - keytool \-genkeypair \-dname "cn=Mark Jones, ou=JavaSoft, o=Sun, c=US" + keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US" .fl - \-alias business \-keypass kpi135 \-keystore /working/mykeystore + \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore .fl - \-storepass ab987c \-validity 180 + \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180 .fl \fP .fi @@ -989,10 +1020,10 @@ (Please note: This must be typed as a single line. Multiple lines are used in the examples just for legibility purposes.) .LP .LP -This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password "ab987c". It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "JavaSoft", organization of "Sun" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. +This command creates the keystore named "mykeystore" in the "working" directory (assuming it doesn't already exist), and assigns it the password specified by \f2<new password for keystore>\fP. It generates a public/private key pair for the entity whose "distinguished name" has a common name of "Mark Jones", organizational unit of "Java", organization of "Oracle" and two\-letter country code of "US". It uses the default "DSA" key generation algorithm to create the keys, both 1024 bits long. .LP .LP -It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password "kpi135". +It creates a self\-signed certificate (using the default "SHA1withDSA" signature algorithm) that includes the public key and the distinguished name information. This certificate will be valid for 180 days, and is associated with the private key in a keystore entry referred to by the alias "business". The private key is assigned the password specified by \f2<new password for private key>\fP. .LP .LP The command could be significantly shorter if option defaults were accepted. As a matter of fact, no options are required; defaults are used for unspecified options that have default values, and you are prompted for any required values. Thus, you could simply have the following: @@ -1006,17 +1037,15 @@ .fi .LP -In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. +.LP +In this case, a keystore entry with alias "mykey" is created, with a newly\-generated key pair and a certificate that is valid for 90 days. This entry is placed in the keystore named ".keystore" in your home directory. (The keystore is created if it doesn't already exist.) You will be prompted for the distinguished name information, the keystore password, and the private key password. .LP -The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (a private key password of "kpi135", etc.) .LP -.RE +The rest of the examples assume you executed the \f2\-genkeypair\fP command without options specified, and that you responded to the prompts with values equal to those given in the first \f2\-genkeypair\fP command, above (for example, a distinguished name of "cn=Mark Jones, ou=Java, o=Oracle, c=US"). +.LP .SS Requesting a Signed Certificate from a Certification Authority .LP -.RS 3 - -.LP .LP So far all we've got is a self\-signed certificate. A certificate is more likely to be trusted by others if it is signed by a Certification Authority (CA). To get such a signature, you first generate a Certificate Signing Request (CSR), via the following: .LP @@ -1029,14 +1058,12 @@ .fi .LP +.LP This creates a CSR (for the entity identified by the default alias "mykey") and puts the request in the file named "MarkJ.csr". Submit this file to a CA, such as VeriSign, Inc. The CA will authenticate you, the requestor (usually off\-line), and then will return a certificate, signed by them, authenticating your public key. (In some cases, they will actually return a chain of certificates, each one authenticating the public key of the signer of the previous certificate in the chain.) -.RE +.LP .SS Importing a Certificate for the CA .LP -.RS 3 - -.LP .LP You need to replace your self\-signed certificate with a certificate chain, where each certificate in the chain authenticates the public key of the signer of the previous certificate in the chain, up to a "root" CA. .LP @@ -1054,7 +1081,7 @@ .LP .LP -The "cacerts" keystore file ships with five VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". +The "cacerts" keystore file ships with several VeriSign root CA certificates, so you probably won't need to import a VeriSign certificate as a trusted certificate in your keystore. But if you request a signed certificate from a different CA, and a certificate authenticating that CA's public key hasn't been added to "cacerts", you will need to import a certificate from the CA as a "trusted certificate". .LP .LP A certificate from a CA is usually either self\-signed, or signed by another CA (in which case you also need a certificate authenticating that CA's public key). Suppose company ABC, Inc., is a CA, and you obtain a file named "ABCCA.cer" that is purportedly a self\-signed certificate from ABC, authenticating that CA's public key. @@ -1074,14 +1101,12 @@ .fi .LP +.LP This creates a "trusted certificate" entry in the keystore, with the data from the file "ABCCA.cer", and assigns the alias "abc" to the entry. -.RE +.LP .SS Importing the Certificate Reply from the CA .LP -.RS 3 - -.LP .LP Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file. .LP @@ -1095,16 +1120,14 @@ .fl \fP .fi -.RE .LP .SS Exporting a Certificate Authenticating Your Public Key .LP -.RS 3 - .LP -Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +Suppose you have used the jarsigner(1) tool to sign a Java ARchive (JAR) file. Clients that want to use the file will want to authenticate your signature. +.LP .LP One way they can do this is by first importing your public key certificate into their keystore as a "trusted" entry. You can export the certificate and supply it to your clients. As an example, you can copy your certificate to a file named \f2MJ.cer\fP via the following, assuming the entry is aliased by "mykey": .LP @@ -1117,14 +1140,12 @@ .fi .LP +.LP Given that certificate, and the signed JAR file, a client can use the \f3jarsigner\fP tool to authenticate your signature. -.RE +.LP .SS Importing Keystore .LP -.RS 3 - -.LP .LP The command "importkeystore" is used to import an entire keystore into another keystore, which means all entries from the source keystore, including keys and certificates, are all imported to the destination keystore within a single command. You can use this command to import entries from a different type of keystore. During the import, all new entries in the destination keystore will have the same alias names and protection passwords (for secret keys and private keys). If \f3keytool\fP has difficulties recover the private keys or secret keys from the source keystore, it will prompt you for a password. If it detects alias duplication, it will ask you for a new one, you can specify a new alias or simply allow \f3keytool\fP to overwrite the existing one. .LP @@ -1134,128 +1155,108 @@ .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \fP .fi .LP .LP -The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the desination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. In this way, you can issue a \f3keytool\fP command that will never ask you a question. This makes it very convenient to include a \f3keytool\fP command into a script file, like this: +The importkeystore command can also be used to import a single entry from a source keystore to a destination keystore. In this case, besides the options you see in the above example, you need to specify the alias you want to import. With the srcalias option given, you can also specify the destination alias name in the command line, as well as protection password for a secret/private key and the destination protection password you want. The following command demonstrates this: .LP .nf \f3 .fl -keytool \-importkeystore + keytool \-importkeystore .fl \-srckeystore key.jks \-destkeystore NONE .fl \-srcstoretype JKS \-deststoretype PKCS11 .fl - \-srcstorepass changeit \-deststorepass topsecret + \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3 .fl \-srcalias myprivatekey \-destalias myoldprivatekey .fl - \-srckeypass oldkeypass \-destkeypass mynewkeypass + \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3 .fl \-noprompt .fl \fP .fi -.RE .LP .SS -Generating Certificates for a typical SSL Server -.LP -.RS 3 - +Generating Certificates for a Typical SSL Server .LP .LP -Keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermadiate CA (ca), and SSL server (server) are as follows: +The following are keytool commands to generate keypairs and certificates for three entities, namely, Root CA (root), Intermediate CA (ca), and SSL server (server). Ensure that you store all the certificates in the same keystore. In these examples, it is recommended that you specify RSA as the key algorithm. .LP .nf \f3 .fl -keytool \-keystore root.jks \-genkeypair \-alias root \-ext bc:c +keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c .fl -keytool \-keystore ca.jks \-alias ca +keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c .fl -keytool \-keystore server.jks \-alias server +keytool \-genkeypair \-keystore server.jks \-alias server .fl - + .fl -keytool \-keystore root.jks \-alias root \-exportcert > root.pem +keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem .fl - + .fl -keytool \-keystore ca.jks \-certreq \-alias ca | keytool \-keystore root.jks \-gencert \-alias root \-ext BC=0 > ca.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem .fl keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem .fl - + .fl -keytool \-keystore server.jks \-certreq \-alias server | keytool \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE >server.pem +keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem .fl cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server .fl \fP .fi -.RE .LP .SH "TERMINOLOGY and WARNINGS" .LP - -.LP .SS KeyStore .LP -.RS 3 - .LP A keystore is a storage facility for cryptographic keys and certificates. -.RE +.LP .RS 3 .TP 2 o -.TP 2 -o \f3KeyStore Entries\fP -.RS 3 - .LP Keystores may have different types of entries. The two most applicable entry types for \f3keytool\fP include: .RS 3 .TP 3 1. -\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types od entry, while \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. +\f3key entries\fP \- each holds very sensitive cryptographic key information, which is stored in a protected format to prevent unauthorized access. Typically, a key stored in this type of entry is a secret key, or a private key accompanied by the certificate "chain" for the corresponding public key. The \f3keytool\fP can handle both types of entries, while the \f3jarsigner\fP tool only handle the latter type of entry, that is private keys and their associated certificate chains. .TP 3 2. \f3trusted certificate entries\fP \- each contains a single public key certificate belonging to another party. It is called a "trusted certificate" because the keystore owner trusts that the public key in the certificate indeed belongs to the identity identified by the "subject" (owner) of the certificate. The issuer of the certificate vouches for this, by signing the certificate. .RE - -.LP -.RE .TP 2 o \f3KeyStore Aliases\fP -.RS 3 .LP -All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. -.LP +All keystore entries (key and trusted certificate entries) are accessed via unique \f2aliases\fP. .LP -An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. -.LP +An alias is specified when you add an entity to the keystore using the \-genseckey command to generate a secret key, \-genkeypair command to generate a key pair (public and private key) or the \-importcert command to add a certificate or certificate chain to the list of trusted certificates. Subsequent \f3keytool\fP commands must use this same alias to refer to the entity. .LP -For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: -.LP +For example, suppose you use the alias \f2duke\fP to generate a new public/private key pair and wrap the public key into a self\-signed certificate (see Certificate Chains) via the following command: .nf \f3 .fl @@ -1263,9 +1264,8 @@ .fl \fP .fi - .LP -This specifies an inital password of "dukekeypasswd" required by subsequent commands to access the private key assocated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: +This specifies an initial password of "dukekeypasswd" required by subsequent commands to access the private key associated with the alias \f2duke\fP. If you later want to change duke's private key password, you use a command like the following: .nf \f3 .fl @@ -1273,49 +1273,37 @@ .fl \fP .fi - .LP This changes the password from "dukekeypasswd" to "newpass". .LP -Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. -.LP -.RE +Please note: A password should not actually be specified on a command line or in a script unless it is for testing purposes, or you are on a secure system. If you don't specify a required password option on a command line, you will be prompted for it. .TP 2 o \f3KeyStore Implementation\fP -.RS 3 +.LP The \f2KeyStore\fP class provided in the \f2java.security\fP package supplies well\-defined interfaces to access and modify the information in a keystore. It is possible for there to be multiple different concrete implementations, where each implementation is that for a particular \f2type\fP of keystore. .LP -Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. -.LP +Currently, two command\-line tools (\f3keytool\fP and \f3jarsigner\fP) and a GUI\-based tool named \f3Policy Tool\fP make use of keystore implementations. Since \f2KeyStore\fP is publicly available, users can write additional security applications that use it. .LP -There is a built\-in default implementation, provided by Sun Microsystems. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. -.LP +There is a built\-in default implementation, provided by Oracle. It implements the keystore as a file, utilizing a proprietary keystore type (format) named "JKS". It protects each private key with its individual password, and also protects the integrity of the entire keystore with a (possibly different) password. .LP Keystore implementations are provider\-based. More specifically, the application interfaces supplied by \f2KeyStore\fP are implemented in terms of a "Service Provider Interface" (SPI). That is, there is a corresponding abstract \f2KeystoreSpi\fP class, also in the \f2java.security\fP package, which defines the Service Provider Interface methods that "providers" must implement. (The term "provider" refers to a package or a set of packages that supply a concrete implementation of a subset of services that can be accessed by the Java Security API.) Thus, to provide a keystore implementation, clients must implement a "provider" and supply a KeystoreSpi subclass implementation, as described in .na \f2How to Implement a Provider for the Java Cryptography Architecture\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/crypto/HowToImplAProvider.html. -.LP +http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. .LP -Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. -.LP +Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. .LP -\f3keytool\fP works on any file\-based keystore implementation. (It treats the keytore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. -.LP +\f3keytool\fP works on any file\-based keystore implementation. (It treats the keystore location that is passed to it at the command line as a filename and converts it to a FileInputStream, from which it loads the keystore information.) The \f3jarsigner\fP and \f3policytool\fP tools, on the other hand, can read a keystore from any location that can be specified using a URL. .LP -For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. -.LP +For \f3keytool\fP and \f3jarsigner\fP, you can specify a keystore type at the command line, via the \f2\-storetype\fP option. For \f3Policy Tool\fP, you can specify a keystore type via the "Keystore" menu. .LP -If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP +If you don't explicitly specify a keystore type, the tools choose a keystore implementation based simply on the value of the \f2keystore.type\fP property specified in the security properties file. The security properties file is called \f2java.security\fP, and it resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. -.LP +Each tool gets the \f2keystore.type\fP value and then examines all the currently\-installed providers until it finds one that implements keystores of that type. It then uses the keystore implementation from that provider. .LP -The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): -.LP +The \f2KeyStore\fP class defines a static method named \f2getDefaultType\fP that lets applications and applets retrieve the value of the \f2keystore.type\fP property. The following line of code creates an instance of the default keystore type (as specified in the \f2keystore.type\fP property): .nf \f3 .fl @@ -1323,11 +1311,8 @@ .fl \fP .fi - .LP -.LP -The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Sun). This is specified by the following line in the security properties file: -.LP +The default keystore type is "jks" (the proprietary type of the keystore implementation provided by Oracle). This is specified by the following line in the security properties file: .nf \f3 .fl @@ -1335,14 +1320,10 @@ .fl \fP .fi - -.LP .LP -To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. -.LP +To have the tools utilize a keystore implementation other than the default, you can change that line to specify a different keystore type. .LP -For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to -.LP +For example, if you have a provider package that supplies a keystore implementation for a keystore type called "pkcs12", change the line to .nf \f3 .fl @@ -1350,50 +1331,45 @@ .fl \fP .fi +.LP +Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". +.RE .LP -Note: case doesn't matter in keystore type designations. For example, "JKS" would be considered the same as "jks". -.RE -.RE .SS Certificate .LP +A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. .RS 3 - -.LP -A \f3certificate\fP (also known as a \f3public\-key certificate\fP) is a digitally signed statement from one entity (the \f2issuer\fP), saying that the public key (and some other information) of another entity (the \f2subject\fP) has some specific value. -.RE -.RS 3 -.TP 2 -o .TP 2 o \f3Certificate Terms\fP .RS 3 - -.LP -.RS 3 .TP 3 Public Keys -These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. +.LP +These are numbers associated with a particular entity, and are intended to be known to everyone who needs to have trusted interactions with that entity. Public keys are used to verify signatures. .TP 3 Digitally Signed -If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. +.LP +If some data is \f2digitally signed\fP it has been stored with the "identity" of an entity, and a signature that proves that entity knows about the data. The data is rendered unforgeable by signing with the entity's private key. .TP 3 Identity -A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. +.LP +A known way of addressing an entity. In some systems the identity is the public key, in others it can be anything from a Unix UID to an Email address to an X.509 Distinguished Name. .TP 3 Signature -A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). +.LP +A signature is computed over some data using the private key of an entity (the \f2signer\fP, which in the case of a certificate is also known as the \f2issuer\fP). .TP 3 Private Keys -These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. +.LP +These are numbers, each of which is supposed to be known only to the particular entity whose private key it is (that is, it's supposed to be kept secret). Private and public keys exist in pairs in all public key cryptography systems (also referred to as "public key crypto systems"). In a typical public key crypto system, such as DSA, a private key corresponds to exactly one public key. Private keys are used to compute signatures. .TP 3 Entity -An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. +.LP +An entity is a person, organization, program, computer, business, bank, or something else you are trusting to some degree. .RE - -.LP .LP Basically, public key cryptography requires access to users' public keys. In a large\-scale networked environment it is impossible to guarantee that prior relationships between communicating entities have been established or that a trusted repository exists with all used public keys. Certificates were invented as a solution to this public key distribution problem. Now a \f2Certification Authority\fP (CA) can act as a trusted third party. CAs are entities (for example, businesses) that are trusted to sign (issue) certificates for other entities. It is assumed that CAs will only create valid and reliable certificates, as they are bound by legal agreements. There are many public Certification Authorities, such as .na @@ -1407,26 +1383,22 @@ .na \f2Entrust\fP @ .fi -http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as the Netscape/Microsoft Certificate Servers or the Entrust CA product for your organization. -.LP -.LP -Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. +http://www.entrust.com/, and so on. You can also run your own Certification Authority using products such as Microsoft Certificate Server or the Entrust CA product for your organization. .LP +Using \f3keytool\fP, it is possible to display, import, and export certificates. It is also possible to generate self\-signed certificates. .LP -\f3keytool\fP currently handles X.509 certificates. -.LP -.RE +\f3keytool\fP currently handles X.509 certificates. .TP 2 o \f3X.509 Certificates\fP -.RS 3 +.LP The X.509 standard defines what information can go into a certificate, and describes how to write it down (the data format). All the data in a certificate is encoded using two related standards called ASN.1/DER. \f2Abstract Syntax Notation 1\fP describes data. The \f2Definite Encoding Rules\fP describe a single way to store and transfer that data. .LP -All X.509 certificates have the following data, in addition to the signature: -.LP +All X.509 certificates have the following data, in addition to the signature: .RS 3 .TP 3 Version +.LP This identifies which version of the X.509 standard applies to this certificate, which affects what information can be specified in it. Thus far, three versions are defined. \f3keytool\fP can import and export v1, v2, and v3 certificates. It generates v3 certificates. .LP \f2X.509 Version 1\fP has been available since 1988, is widely deployed, and is the most generic. @@ -1436,475 +1408,86 @@ \f2X.509 Version 3\fP is the most recent (1996) and supports the notion of extensions, whereby anyone can define an extension and include it in the certificate. Some common extensions in use today are: \f2KeyUsage\fP (limits the use of the keys to particular purposes such as "signing\-only") and \f2AlternativeNames\fP (allows other identities to also be associated with this public key, e.g. DNS names, Email addresses, IP addresses). Extensions can be marked \f2critical\fP to indicate that the extension should be checked and enforced/used. For example, if a certificate has the KeyUsage extension marked critical and set to "keyCertSign" then if this certificate is presented during SSL communication, it should be rejected, as the certificate extension indicates that the associated private key should only be used for signing certificates and not for SSL use. .TP 3 Serial Number -The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). +.LP +The entity that created the certificate is responsible for assigning it a serial number to distinguish it from other certificates it issues. This information is used in numerous ways, for example when a certificate is revoked its serial number is placed in a Certificate Revocation List (CRL). .TP 3 Signature Algorithm Identifier -This identifies the algorithm used by the CA to sign the certificate. +.LP +This identifies the algorithm used by the CA to sign the certificate. .TP 3 Issuer Name -The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) +.LP +The X.500 Distinguished Name of the entity that signed the certificate. This is normally a CA. Using this certificate implies trusting the entity that signed this certificate. (Note that in some cases, such as \f2root or top\-level\fP CA certificates, the issuer signs its own certificate.) .TP 3 Validity Period -Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. +.LP +Each certificate is valid only for a limited amount of time. This period is described by a start date and time and an end date and time, and can be as short as a few seconds or almost as long as a century. The validity period chosen depends on a number of factors, such as the strength of the private key used to sign the certificate or the amount one is willing to pay for a certificate. This is the expected period that entities can rely on the public value, if the associated private key has not been compromised. .TP 3 Subject Name +.LP The name of the entity whose public key the certificate identifies. This name uses the X.500 standard, so it is intended to be unique across the Internet. This is the X.500 Distinguished Name (DN) of the entity, for example, .nf \f3 .fl - CN=Java Duke, OU=Java Software Division, O=Sun Microsystems Inc, C=US + CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US .fl \fP .fi -(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) +.LP +(These refer to the subject's Common Name, Organizational Unit, Organization, and Country.) .TP 3 Subject Public Key Information -This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. -.RE - .LP +This is the public key of the entity being named, together with an algorithm identifier which specifies which public key crypto system this key belongs to and any associated key parameters. .RE .TP 2 o \f3Certificate Chains\fP -.RS 3 .LP -\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. -.LP +\f3keytool\fP can create and manage keystore "key" entries that each contain a private key and an associated certificate "chain". The first certificate in the chain contains the public key corresponding to the private key. .LP -When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. -.LP +When keys are first generated (see the \-genkeypair command), the chain starts off containing a single element, a \f2self\-signed certificate\fP. A self\-signed certificate is one for which the issuer (signer) is the same as the subject (the entity whose public key is being authenticated by the certificate). Whenever the \f2\-genkeypair\fP command is called to generate a new public/private key pair, it also wraps the public key into a self\-signed certificate. .LP -Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. -.LP +Later, after a Certificate Signing Request (CSR) has been generated (see the \-certreq command) and sent to a Certification Authority (CA), the response from the CA is imported (see \-importcert), and the self\-signed certificate is replaced by a chain of certificates. At the bottom of the chain is the certificate (reply) issued by the CA authenticating the subject's public key. The next certificate in the chain is one that authenticates the \f2CA\fP's public key. .LP -In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. -.LP +In many cases, this is a self\-signed certificate (that is, a certificate from the CA authenticating its own public key) and the last certificate in the chain. In other cases, the CA may return a chain of certificates. In this case, the bottom certificate in the chain is the same (a certificate signed by the CA, authenticating the public key of the key entry), but the second certificate in the chain is a certificate signed by a \f2different\fP CA, authenticating the public key of the CA you sent the CSR to. Then, the next certificate in the chain will be a certificate authenticating the second CA's key, and so on, until a self\-signed "root" certificate is reached. Each certificate in the chain (after the first) thus authenticates the public key of the signer of the previous certificate in the chain. .LP -Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. -.LP +Many CAs only return the issued certificate, with no supporting chain, especially when there is a flat hierarchy (no intermediates CAs). In this case, the certificate chain must be established from trusted certificate information already stored in the keystore. .LP -A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. -.LP +A different reply format (defined by the PKCS#7 standard) also includes the supporting certificate chain, in addition to the issued certificate. Both reply formats can be handled by \f3keytool\fP. .LP -The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's webpage, etc.). -.LP -.RE +The top\-level (root) CA certificate is self\-signed. However, the trust into the root's public key does not come from the root certificate itself (anybody could generate a self\-signed certificate with the distinguished name of say, the VeriSign root CA!), but from other sources like a newspaper. The root CA public key is widely known. The only reason it is stored in a certificate is because this is the format understood by most tools, so the certificate in this case is only used as a "vehicle" to transport the root CA's public key. Before you add the root CA certificate to your keystore, you should view it (using the \f2\-printcert\fP option) and compare the displayed fingerprint with the well\-known fingerprint (obtained from a newspaper, the root CA's Web page, etc.). .TP 2 o \f3The cacerts Certificates File\fP -.RS 3 .LP -A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). -.LP -.LP -The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with several root CA certificates with the following aliases and X.500 owner distinguished names: +A certificates file named \f3"cacerts"\fP resides in the security properties directory, \f2java.home\fP/lib/security, where \f2java.home\fP is the runtime environment's directory (the \f2jre\fP directory in the SDK or the top\-level directory of the Java 2 Runtime Environment). .LP -.RS 3 -.TP 2 -* -\f3Alias\fP: thawtepersonalfreemailca -.br -\f3Owner DN\fP: EmailAddress=personal\-freemail@thawte.com, -.br -CN=Thawte Personal Freemail CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalbasicca -.br -\f3Owner DN\fP: EmailAddress=personal\-basic@thawte.com, -.br -CN=Thawte Personal Basic CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepersonalpremiumca -.br -\f3Owner DN\fP: EmailAddress=personal\-premium@thawte.com, -.br -CN=Thawte Personal Premium CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawteserverca -.br -\f3Owner DN\fP: EmailAddress=server\-certs@thawte.com, -.br -CN=Thawte Server CA, OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: thawtepremiumserverca -.br -\f3Owner DN\fP: EmailAddress=premium\-server@thawte.com, -.br -CN=Thawte Premium Server CA, -.br -OU=Certification Services Division, -.br -O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA -.TP 2 -* -\f3Alias\fP: verisignclass1ca -.br -\f3Owner DN\fP: OU=Class 1 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2ca -.br -\f3Owner DN\fP: OU=Class 2 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3ca -.br -\f3Owner DN\fP: OU=Class 3 Public Primary Certification Authority, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignserverca -.br -\f3Owner DN\fP: OU=Secure Server Certification Authority, -.br -O="RSA Data Security, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 1 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass1g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 1 Public Primary Certification Authority \- G3, OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 2 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass2g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 2 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g2ca -.br -\f3Owner DN\fP: OU=VeriSign Trust Network, -.br -OU="(c) 1998 VeriSign, Inc. \- For authorized use only", -.br -OU=Class 3 Public Primary Certification Authority \- G2, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: verisignclass3g3ca -.br -\f3Owner DN\fP: CN=VeriSign Class 3 Public Primary Certification Authority \- G3, -.br -OU="(c) 1999 VeriSign, Inc. \- For authorized use only", -.br -OU=VeriSign Trust Network, -.br -O="VeriSign, Inc.", C=US -.TP 2 -* -\f3Alias\fP: baltimorecodesigningca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Code Signing Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrustglobalca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Global Root, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: baltimorecybertrustca -.br -\f3Owner DN\fP: CN=Baltimore CyberTrust Root, -.br -OU=CyberTrust, O=Baltimore, C=IE -.TP 2 -* -\f3Alias\fP: gtecybertrust5ca -.br -\f3Owner DN\fP: CN=GTE CyberTrust Root 5, -.br -OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US -.TP 2 -* -\f3Alias\fP: entrustclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/Client_CA_Info/CPS incorp. by ref. limits liab., -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustglobalclientca -.br -\f3Owner DN\fP: CN=Entrust.net Client Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/GCCA_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrust2048ca -.br -\f3Owner DN\fP: CN=Entrust.net Certification Authority (2048), -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: entrustsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 1999 Entrust.net Limited, -.br -OU=www.entrust.net/CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net, C=US -.TP 2 -* -\f3Alias\fP: entrustgsslca -.br -\f3Owner DN\fP: CN=Entrust.net Secure Server Certification Authority, -.br -OU=(c) 2000 Entrust.net Limited, -.br -OU=www.entrust.net/SSL_CPS incorp. by ref. (limits liab.), -.br -O=Entrust.net -.TP 2 -* -\f3Alias\fP: godaddyclass2ca -.br -\f3Owner DN\fP: OU=Go Daddy Class 2 Certification Authority, -.br -O="The Go Daddy Group, Inc.", C=US -.TP 2 -* -\f3Alias\fP: starfieldclass2ca -.br -\f3Owner DN\fP: OU=Starfield Class 2 Certification Authority, -.br -O="Starfield Technologies, Inc.", C=US -.TP 2 -* -\f3Alias\fP: valicertclass2ca -.br -\f3Owner DN\fP: EMAILADDRESS=info@valicert.com, -.br -CN=http://www.valicert.com/, -.br -OU=ValiCert Class 2 Policy Validation Authority, -.br -O="ValiCert, Inc.", L=ValiCert Validation Network -.TP 2 -* -\f3Alias\fP: geotrustglobalca -.br -\f3Owner DN\fP: CN=GeoTrust Global CA, -.br -O=GeoTrust Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureca -.br -\f3Owner DN\fP: OU=Equifax Secure Certificate Authority, -.br -O=Equifax, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureebusinessca2 -.br -\f3Owner DN\fP: OU=Equifax Secure eBusiness CA\-2, -.br -O=Equifax Secure, C=US -.TP 2 -* -\f3Alias\fP: equifaxsecureglobalebusinessca1 -.br -\f3Owner DN\fP: CN=Equifax Secure Global eBusiness CA\-1, -.br -O=Equifax Secure Inc., C=US -.TP 2 -* -\f3Alias\fP: soneraclass1ca -.br -\f3Owner DN\fP: CN=Sonera Class1 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: soneraclass2ca -.br -\f3Owner DN\fP: CN=Sonera Class2 CA, O=Sonera, C=FI -.TP 2 -* -\f3Alias\fP: comodoaaaca -.br -\f3Owner DN\fP: CN=AAA Certificate Services, -.br -O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB -.TP 2 -* -\f3Alias\fP: addtrustclass1ca -.br -\f3Owner DN\fP: CN=AddTrust Class 1 CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustexternalca -.br -\f3Owner DN\fP: CN=AddTrust External CA Root, -.br -OU=AddTrust External TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: addtrustqualifiedca -.br -\f3Owner DN\fP: CN=AddTrust Qualified CA Root, -.br -OU=AddTrust TTP Network, O=AddTrust AB, C=SE -.TP 2 -* -\f3Alias\fP: utnuserfirsthardwareca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Hardware, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstclientauthemailca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Client Authentication and Email, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utndatacorpsgcca -.br -\f3Owner DN\fP: CN=UTN \- DATACorp SGC, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.TP 2 -* -\f3Alias\fP: utnuserfirstobjectca -.br -\f3Owner DN\fP: CN=UTN\-USERFirst\-Object, -.br -OU=http://www.usertrust.com, O=The USERTRUST Network, -.br -L=Salt Lake City, ST=UT, C=US -.RE - +The "cacerts" file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file using \f3keytool\fP, specifying "jks" as the keystore type. The "cacerts" keystore file ships with a default set of root CA certificates; list them with the following command: +.nf +\f3 +.fl +keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts +.fl +\fP +.fi .LP -.LP -The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. -.LP -.RS 3 - -.LP - +The initial password of the "cacerts" keystore file is "changeit". System administrators should change that password and the default access permission of that file upon installing the SDK. .LP -\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP -.br - -.LP -Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. -.br - -.LP -.RE - -.LP -.RE +\f3IMPORTANT: Verify Your \fP\f4cacerts\fP\f3 File\fP: Since you trust the CAs in the \f2cacerts\fP file as entities for signing and issuing certificates to other entities, you must manage the \f2cacerts\fP file carefully. The \f2cacerts\fP file should contain only certificates of the CAs you trust. It is your responsibility to verify the trusted root CA certificates bundled in the \f2cacerts\fP file and make your own trust decisions. To remove an untrusted CA certificate from the \f2cacerts\fP file, use the delete option of the \f2keytool\fP command. You can find the \f2cacerts\fP file in the JRE installation directory. Contact your system administrator if you do not have permission to edit this file. .TP 2 o \f3The Internet RFC 1421 Certificate Encoding Standard\fP -.RS 3 -.LP -Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP +Certificates are often stored using the printable encoding format defined by the Internet RFC 1421 standard, instead of their binary encoding. This certificate format, also known as "Base 64 encoding", facilitates exporting certificates to other applications by email or through some other mechanism. .LP -Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. -.LP +Certificates read by the \f2\-importcert\fP and \f2\-printcert\fP commands can be in either this format or binary encoded. .LP -The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. -.LP +The \f2\-exportcert\fP command by default outputs a certificate in binary encoding, but will instead output a certificate in the printable encoding format, if the \f2\-rfc\fP option is specified. .LP -The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. -.LP +The \f2\-list\fP command by default prints the SHA1 fingerprint of a certificate. If the \f2\-v\fP option is specified, the certificate is printed in human\-readable format, while if the \f2\-rfc\fP option is specified, the certificate is output in the printable encoding format. .LP -In its printable encoding format, the encoded certificate is bounded at the beginning by -.LP +In its printable encoding format, the encoded certificate is bounded at the beginning by .nf \f3 .fl @@ -1912,11 +1495,8 @@ .fl \fP .fi - .LP -.LP -and at the end by -.LP +and at the end by .nf \f3 .fl @@ -1925,23 +1505,21 @@ \fP .fi .RE -.RE .LP .SS X.500 Distinguished Names .LP -.RS 3 - .LP -X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +X.500 Distinguished Names are used to identify entities, such as those which are named by the \f2subject\fP and \f2issuer\fP (signer) fields of X.509 certificates. \f3keytool\fP supports the following subparts: +.LP .RS 3 .TP 2 o \f2commonName\fP \- common name of a person, e.g., "Susan Jones" .TP 2 o -\f2organizationUnit\fP \- small organization (e.g, department or division) name, e.g., "Purchasing" +\f2organizationUnit\fP \- small organization (e.g., department or division) name, e.g., "Purchasing" .TP 2 o \f2organizationName\fP \- large organization name, e.g., "ABCSystems, Inc." @@ -1975,7 +1553,7 @@ .nf \f3 .fl - CN=commonName + CN=commonName .fl OU=organizationUnit .fl @@ -1997,17 +1575,19 @@ .nf \f3 .fl -CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US +CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US .fl \fP .fi .LP -and a sample command using such a string is +.LP +and a sample command using such a string is +.LP .nf \f3 .fl -keytool \-genkeypair \-dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, +keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, .fl S=California, C=US" \-alias mark .fl @@ -2024,7 +1604,7 @@ .nf \f3 .fl -CN=Steve Meier, OU=SunSoft, O=Sun, C=US +CN=Steve Meier, OU=Java, O=Oracle, C=US .fl \fP .fi @@ -2036,7 +1616,7 @@ .nf \f3 .fl - cn=peter schuster, o=Sun Microsystems\\, Inc., o=sun, c=us + cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US .fl \fP .fi @@ -2045,14 +1625,12 @@ .LP It is never necessary to specify a distinguished name string on a command line. If it is needed for a command, but not supplied on the command line, the user is prompted for each of the subcomponents. In this case, a comma does not need to be escaped by a "\\". .LP -.RE .SS WARNING Regarding Importing Trusted Certificates .LP -.RS 3 - .LP -IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +IMPORTANT: Be sure to check a certificate very carefully before importing it as a trusted certificate! +.LP .LP View it first (using the \f2\-printcert\fP command, or the \f2\-importcert\fP command without the \f2\-noprompt\fP option), and make sure that the displayed certificate fingerprint(s) match the expected ones. For example, suppose someone sends or emails you a certificate, and you put it in a file named \f2/tmp/cert\fP. Before you consider adding the certificate to your list of trusted certificates, you can execute a \f2\-printcert\fP command to view its fingerprints, as in .LP @@ -2083,17 +1661,15 @@ .fi .LP -Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP +Then call or otherwise contact the person who sent the certificate, and compare the fingerprint(s) that you see with the ones that they show. Only if the fingerprints are equal is it guaranteed that the certificate has not been replaced in transit with somebody else's (for example, an attacker's) certificate. If such an attack took place, and you did not check the certificate before you imported it, you would end up trusting anything the attacker has signed (for example, a JAR file with malicious class files inside). +.LP .LP Note: it is not required that you execute a \f2\-printcert\fP command prior to importing a certificate, since before adding a certificate to the list of trusted certificates in the keystore, the \f2\-importcert\fP command prints out the certificate information and prompts you to verify it. You then have the option of aborting the import operation. Note, however, this is only the case if you invoke the \f2\-importcert\fP command without the \f2\-noprompt\fP option. If the \f2\-noprompt\fP option is given, there is no interaction with the user. .LP -.RE .SS Warning Regarding Passwords .LP -.RS 3 - -.LP .LP Most commands operating on a keystore require the store password. Some commands require a private/secret key password. .LP @@ -2103,13 +1679,9 @@ .LP If you don't specify a required password option on a command line, you will be prompted for it. .LP -.RE .SS Warning Regarding Certificate Conformance .LP -.RS 3 - -.LP .LP The Internet standard .na @@ -2117,39 +1689,31 @@ .fi http://tools.ietf.org/rfc/rfc5280.txt has defined a profile on conforming X.509 certificates, which includes what values and value combinations are valid for certificate fields and extensions. \f3keytool\fP has not enforced all these rules so it can generate certificates which do not conform to the standard, and these certificates might be rejected by JRE or other applications. Users should make sure that they provide the correct options for \f2\-dname\fP, \f2\-ext\fP, etc. .LP -.RE .SH "SEE ALSO" .LP - -.LP .RS 3 .TP 2 o -.LP -jar(1) tool documentation +jar(1) tool documentation .TP 2 o -.LP -jarsigner(1) tool documentation +jarsigner(1) tool documentation .TP 2 o -.LP the .na \f4Security\fP @ .fi -http://java.sun.com/docs/books/tutorial/security/index.html trail of the +http://download.oracle.com/javase/tutorial/security/index.html trail of the .na \f4Java Tutorial\fP @ .fi -http://java.sun.com/docs/books/tutorial for examples of the use of \f3keytool\fP +http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP .RE .LP .SH "CHANGES" .LP - -.LP .LP The command interface for keytool changed in Java SE 6. .LP @@ -2184,19 +1748,19 @@ .na \f2\-keyclone\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#keycloneCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd .TP 2 o .na \f2\-identitydb\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#identitydbCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd .TP 2 o .na \f2\-selfcert\fP @ .fi -http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/keytool.html#selfcertCmd +http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/native2ascii.1 --- a/jdk/src/solaris/doc/sun/man/man1/native2ascii.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/native2ascii.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH native2ascii 1 "02 Jun 2010" +.TH native2ascii 1 "10 May 2011" .LP .SH "Name" native2ascii \- Native\-to\-ASCII Converter .LP -.RS 3 - -.LP .LP -Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters. +Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -46,31 +40,29 @@ .LP .SH "DESCRIPTION" .LP - .LP -.LP -The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters. +\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion. .LP .LP If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-reverse -Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters. +Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment. .br .br .TP 3 \-encoding encoding_name -Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the +Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the .na \f4Supported Encodings\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document. +http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document. +.br +.br .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/orbd.1 --- a/jdk/src/solaris/doc/sun/man/man1/orbd.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/orbd.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,15 +19,12 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH orbd 1 "02 Jun 2010" +.TH orbd 1 "10 May 2011" .LP .SH "Name" orbd \- The Object Request Broker Daemon .LP -.RS 3 - -.LP .LP \f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. .LP @@ -36,13 +33,10 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,8 +48,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages: .LP @@ -77,7 +69,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "OPTIONS" .LP @@ -141,11 +133,11 @@ .na \f2CORBA objects\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The .na \f2name binding\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference. .LP .LP Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service. @@ -224,7 +216,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html. .LP .SH "Server Manager" .LP @@ -239,7 +231,7 @@ .na \f2sample tutorial\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application: .LP .LP Start \f2orbd\fP. @@ -362,7 +354,7 @@ .na \f2Naming Service\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html .br .TP 2 o diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/pack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/pack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/pack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH pack200 1 "02 Jun 2010" +.TH pack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line or in a properties file supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options. @@ -51,11 +46,8 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP The \f2pack200\fP tool is a Java application that transforms a JAR file into a compressed \f2pack200\fP file using the Java \f2gzip\fP compressor. The \f2pack200\fP files are highly compressed files that can be directly deployed, saving bandwidth and reducing download time. .LP @@ -65,83 +57,56 @@ .SS Typical usage: .LP -.RS 3 - -.LP .LP \f2% pack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, \f2myarchive.pack.gz\fP is produced using the default \f2pack200\fP settings. .LP .SH "OPTIONS" .LP - -.LP .LP \f4\-r \-\-repack\fP .LP -.RS 3 - -.LP .LP Produces a JAR file by packing the file \f2myarchive.jar\fP and unpacking it. The resulting file can be used as an input to the \f2jarsigner(1)\fP tool. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP .LP .LP \f2% pack200 \-\-repack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-g \-\-no\-gzip\fP .LP -.RS 3 - -.LP .LP Produces a \f2pack200\fP file. With this option a suitable compressor must be used, and the target system must use a corresponding decompresser. .LP -.RS 3 - -.LP .LP \f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP .LP -.RE -.RE .LP \f4\-G \-\-strip\-debug\fP .LP -.RS 3 - -.LP .LP Strips attributes used for debugging from the output. These include \f2SourceFile\fP, \f2LineNumberTable\fP, \f2LocalVariableTable\fP and \f2LocalVariableTypeTable\fP. Removing these attributes reduces the size of both downloads and installations but reduces the usefulness of debuggers. .LP -.RE +.LP +\f4\-\-keep\-file\-order\fP +.LP +.LP +Preserve the order of files in the input file; this is the default behavior. +.LP .LP \f4\-O \-\-no\-keep\-file\-order\fP .LP -.RS 3 - -.LP .LP The packer will reorder and transmit all elements. Additionally, the packer may remove JAR directory names. This will reduce the download size; however, certain JAR file optimizations, such as indexing, may not work correctly. .LP -.RE .LP \f4\-Svalue \-\-segment\-limit=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The value is the estimated target size N (in bytes) of each archive segment. If a single input file requires .br @@ -151,31 +116,23 @@ The size of each segment is estimated by counting the size of each input file to be transmitted in the segment, along with the size of its name and other transmitted properties. .LP .LP -The default is \f21000000\fP (a million bytes). This allows input JAR files of moderate size to be transmitted in one segment. It also puts a limit on memory requirements for packers and unpackers. +The default is \-1, which means the packer will always create a single segment output file. In cases where extremely large output files are generated, users are strongly encouraged to use segmenting or break up the input file into smaller JARs. .LP .LP A 10MB JAR packed without this limit will typically pack about 10% smaller, but the packer may require a larger Java heap (about ten times the segment limit). .LP -.RE .LP \f4\-Evalue \-\-effort=\fP\f2value\fP .LP -.RS 3 - -.LP .LP If the value is set to a single decimal digit, the packer will use the indicated amount of effort in compressing the archive. Level \f21\fP may produce somewhat larger size and faster compression speed, while level \f29\fP will take much longer but may produce better compression. The special value \f20\fP instructs the packer to copy through the original JAR file directly with no compression. The JSR 200 standard requires any unpacker to understand this special case as a pass\-through of the entire archive. .LP .LP The default is \f25\fP, investing a modest amount of time to produce reasonable compression. .LP -.RE .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Overrides the default, which preserves the input information, but may cause the transmitted archive to be larger. The possible values are: .LP @@ -195,13 +152,9 @@ .RE .LP -.RE .LP \f4\-mvalue \-\-modification\-time=\fP\f2value\fP .LP -.RS 3 - -.LP .LP The possible values are: .LP @@ -215,23 +168,15 @@ .RE .LP -.RE .LP \f4\-Pfile \-\-pass\-file=\fP\f2file\fP .LP -.RS 3 - -.LP .LP Indicates that a file should be passed through bytewise with no compression. By repeating the option, multiple files may be specified. There is no pathname transformation, except that the system file separator is replaced by the JAR file separator "\f2/\fP". The resulting file names must match exactly as strings with their occurrences in the JAR file. If file is a directory name, all files under that directory will be passed. .LP -.RE .LP \f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP .LP -.RS 3 - -.LP .LP Overrides the default behavior; i.e., the classfile containing the unknown attribute will be passed through with the specified action. The possible values for actions are: .LP @@ -248,7 +193,6 @@ .RE .LP -.RE .LP \f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP .br @@ -258,9 +202,6 @@ .br \f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP .LP -.RS 3 - -.LP .LP With the above four options, the attribute layout can be specified for a class entity, such as Class attribute, Field attribute, Method attribute, and Code attribute. The attribute\-name is the name of the attribute for which the layout or action is being defined. The possible values for action are: .LP @@ -282,19 +223,12 @@ .LP Example: \f2\-\-class\-attribute=CompilationID=pass\fP will cause the class file containing this attribute to be passed through without further action by the packer. .LP -.RE .LP \f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP .LP -.RS 3 - -.LP .LP A configuration file, containing Java properties to initialize the packer, may be specified on the command line. .LP -.RS 3 - -.LP .LP \f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP .br @@ -318,69 +252,53 @@ .br \f2segment.limit=\-1\fP .LP -.RE -.RE -.RS 3 - -.LP .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP .LP -\f4\-Joption\fP +Prints help information about this command. .LP -.RS 3 - +.LP +\f4\-V \-\-version\fP .LP .LP -Passes option to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP .LP -.RE -.RE +.LP +Passes \f2option\fP to the Java launcher called by \f2pack200\fP. For example, \f2\-J\-Xms48m\fP sets the startup memory to 48 megabytes. Although it does not begin with \f2\-X\fP, it is not a standard option of \f2pack200\fP. It is a common convention for \f2\-J\fP to pass options to the underlying VM executing applications written in Java. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP for successful completion; .LP .LP \f2>0\fP if an error occurs. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -392,13 +310,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -413,8 +331,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2pack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/policytool.1 --- a/jdk/src/solaris/doc/sun/man/man1/policytool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/policytool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH policytool 1 "02 Jun 2010" +.TH policytool 1 "10 May 2011" .LP .SH "Name" @@ -28,8 +28,6 @@ \f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI. .SH "SYNOPSIS" .LP - -.LP .RS 3 .TP 3 \ @@ -57,7 +55,7 @@ .na \f2the Policytool Users Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html. +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html. .SH "OPTIONS" .RS 3 .TP 3 @@ -67,22 +65,22 @@ .na \f2Default Policy Implementation and Syntax\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html .br .na \f2Policy Tool Users' Guide\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyGuide.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html .br .na \f2Security Permissions\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html .br .na \f2Security Overview\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/security/overview/jsoverview.html +http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html .br .RE .RE diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/rmic.1 --- a/jdk/src/solaris/doc/sun/man/man1/rmic.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/rmic.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmic 1 "02 Jun 2010" +.TH rmic 1 "10 May 2011" .LP .SH "Name" rmic \- The Java RMI Compiler .LP -.RS 3 - -.LP .LP \f3rmic\fP generates stub, skeleton, and tie classes for remote objects using either the JRMP or IIOP protocols. Also generates OMG IDL. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +41,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmic\fP compiler generates stub and skeleton class files (JRMP protocol) and stub and tie class files (IIOP protocol) for remote objects. These classes files are generated from compiled Java programming language classes that are remote object implementation classes. A remote implementation class is a class that implements the interface \f2java.rmi.Remote\fP. The class names in the \f3rmic\fP command must be for classes that have been compiled successfully with the \f3javac\fP command and must be fully package qualified. For example, running \f3rmic\fP on the class file name \f2HelloImpl\fP as shown here: .LP @@ -81,8 +73,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-bootclasspath path @@ -90,9 +80,6 @@ .TP 3 \-classpath path Specifies the path \f3rmic\fP uses to look up classes. This option overrides the default or the CLASSPATH environment variable if it is set. Directories are separated by colons. Thus the general format for \f2path\fP is: -.RS 3 - -.LP .nf \f3 .fl @@ -100,11 +87,7 @@ .fl \fP .fi -.RE For example: -.RS 3 - -.LP .nf \f3 .fl @@ -112,13 +95,9 @@ .fl \fP .fi -.RE .TP 3 \-d directory Specifies the root destination directory for the generated class hierarchy. You can use this option to specify a destination directory for the stub, skeleton, and tie files. For example, the command -.RS 3 - -.LP .nf \f3 .fl @@ -126,7 +105,6 @@ .fl \fP .fi -.RE would place the stub and skeleton classes derived from \f2MyClass\fP into the directory \f2/java/classes/foo\fP. If the \f2\-d\fP option is not specified, the default behavior is as if \f2"\-d\ ."\fP were specified: the package hierarchy of the target class is created in the current directory, and stub/tie/skeleton files are placed within it. (Note that in some previous versions of \f3rmic\fP, if \f2\-d\fP was not specified, then the package hierarchy was \f2not\fP created, and all of the output files were placed directly in the current directory.) .br \ @@ -136,16 +114,16 @@ .TP 3 \-g Enables generation of all debugging information, including local variables. By default, only line number information is generated. -.LP .TP 3 \-idl Causes \f2rmic\fP to generate OMG IDL for the classes specified and any classes referenced. IDL provides a purely declarative, programming language\-independent way of specifying an object's API. The IDL is used as a specification for methods and data that can be written in and invoked from any language that provides CORBA bindings. This includes Java and C++ among others. See the .na \f2Java Language to IDL Mapping\fP @ .fi -http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. -.LP -When the \f2\-idl\fP option is used, other options also include: +http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm (OMG) document for a complete description. +.br +.br +When the \f2\-idl\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -160,31 +138,22 @@ \-idlFile\ fromJavaPackage[.class]\ toIDLFile Specifies IDLEntity file mapping. For example:\ \f2\-idlFile test.pkg.X TEST16.idl\fP.\ .RE -.LP .TP 3 \-iiop -Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. -.LP +Causes \f2rmic\fP to generate IIOP stub and tie classes, rather than JRMP stub and skeleton classes. A stub class is a local proxy for a remote object and is used by clients to send calls to a server. Each remote interface requires a stub class, which implements that remote interface. A client's reference to a remote object is actually a reference to a stub. Tie classes are used on the server side to process incoming calls, and dispatch the calls to the proper implementation class. Each implementation class requires a tie class. +.br +.br Invoking \f2rmic\fP with the \f2\-iiop\fP generates stubs and ties that conform to this naming convention: -.RS 3 - -.LP .nf \f3 .fl _<implementationName>_stub.class .fl -\fP -.br -\f3 -.fl _<interfaceName>_tie.class .fl \fP .fi -.RE -.LP -When the \f2\-iiop\fP option is used, other options also include: +When the \f2\-iiop\fP option is used, other options also include: .RS 3 .TP 3 \-always or \-alwaysgenerate @@ -197,13 +166,11 @@ Must be used with the \f2\-idl\fP option. Prevents addition of \f2valuetype\fP methods and initializers to emitted IDL. These methods and initializers are optional for \f2valuetype\fPs, and are generated unless the \f2\-noValueMethods\fP option is specified when using the \f2\-idl\fP option. .TP 3 \-poa -Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. -.LP -The \f2PortableServer\fP module for the +Changes the inheritance from \f2org.omg.CORBA_2_3.portable.ObjectImpl\fP to \f2org.omg.PortableServer.Servant\fP. The \f2PortableServer\fP module for the .na \f2Portable Object Adapter\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. .RE .TP 3 \-J @@ -214,18 +181,18 @@ .TP 3 \-nowarn Turns off warnings. If used the compiler does not print out any warnings. -.LP +.TP 3 +\-nowrite +Does not write compiled classes to the file system. .TP 3 \-vcompat Generates stub and skeleton classes compatible with both the 1.1 and 1.2 JRMP stub protocol versions. (This option was the default in releases prior to 5.0.) The generated stub classes will use the 1.1 stub protocol version when loaded in a JDK 1.1 virtual machine and will use the 1.2 stub protocol version when loaded into a 1.2 (or later) virtual machine. The generated skeleton classes will support both 1.1 and 1.2 stub protocol versions. The generated classes are relatively large in order to support both modes of operation. .TP 3 \-verbose Causes the compiler and linker to print out messages about what classes are being compiled and what class files are being loaded. -.LP .TP 3 \-v1.1 Generates stub and skeleton classes for the 1.1 JRMP stub protocol version only. Note that this option is only useful for generating stub classes that are serialization\-compatible with pre\-existing, statically\-deployed stub classes that were generated by the \f3rmic\fP tool from JDK 1.1 and that cannot be upgraded (and dynamic class loading is not being used). -.LP .TP 3 \-v1.2 (default) Generates stub classes for the 1.2 JRMP stub protocol version only. No skeleton classes are generated with this option because skeleton classes are not used with the 1.2 stub protocol version. The generated stub classes will not work if they are loaded into a JDK 1.1 virtual machine. @@ -234,15 +201,10 @@ .LP .SH "ENVIRONMENT VARIABLES" .LP - -.LP .RS 3 .TP 3 CLASSPATH Used to provide the system a path to user\-defined classes. Directories are separated by colons. For example, -.RS 3 - -.LP .nf \f3 .fl @@ -251,18 +213,15 @@ \fP .fi .RE -.RE .LP .SH "SEE ALSO" .LP - -.LP .LP java(1), javac(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/rmid.1 --- a/jdk/src/solaris/doc/sun/man/man1/rmid.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/rmid.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1998, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmid 1 "02 Jun 2010" +.TH rmid 1 "10 May 2011" .LP .SH "Name" rmid \- The Java RMI Activation System Daemon .LP -.RS 3 - -.LP .LP \f3rmid\fP starts the activation system daemon that allows objects to be registered and activated in a virtual machine (VM). .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,18 +41,16 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmid\fP tool starts the activation system daemon. The activation system daemon must be started before activatable objects can be either registered with the activation system or activated in a VM. See the .na \f2Java RMI Specification\fP @ .fi -http://java.sun.com/javase/6/docs/platform/rmi/spec/rmiTOC.html and +http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and .na \f2Activation tutorials\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects. .LP .LP The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows: @@ -133,8 +125,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-C<someCommandLineOption> @@ -169,7 +159,6 @@ .TP 3 \-J\-Dsun.rmi.activation.execPolicy=<policy> Specifies the policy that \f2rmid\fP employs to check commands and command\-line options used to launch the VM in which an activation group runs. Please note that this option exists only in Sun's implementation of the Java RMI activation daemon. If this property is not specified on the command line, the result is the same as if \f2\-J\-Dsun.rmi.activation.execPolicy=default\fP were specified. The possible values of \f2<policy>\fP can be \f2default\fP, \f2<policyClassName>\fP, or \f2none\fP: -.LP .RS 3 .TP 2 o @@ -255,17 +244,9 @@ The third permission granted, an \f2ExecOptionPermission\fP, allows \f2rmid\fP to launch an activation group that defines the security policy file to be \f2/files/policies/group.policy\fP. The next permission allows the \f2java.security.debug\fP property to be used by an activation group. The last permission allows any property in the \f2sun.rmi\fP property name hierarchy to be used by activation groups. .LP To start \f2rmid\fP with a policy file, the \f2java.security.policy\fP property needs to be specified on \f2rmid\fP's command line, for example: -.RS 3 - .LP -.LP -\f2rmid \-J\-Djava.security.policy=rmid.policy\fP -.LP +\f2rmid \-J\-Djava.security.policy=rmid.policy\fP .RE -.RE -.TP 2 -o -.LP .TP 2 o \f4<policyClassName>\fP @@ -285,7 +266,6 @@ \fP .fi Before launching an activation group, \f2rmid\fP calls the policy's \f2checkExecCommand\fP method, passing it the activation group descriptor and an array containing the complete command to launch the activation group. If the \f2checkExecCommand\fP throws a \f2SecurityException\fP, \f2rmid\fP will not launch the activation group and an \f2ActivationException\fP will be thrown to the caller attempting to activate the object. -.LP .TP 2 o \f3none\fP @@ -318,9 +298,9 @@ \-stop Stops the current invocation of \f2rmid\fP, for a port specified by the \f2\-port\fP option. If no port is specified, it will stop the \f2rmid\fP running on port 1098. .RE -.SH "ENVIRONMENT VARIABLES" + .LP - +.SH "ENVIRONMENT VARIABLES" .LP .RS 3 .TP 3 @@ -338,13 +318,11 @@ .LP .SH "SEE ALSO" .LP - -.LP .LP rmic(1), .na \f2CLASSPATH\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath, java(1) +http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1) .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 --- a/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,19 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH rmiregistry 1 "02 Jun 2010" +.TH rmiregistry 1 "10 May 2011" .LP .SH "Name" rmiregistry \- The Java Remote Object Registry .LP .RS 3 +The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. +.RE .LP -.LP -The \f3rmiregistry\fP command starts a remote object registry on the specified port on the current host. -.LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -47,8 +43,6 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f3rmiregistry\fP command creates and starts a remote object registry on the specified \f2port\fP on the current host. If \f2port\fP is omitted, the registry is started on port 1099. The \f3rmiregistry\fP command produces no output and is typically run in the background. For example: .LP @@ -69,8 +63,6 @@ .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-J @@ -80,17 +72,12 @@ .LP .SH "SEE ALSO" .LP - -.LP -.LP java(1), .na \f2java.rmi.registry.LocateRegistry\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/registry/LocateRegistry.html and +http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and .na \f2java.rmi.Naming\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/rmi/Naming.html -.LP - +http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/schemagen.1 --- a/jdk/src/solaris/doc/sun/man/man1/schemagen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/schemagen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH schemagen 1 "02 Jun 2010" +.TH schemagen 1 "10 May 2011" .LP .SH "Name" @@ -30,8 +30,7 @@ .br \f3Implementation Version:\fP 2.1.3 .LP -.SS -Launching schemagen +.SH "Launching schemagen" .LP .LP The schema generator can be launched using the appropriate \f2schemagen\fP shell script in the \f2bin\fP directory for your platform. @@ -46,9 +45,6 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.RS 3 - -.LP .nf \f3 .fl @@ -58,19 +54,13 @@ .fl \fP .fi -.RE .LP .LP If your java sources/classes reference other classes, they must be accessable on your system CLASSPATH environment variable, or they need to be given to the tool by using the \f2\-classpath\fP/\f2\-cp\fP options. Otherwise you will see errors when generating your schema. .LP -.RS 3 - -.LP -\f3Command Line Options\fP -.LP -.RS 3 - +.SS +Command Line Options .LP .nf \f3 @@ -79,24 +69,29 @@ .fl .fl -Options: +Options: +.fl + \-d <path> : specify where to place processor and javac generated class files .fl - \-d <path> : Specify where to place processor and javac generated class files + \-cp <path> : specify where to find user specified files +.fl + \-classpath <path> : specify where to find user specified files .fl - \-cp <path> : Specify where to find user specified files + \-encoding <encoding> : specify encoding to be used for apt/javac invocation +.fl + .fl - \-classpath <path> : Specify where to find user specified files + \-episode <file> : generate episode file for separate compilation .fl - \-help : Display this usage message + \-version : display version information +.fl + \-help : display this usage message .fl \fP .fi -.RE .LP -.RE -.SS -Generated Resource Files +.SH "Generated Resource Files" .LP .LP The current schema generator simply creates a schema file for each namespace referenced in your Java classes. There is no way to control the name of the generated schema files at this time. For that purpose, use @@ -105,7 +100,8 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html. .LP -.SH "See Also" +.SH "Name" +See Also .LP .RS 3 .TP 2 @@ -124,7 +120,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/serialver.1 --- a/jdk/src/solaris/doc/sun/man/man1/serialver.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/serialver.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1997, 2011, 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 @@ -19,23 +19,17 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH serialver 1 "02 Jun 2010" +.TH serialver 1 "10 May 2011" .LP .SH "Name" serialver \- The Serial Version Command .LP -.RS 3 - -.LP .LP The \f3serialver\fP command returns the \f2serialVersionUID\fP. .LP -.RE .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -45,9 +39,6 @@ .LP .RS 3 - -.LP -.RS 3 .TP 3 options Command\-line options, as specified in this document. @@ -57,18 +48,13 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f3serialver\fP returns the \f2serialVersionUID\fP for one or more classes in a form suitable for copying into an evolving class. When invoked with no arguments it prints a usage line. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-classpath <directories and zip/jar files separated by :> @@ -88,36 +74,24 @@ .LP .SH "NOTES" .LP - -.LP .LP The \f3serialver\fP command loads and initializes the specified classes in its virtual machine, and by default, it does not set a security manager. If \f3serialver\fP is to be run with untrusted classes, a security manager can be set with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.manager\fP .LP -.RE .LP and, if necessary, a security policy can be specified with the following option: .LP -.RS 3 - -.LP .LP \f2\-J\-Djava.security.policy=<policy file>\fP .LP -.RE .SH "SEE ALSO" .LP - -.LP .LP .na \f2java.io.ObjectStreamClass\fP @ .fi -http://java.sun.com/javase/6/docs/api/java/io/ObjectStreamClass.html +http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/servertool.1 --- a/jdk/src/solaris/doc/sun/man/man1/servertool.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/servertool.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2001, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH servertool 1 "02 Jun 2010" +.TH servertool 1 "10 May 2011" .LP .SH "Name" servertool \- The Java(TM) IDL Server Tool .LP -.RS 3 - -.LP -\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. -.RE +\f3servertool\fP provides a command\-line interface for application programmers to register, unregister, startup, and shutdown a persistent server. .SH "SYNOPSIS" .LP - -.LP .nf \f3 .fl @@ -54,15 +48,11 @@ .LP .SH "DESCRIPTION" .LP - -.LP .LP The \f2servertool\fP provides the command\-line interface for the application programmers to register, unregister, startup, and shutdown a persistent server. Other commands are provided to obtain various statistical information about the server. .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-ORBInitialHost nameserverhost @@ -75,8 +65,6 @@ .LP .SH "COMMANDS" .LP - -.LP .RS 3 .TP 3 register \-server\ <server\ class\ name> \ \-classpath\ <classpath\ to\ server> [\ \-applicationName\ <application\ name> \-args\ <args\ to\ server> \-vmargs\ <flags\ to\ be\ passed\ to\ Java\ VM> \ ] @@ -122,6 +110,4 @@ .LP .SH "SEE ALSO" .LP - -.LP orbd(1) diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/tnameserv.1 --- a/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/tnameserv.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 1999, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH tnameserv 1 "02 Jun 2010" +.TH tnameserv 1 "10 May 2011" .LP .SH "Name" @@ -30,7 +30,7 @@ .na \f2Java IDL Naming Service Included with ORBD\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html topic. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic. .LP .LP Topics in this section include: @@ -120,11 +120,11 @@ .na \f2The Hello World Example Using RMI\-IIOP\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. +http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. .na \f2Java IDL: Running the Hello World Example on TWO Machines\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. +http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option. .LP .LP For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP. @@ -170,16 +170,12 @@ .LP This command\-line option is available for use with \f2tnameserve\fP: .RS 3 - -.LP -.RS 3 .TP 3 \-Joption Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying virtual machine. .RE .LP -.RE .SH "Stopping the Java\ IDL Transient Naming Service" .LP .LP @@ -190,28 +186,27 @@ .LP The following sample program illustrates how to add names to the namespace. It is a self\-contained Transient Naming Service client that creates the following simple tree. .LP -.nf -\f3 -.fl -\fP\f3 -.fl - \fP\f4Initial\fP\f3 -.fl - \fP\f4Naming Context\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - plans \fP\f4Personal\fP\f3 -.fl - / \\ -.fl - / \\ -.fl - calendar schedule\fP -.fl -.fi +.RS 3 +.TP 2 +o +\f4Initial Naming Context\fP +.RS 3 +.TP 2 +* +\f3plans\fP +.TP 2 +* +\f4Personal\fP +.RS 3 +.TP 2 +- +\f3calendar\fP +.TP 2 +- +\f3schedule\fP +.RE +.RE +.RE .LP .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/unpack200.1 --- a/jdk/src/solaris/doc/sun/man/man1/unpack200.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/unpack200.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2004, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH unpack200 1 "02 Jun 2010" +.TH unpack200 1 "10 May 2011" .LP .SH "Name" @@ -27,8 +27,6 @@ .LP .SH "SYNOPSIS" .LP - -.LP .LP \f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP .LP @@ -36,9 +34,6 @@ Options may be in any order. The last option on the command line supersedes all previously specified options. .LP .RS 3 - -.LP -.RS 3 .TP 3 input\-file Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker. @@ -48,107 +43,78 @@ .RE .LP -.RE .SH "DESCRIPTION" .LP - -.LP .LP \f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage: .LP -.RS 3 - -.LP .LP \f2% unpack200 myarchive.pack.gz myarchive.jar\fP .LP -.RE .LP In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings. .LP .SH "OPTIONS" .LP -.SS -Standard Options -.LP -.RS 3 - -.LP .LP \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP .LP -.RS 3 - -.LP .LP Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file. .LP -.RE -.RE -.SS -Non\-Standard Options -.LP -.RS 3 - -.LP .LP \f4\-r \-\-remove\-pack\-file\fP .LP -.RS 3 - -.LP .LP Removes the input packed file. .LP -.RE .LP \f4\-v \-\-verbose\fP .LP -.RS 3 - -.LP .LP Outputs minimal messages. Multiple specification of this option will output more verbose messages. .LP -.RE .LP \f4\-q \-\-quiet\fP .LP -.RS 3 - -.LP .LP Specifies quiet operation with no messages. .LP -.RE .LP \f4\-lfilename \-\-log\-file=\fP\f2filename\fP .LP -.RS 3 - -.LP .LP Specifies a log file to output messages. .LP -.RE -.RE +.LP +\f4\-? \-h \-\-help\fP +.LP +.LP +Prints help information about this command. +.LP +.LP +\f4\-V \-\-version\fP +.LP +.LP +Prints version information about this command. +.LP +.LP +\f4\-J\fP\f2option\fP +.LP +.LP +Passes \f2option\fP to the Java launcher called by \f2unpack200\fP. +.LP .SH "EXIT STATUS" .LP - -.LP .LP The following exit values are returned: .LP -.RS 3 - -.LP .LP \f2\ 0\fP if successful completion; .LP .LP \f2>0\fP if an error occurred. .LP -.RE .SH "SEE ALSO" .LP .RS 3 @@ -160,13 +126,13 @@ .na \f2Java SE Documentation\fP @ .fi -http://java.sun.com/javase/6/docs/index.html +http://download.oracle.com/javase/7/docs/index.html .TP 2 o .na \f2Java Deployment Guide \- Pack200\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html +http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html .TP 2 o jar(1) \- Java Archive Tool @@ -181,8 +147,6 @@ .LP .SH "NOTES" .LP - -.LP .LP This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products. .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/wsgen.1 --- a/jdk/src/solaris/doc/sun/man/man1/wsgen.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/wsgen.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,21 +19,15 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsgen 1 "02 Jun 2010" +.TH wsgen 1 "10 May 2011" .SH "Name" wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 -.RS 3 - -.LP .LP \f3Specification Version:\fP 2.1 .br \f3Implementation Version:\fP 2.1.1 .LP -.LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint implementation class (SEI) and generates all the required artifacts for web service deployment, and invocation -.LP -.RE .SH "Overview" .LP The \f2wsgen\fP tool generates JAX\-WS portable artifacts used in JAX\-WS web services. The tool reads a web service endpoint class and generates all the required artifacts for web service deployment, and invocation. JAXWS 2.1.1 RI also provides a wsgen ant task, see @@ -354,7 +348,7 @@ .nr 41 \n(80+(3*\n(38) .nr 81 +\n(41 .nr TW \n(81 -.if t .if \n(TW>\n(.li .tm Table at line 139 file Input is too wide - \n(TW units +.if t .if \n(TW>\n(.li .tm Table at line 133 file Input is too wide - \n(TW units .fc .nr #T 0-1 .nr #a 0-1 diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/wsimport.1 --- a/jdk/src/solaris/doc/sun/man/man1/wsimport.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/wsimport.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,7 +19,7 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH wsimport 1 "02 Jun 2010" +.TH wsimport 1 "10 May 2011" .SH "Name" wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0 .LP @@ -685,14 +685,295 @@ .fi https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html. .LP +The following table lists \f2wsimport\fP non\-standard options: +.LP +.TS +.if \n+(b.=1 .nr d. \n(.c-\n(c.-1 +.de 35 +.ps \n(.s +.vs \n(.vu +.in \n(.iu +.if \n(.u .fi +.if \n(.j .ad +.if \n(.j=0 .na +.. +.nf +.nr #~ 0 +.if n .nr #~ 0.6n +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.fc +.nr 33 \n(.s +.rm 80 81 +.nr 34 \n(.lu +.eo +.am 81 +.br +.di a+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Map headers not bound to request or response message to Java method parameters. +.br +.di +.nr a| \n(dn +.nr a- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di b+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +WSDL URI that specifies the file that contains authorization information; this URI is in the following format: http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl +.br +.di +.nr b| \n(dn +.nr b- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di c+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Print debugging information. +.br +.di +.nr c| \n(dn +.nr c- \n(dl +.. +.ec \ +.eo +.am 80 +.br +.di d+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(80 .ll \n(80u +.in 0 +\f3\-Xno\-addressing\-databinding\fP +.br +.di +.nr d| \n(dn +.nr d- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di e+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Enable binding of W3C \f2EndpointReferenceType\fP to Java. +.br +.di +.nr e| \n(dn +.nr e- \n(dl +.. +.ec \ +.eo +.am 81 +.br +.di f+ +.35 +.ft \n(.f +.ll \n(34u*1u/3u +.if \n(.l<\n(81 .ll \n(81u +.in 0 +Do not compile generated Java files. +.br +.di +.nr f| \n(dn +.nr f- \n(dl +.. +.ec \ +.35 +.nf +.ll \n(34u +.nr 80 0 +.nr 38 \w\f3Option\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-XadditionalHeaders\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xauthfile <file>\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xdebug\fP +.if \n(80<\n(38 .nr 80 \n(38 +.nr 38 \w\f3\-Xnocompile\fP +.if \n(80<\n(38 .nr 80 \n(38 +.80 +.rm 80 +.nr 38 \n(d- +.if \n(80<\n(38 .nr 80 \n(38 +.nr 81 0 +.nr 38 \w\f3Description\fP +.if \n(81<\n(38 .nr 81 \n(38 +.81 +.rm 81 +.nr 38 \n(a- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(b- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(c- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(e- +.if \n(81<\n(38 .nr 81 \n(38 +.nr 38 \n(f- +.if \n(81<\n(38 .nr 81 \n(38 +.35 +.nf +.ll \n(34u +.nr 38 1n +.nr 79 0 +.nr 40 \n(79+(0*\n(38) +.nr 80 +\n(40 +.nr 41 \n(80+(3*\n(38) +.nr 81 +\n(41 +.nr TW \n(81 +.if t .if \n(TW>\n(.li .tm Table at line 193 file Input is too wide - \n(TW units +.fc +.nr #T 0-1 +.nr #a 0-1 +.eo +.de T# +.ds #d .d +.if \(ts\n(.z\(ts\(ts .ds #d nl +.mk ## +.nr ## -1v +.ls 1 +.ls +.. +.ec +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3Option\fP\h'|\n(41u'\f3Description\fP +.ne \n(a|u+\n(.Vu +.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.a+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(b|u+\n(.Vu +.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.b+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(c|u+\n(.Vu +.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.c+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(d|u+\n(.Vu +.ne \n(e|u+\n(.Vu +.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v) +.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(40u +.in +\n(37u +.d+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.e+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.ne \n(f|u+\n(.Vu +.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v) +.ta \n(80u \n(81u +.nr 31 \n(.f +.nr 35 1m +\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u' +.mk ## +.nr 31 \n(## +.sp |\n(##u-1v +.nr 37 \n(41u +.in +\n(37u +.f+ +.in -\n(37u +.mk 32 +.if \n(32>\n(31 .nr 31 \n(32 +.sp |\n(31u +.fc +.nr T. 1 +.T# 1 +.35 +.rm a+ +.rm b+ +.rm c+ +.rm d+ +.rm e+ +.rm f+ +.TE +.if \n-(b.=0 .nr c. \n(.c-\n(d.-26 + +.LP .SH "Example" .nf \f3 .fl -\fP\f3wsimport \-p stockquote http://stockquote.xyz/quote?wsdl\fP +\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP .fl .fi .LP -This will generate the Java artifacts and compile them by importing the \f2http://stockquote.xyz/quote?wsdl\fP. +This will generate the Java artifacts and compile them by importing the \f2http://stockquote.example.com/quote?wsdl\fP. .br diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/doc/sun/man/man1/xjc.1 --- a/jdk/src/solaris/doc/sun/man/man1/xjc.1 Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/doc/sun/man/man1/xjc.1 Sat May 14 11:52:15 2011 -0700 @@ -1,4 +1,4 @@ -." Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +." Copyright (c) 2005, 2011, 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 @@ -19,19 +19,18 @@ ." or visit www.oracle.com if you need additional information or have any ." questions. ." -.TH xjc 1 "02 Jun 2010" +.TH xjc 1 "10 May 2011" .LP -.ad c .SH "Name" xjc \- Java(TM) Architecture for XML Binding .br -Binding Compiler +Binding Compiler +.LP .LP \f3Specification Version:\fP 2.1 .br -\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l - +\f3Reference Implementation (RI) Version:\fP 2.1.3 .LP .SH "Launching xjc" .LP @@ -42,84 +41,87 @@ .fi https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html. .LP -.RS 3 - -.LP .LP \f2% xjc \-help\fP .LP -.RE -\f3Output\fP -.LP -.RS 3 - +.SS +Output .LP .nf \f3 .fl -Usage: xjc [\-options ...] <schema_file/URL/dir> ... [\-b <bindinfo>] ... +Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ... +.fl +If dir is specified, all schema files in it will be compiled. +.fl +If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled. .fl Options: .fl - \-nv : do not perform strict validation of the input schema(s) + \-nv : do not perform strict validation of the input schema(s) .fl - \-extension : allow vendor extensions \- do not strictly follow the + \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec .fl - Compatibility Rules and App E.2 from the JAXB Spec + \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched .fl - \-b <file/dir> : specify external bindings files (each <file> must have its own \-b) + \-d <dir> : generated files will go into this directory +.fl + \-p <pkg> : specifies the target package .fl - If a directory is given, **/*.xjb is searched + \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort .fl - \-d <dir> : generated files will go into this directory + \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password .fl - \-p <pkg> : specifies the target package + \-classpath <arg> : specify where to find user class files .fl - \-httpproxy <proxy> : set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort + \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format .fl - \-httpproxyfile <file>: set the proxy string (same format as above). + \-readOnly : generated files will be in read\-only mode .fl - \-classpath <arg> : specify where to find user class files + \-npa : suppress generation of package level annotations (**/package\-info.java) +.fl + \-no\-header : suppress generation of a file header with timestamp .fl - \-catalog <file> : specify catalog files to resolve external entity references + \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features .fl - support TR9401, XCatalog, and OASIS XML Catalog format. + \-xmlschema : treat input as W3C XML Schema (default) .fl - \-readOnly : generated files will be in read\-only mode + \-relaxng : treat input as RELAX NG (experimental,unsupported) .fl - \-npa : suppress generation of package level annotations (**/package\-info.java) + \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) .fl - \-no\-header : suppress generation of a file header with timestamp + \-dtd : treat input as XML DTD (experimental,unsupported) .fl - \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features. + \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +.fl + \-verbose : be extra verbose .fl - \-xmlschema : treat input as W3C XML Schema (default) + \-quiet : suppress compiler output .fl - \-relaxng : treat input as RELAX NG (experimental,unsupported) + \-help : display this help message .fl - \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported) + \-version : display version information +.fl + .fl - \-dtd : treat input as XML DTD (experimental,unsupported) + .fl - \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported) +Extensions: .fl - \-verbose : be extra verbose + \-Xlocator : enable source location support for generated code .fl - \-quiet : suppress compiler output + \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword .fl - \-help : display this help message + \-mark\-generated : mark the generated code as @javax.annotation.Generated .fl - \-version : display version information + \-episode <FILE> : generate the episode file for separate compilation .fl \fP .fi -.RE .LP .SH "OPTIONS" .LP - -.LP .RS 3 .TP 3 \-nv @@ -129,15 +131,9 @@ By default, the XJC binding compiler strictly enforces the rules outlined in the Compatibility chapter of the JAXB Specification. Appendix E.2 defines a set of W3C XML Schema features that are not completely supported by JAXB v1.0. In some cases, you may be allowed to use them in the "\-extension" mode enabled by this switch. In the default (strict) mode, you are also limited to using only the binding customizations defined in the specification. By using the "\-extension" switch, you will be allowed to use the JAXB Vendor Extensions .TP 3 \-b <file> -Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: -.RS 3 - -.LP -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP +Specify one or more external binding files to process. (Each binding file must have its own \f2"\-b"\fP switch.) The syntax of the external binding files is extremely flexible. You may have a single binding file that contains customizations for multiple schemas or you can break the customizations into multiple bindings files: \f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings123.xjb\fP .br -\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP -.RE -In addition, the ordering of the schema files and binding files on the command line does not matter. +\f2xjc schema1.xsd schema2.xsd schema3.xsd \-b bindings1.xjb \-b bindings2.xjb \-b bindings3.xjb\fP In addition, the ordering of the schema files and binding files on the command line does not matter. .TP 3 \-d <dir> By default, the XJC binding compiler will generate the Java content classes in the current directory. Use this option to specify an alternate output directory. The output directory must already exist, the XJC binding compiler will not create it for you. @@ -199,12 +195,30 @@ <schema file/URL/dir> Specify one or more schema files to compile. If you specify a directory, then xjc will scan it for all schema files and compile them. .RE + +.LP .SS -Summary of Deprecated and Removed Command Line Options +Non\-Standard Command Line Options .LP .RS 3 +.TP 3 +\-Xlocator +Causes the generated code to expose SAX Locator information about the source XML in the Java bean instances after unmarshalling. +.TP 3 +\-Xsync\-methods +Causes all of the generated method signatures to include the \f2synchronized\fP keyword. +.TP 3 +\-mark\-generated +Mark the generated code with the annotation \f2@javax.annotation.Generated\fP. +.TP 3 +\-episode <file> +Generate the specified episode file for separate compilation. +.RE .LP +.SS +Deprecated and Removed Command Line Options +.LP .RS 3 .TP 3 \-host & \-port @@ -215,13 +229,9 @@ .TP 3 \-source The \-source compatibility switch was introduced in the first JAXB 2.0 Early Access release. We have decided to remove this switch from future releases of JAXB 2.0. If you need to generate 1.0.x code, please use an installation of the 1.0.x codebase. -.TP 3 -\-Xlocator & \-Xsync\-methods -These switches have been disabled for now. We plan on releasing this functionality as a separate download in the future. .RE .LP -.RE .SS Compiler Restrictions .LP @@ -280,7 +290,7 @@ .na \f2Java Architecture for XML Binding (JAXB)\fP @ .fi -http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html +http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html .RE .LP diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,332 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include <stdio.h> +#include <stdint.h> +#include <stdarg.h> +#include <unistd.h> +#include <errno.h> +#include <string.h> +#include <sys/resource.h> +#include <sys/types.h> +#include <dirent.h> +#include <stdlib.h> +#include <dlfcn.h> +#include <pthread.h> +#include "com_sun_management_UnixOperatingSystem.h" + +struct ticks { + uint64_t used; + uint64_t usedKernel; + uint64_t total; +}; + +typedef struct ticks ticks; + +typedef enum { + CPU_LOAD_VM_ONLY, + CPU_LOAD_GLOBAL, +} CpuLoadTarget; + +static struct perfbuf { + int nProcs; + ticks jvmTicks; + ticks cpuTicks; + ticks *cpus; +} counters; + +#define DEC_64 "%lld" + +static void next_line(FILE *f) { + while (fgetc(f) != '\n'); +} + +/** + * Return the total number of ticks since the system was booted. + * If the usedTicks parameter is not NULL, it will be filled with + * the number of ticks spent on actual processes (user, system or + * nice processes) since system boot. Note that this is the total number + * of "executed" ticks on _all_ CPU:s, that is on a n-way system it is + * n times the number of ticks that has passed in clock time. + * + * Returns a negative value if the reading of the ticks failed. + */ +static int get_totalticks(int which, ticks *pticks) { + FILE *fh; + uint64_t userTicks, niceTicks, systemTicks, idleTicks; + int n; + + if((fh = fopen("/proc/stat", "r")) == NULL) { + return -1; + } + + n = fscanf(fh, "cpu " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, + &userTicks, &niceTicks, &systemTicks, &idleTicks); + + // Move to next line + next_line(fh); + + //find the line for requested cpu faster to just iterate linefeeds? + if (which != -1) { + int i; + for (i = 0; i < which; i++) { + if (fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, &userTicks, &niceTicks, &systemTicks, &idleTicks) != 4) { + fclose(fh); + return -2; + } + next_line(fh); + } + n = fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64 "\n", + &userTicks, &niceTicks, &systemTicks, &idleTicks); + } + + fclose(fh); + if (n != 4) { + return -2; + } + + pticks->used = userTicks + niceTicks; + pticks->usedKernel = systemTicks; + pticks->total = userTicks + niceTicks + systemTicks + idleTicks; + + return 0; +} + +static int vread_statdata(const char *procfile, const char *fmt, va_list args) { + FILE *f; + int n; + char buf[2048]; + + if ((f = fopen(procfile, "r")) == NULL) { + return -1; + } + + if ((n = fread(buf, 1, sizeof(buf), f)) != -1) { + char *tmp; + + buf[n-1] = '\0'; + /** skip through pid and exec name. the exec name _could be wacky_ (renamed) and + * make scanf go mupp. + */ + if ((tmp = strrchr(buf, ')')) != NULL) { + // skip the ')' and the following space but check that the buffer is long enough + tmp += 2; + if (tmp < buf + n) { + n = vsscanf(tmp, fmt, args); + } + } + } + + fclose(f); + + return n; +} + +static int read_statdata(const char *procfile, const char *fmt, ...) { + int n; + va_list args; + + va_start(args, fmt); + n = vread_statdata(procfile, fmt, args); + va_end(args); + return n; +} + +/** read user and system ticks from a named procfile, assumed to be in 'stat' format then. */ +static int read_ticks(const char *procfile, uint64_t *userTicks, uint64_t *systemTicks) { + return read_statdata(procfile, "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "DEC_64" "DEC_64, + userTicks, systemTicks + ); +} + +/** + * Return the number of ticks spent in any of the processes belonging + * to the JVM on any CPU. + */ +static int get_jvmticks(ticks *pticks) { + uint64_t userTicks; + uint64_t systemTicks; + + if (read_ticks("/proc/self/stat", &userTicks, &systemTicks) < 0) { + return -1; + } + + // get the total + if (get_totalticks(-1, pticks) < 0) { + return -1; + } + + pticks->used = userTicks; + pticks->usedKernel = systemTicks; + + return 0; +} + +/** + * This method must be called first, before any data can be gathererd. + */ +int perfInit() { + static int initialized=1; + + if (!initialized) { + int i; + + int n = sysconf(_SC_NPROCESSORS_ONLN); + if (n <= 0) { + n = 1; + } + + counters.cpus = calloc(n,sizeof(ticks)); + if (counters.cpus != NULL) { + // For the CPU load + get_totalticks(-1, &counters.cpuTicks); + + for (i = 0; i < n; i++) { + get_totalticks(i, &counters.cpus[i]); + } + // For JVM load + get_jvmticks(&counters.jvmTicks); + initialized = 1; + } + } + + return initialized ? 0 : -1; +} + +#define MAX(a,b) (a>b?a:b) +#define MIN(a,b) (a<b?a:b) + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + +/** + * Return the load of the CPU as a double. 1.0 means the CPU process uses all + * available time for user or system processes, 0.0 means the CPU uses all time + * being idle. + * + * Returns a negative value if there is a problem in determining the CPU load. + */ + +static double get_cpuload_internal(int which, double *pkernelLoad, CpuLoadTarget target) { + uint64_t udiff, kdiff, tdiff; + ticks *pticks, tmp; + double user_load = -1.0; + int failed = 0; + + *pkernelLoad = 0.0; + + pthread_mutex_lock(&lock); + + if(perfInit() == 0) { + + if (target == CPU_LOAD_VM_ONLY) { + pticks = &counters.jvmTicks; + } else if (which == -1) { + pticks = &counters.cpuTicks; + } else { + pticks = &counters.cpus[which]; + } + + tmp = *pticks; + + if (target == CPU_LOAD_VM_ONLY) { + if (get_jvmticks(pticks) != 0) { + failed = 1; + } + } else if (get_totalticks(which, pticks) < 0) { + failed = 1; + } + + if(!failed) { + // seems like we sometimes end up with less kernel ticks when + // reading /proc/self/stat a second time, timing issue between cpus? + if (pticks->usedKernel < tmp.usedKernel) { + kdiff = 0; + } else { + kdiff = pticks->usedKernel - tmp.usedKernel; + } + tdiff = pticks->total - tmp.total; + udiff = pticks->used - tmp.used; + + if (tdiff == 0) { + user_load = 0; + } else { + if (tdiff < (udiff + kdiff)) { + tdiff = udiff + kdiff; + } + *pkernelLoad = (kdiff / (double)tdiff); + // BUG9044876, normalize return values to sane values + *pkernelLoad = MAX(*pkernelLoad, 0.0); + *pkernelLoad = MIN(*pkernelLoad, 1.0); + + user_load = (udiff / (double)tdiff); + user_load = MAX(user_load, 0.0); + user_load = MIN(user_load, 1.0); + } + } + } + pthread_mutex_unlock(&lock); + return user_load; +} + +double get_cpu_load(int which) { + double u, s; + u = get_cpuload_internal(which, &s, CPU_LOAD_GLOBAL); + if (u < 0) { + return -1.0; + } + // Cap total systemload to 1.0 + return MIN((u + s), 1.0); +} + +double get_process_load() { + double u, s; + u = get_cpuload_internal(-1, &s, CPU_LOAD_VM_ONLY); + if (u < 0) { + return -1.0; + } + return u + s; +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + if(perfInit() == 0) { + return get_cpu_load(-1); + } else { + return -1.0; + } +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + if(perfInit() == 0) { + return get_process_load(); + } else { + return -1.0; + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,241 @@ +/* + * Copyright (c) 2011, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include <fcntl.h> +#include <kstat.h> +#include <procfs.h> +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/sysinfo.h> +#include <sys/lwp.h> +#include <pthread.h> +#include <utmpx.h> +#include <dlfcn.h> +#include <sys/loadavg.h> +#include <jni.h> +#include "jvm.h" +#include "com_sun_management_UnixOperatingSystem.h" + +typedef struct { + kstat_t *kstat; + uint64_t last_idle; + uint64_t last_total; + double last_ratio; +} cpuload_t; + +static cpuload_t *cpu_loads = NULL; +static unsigned int num_cpus; +static kstat_ctl_t *kstat_ctrl = NULL; + +static void map_cpu_kstat_counters() { + kstat_t *kstat; + int i; + + // Get number of CPU(s) + if ((num_cpus = sysconf(_SC_NPROCESSORS_ONLN)) == -1) { + num_cpus = 1; + } + + // Data structure for saving CPU load + if ((cpu_loads = calloc(num_cpus,sizeof(cpuload_t))) == NULL) { + return; + } + + // Get kstat cpu_stat counters for every CPU + // (loop over kstat to find our cpu_stat(s) + i = 0; + for (kstat = kstat_ctrl->kc_chain; kstat != NULL; kstat = kstat->ks_next) { + if (strncmp(kstat->ks_module, "cpu_stat", 8) == 0) { + + if (kstat_read(kstat_ctrl, kstat, NULL) == -1) { + // Failed to initialize kstat for this CPU so ignore it + continue; + } + + if (i == num_cpus) { + // Found more cpu_stats than reported CPUs + break; + } + + cpu_loads[i++].kstat = kstat; + } + } +} + +static int init_cpu_kstat_counters() { + static int initialized = 0; + + // Concurrence in this method is prevented by the lock in + // the calling method get_cpu_load(); + if(!initialized) { + if ((kstat_ctrl = kstat_open()) != NULL) { + map_cpu_kstat_counters(); + initialized = 1; + } + } + return initialized ? 0 : -1; +} + +static void update_cpu_kstat_counters() { + if(kstat_chain_update(kstat_ctrl) != 0) { + free(cpu_loads); + map_cpu_kstat_counters(); + } +} + +int read_cpustat(cpuload_t *load, cpu_stat_t *cpu_stat) { + if (load->kstat == NULL) { + // no handle. + return -1; + } + if (kstat_read(kstat_ctrl, load->kstat, cpu_stat) == -1) { + // disabling for now, a kstat chain update is likely to happen next time + load->kstat = NULL; + return -1; + } + return 0; +} + +double get_single_cpu_load(unsigned int n) { + cpuload_t *load; + cpu_stat_t cpu_stat; + uint_t *usage; + uint64_t c_idle; + uint64_t c_total; + uint64_t d_idle; + uint64_t d_total; + int i; + + if (n >= num_cpus) { + return -1.0; + } + + load = &cpu_loads[n]; + if (read_cpustat(load, &cpu_stat) < 0) { + return -1.0; + } + + usage = cpu_stat.cpu_sysinfo.cpu; + c_idle = usage[CPU_IDLE]; + + for (c_total = 0, i = 0; i < CPU_STATES; i++) { + c_total += usage[i]; + } + + // Calculate diff against previous snapshot + d_idle = c_idle - load->last_idle; + d_total = c_total - load->last_total; + + /** update if weve moved */ + if (d_total > 0) { + // Save current values for next time around + load->last_idle = c_idle; + load->last_total = c_total; + load->last_ratio = (double) (d_total - d_idle) / d_total; + } + + return load->last_ratio; +} + +int get_info(const char *path, void *info, size_t s, off_t o) { + int fd; + int ret = 0; + if ((fd = open(path, O_RDONLY)) < 0) { + return -1; + } + if (pread(fd, info, s, o) != s) { + ret = -1; + } + close(fd); + return ret; +} + +#define MIN(a, b) ((a < b) ? a : b) + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + +/** + * Return the cpu load (0-1) for proc number 'which' (or average all if which == -1) + */ +double get_cpu_load(int which) { + double load =.0; + + pthread_mutex_lock(&lock); + if(init_cpu_kstat_counters()==0) { + + update_cpu_kstat_counters(); + + if (which == -1) { + unsigned int i; + double t; + + for (t = .0, i = 0; i < num_cpus; i++) { + t += get_single_cpu_load(i); + } + + // Cap total systemload to 1.0 + load = MIN((t / num_cpus), 1.0); + } else { + load = MIN(get_single_cpu_load(which), 1.0); + } + } else { + load = -1.0; + } + pthread_mutex_unlock(&lock); + + return load; +} + +/** + * Return the cpu load (0-1) for the current process (i.e the JVM) + * or -1.0 if the get_info() call failed + */ +double get_process_load(void) { + psinfo_t info; + + // Get the percentage of "recent cpu usage" from all the lwp:s in the JVM:s + // process. This is returned as a value between 0.0 and 1.0 multiplied by 0x8000. + if (get_info("/proc/self/psinfo",&info.pr_pctcpu, sizeof(info.pr_pctcpu), offsetof(psinfo_t, pr_pctcpu)) == 0) { + return (double) info.pr_pctcpu / 0x8000; + } + return -1.0; +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + return get_cpu_load(-1); +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + return get_process_load(); +} + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c --- a/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat May 14 11:52:15 2011 -0700 @@ -239,6 +239,13 @@ snd_pcm_close(handle); } +/** Workaround for cr 7033899, 7030629: + * dmix plugin doesn't like flush (snd_pcm_drop) when the buffer is empty + * (just opened, underruned or already flushed). + * Sometimes it causes PCM falls to -EBADFD error, + * sometimes causes bufferSize change. + * To prevent unnecessary flushes AlsaPcmInfo::isRunning & isFlushed are used. + */ /* ******* ALSA PCM INFO ******************** */ typedef struct tag_AlsaPcmInfo { snd_pcm_t* handle; @@ -248,6 +255,8 @@ int frameSize; // storage size in Bytes unsigned int periods; snd_pcm_uframes_t periodSize; + short int isRunning; // see comment above + short int isFlushed; // see comment above #ifdef GET_POSITION_METHOD2 // to be used exclusively by getBytePosition! snd_pcm_status_t* positionStatus; @@ -432,6 +441,9 @@ return NULL; } memset(info, 0, sizeof(AlsaPcmInfo)); + // initial values are: stopped, flushed + info->isRunning = 0; + info->isFlushed = 1; ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/); if (ret == 0) { @@ -587,6 +599,14 @@ || (state == SND_PCM_STATE_RUNNING) || (state == SND_PCM_STATE_XRUN) || (state == SND_PCM_STATE_SUSPENDED); + if (ret) { + info->isRunning = 1; + // source line should keep isFlushed value until Write() is called; + // for target data line reset it right now. + if (!isSource) { + info->isFlushed = 0; + } + } TRACE1("< DAUDIO_Start %s\n", ret?"success":"error"); return ret?TRUE:FALSE; } @@ -606,6 +626,7 @@ ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret)); return FALSE; } + info->isRunning = 0; TRACE0("< DAUDIO_Stop success\n"); return TRUE; } @@ -651,8 +672,7 @@ return -1; } return 1; - } - else if (err == -ESTRPIPE) { + } else if (err == -ESTRPIPE) { TRACE0("xrun_recovery: suspended.\n"); ret = snd_pcm_resume(info->handle); if (ret < 0) { @@ -667,11 +687,11 @@ return -1; } return 1; - } - else if (err == -EAGAIN) { + } else if (err == -EAGAIN) { TRACE0("xrun_recovery: EAGAIN try again flag.\n"); return 0; } + TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err)); return -1; } @@ -691,6 +711,7 @@ TRACE0("< DAUDIO_Write returning -1\n"); return -1; } + count = 2; // maximum number of trials to recover from underrun //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize); frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize); @@ -712,6 +733,12 @@ } } while (TRUE); //ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames); + + if (writtenFrames > 0) { + // reset "flushed" flag + info->isFlushed = 0; + } + ret = (int) (writtenFrames * info->frameSize); TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret); return ret; @@ -736,6 +763,11 @@ TRACE0("< DAUDIO_Read returning -1\n"); return -1; } + if (!info->isRunning && info->isFlushed) { + // PCM has nothing to read + return 0; + } + count = 2; // maximum number of trials to recover from error //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize); frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize); @@ -784,12 +816,22 @@ int ret; TRACE0("DAUDIO_Flush\n"); + + if (info->isFlushed) { + // nothing to drop + return 1; + } + ret = snd_pcm_drop(info->handle); if (ret != 0) { ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret)); return FALSE; } - ret = DAUDIO_Start(id, isSource); + + info->isFlushed = 1; + if (info->isRunning) { + ret = DAUDIO_Start(id, isSource); + } return ret; } @@ -800,7 +842,7 @@ int ret; state = snd_pcm_state(info->handle); - if (state == SND_PCM_STATE_XRUN) { + if (info->isFlushed || state == SND_PCM_STATE_XRUN) { // if in xrun state then we have the entire buffer available, // not 0 as alsa reports ret = info->bufferSizeInBytes; @@ -841,7 +883,7 @@ snd_pcm_state_t state; state = snd_pcm_state(info->handle); - if (state != SND_PCM_STATE_XRUN) { + if (!info->isFlushed && state != SND_PCM_STATE_XRUN) { #ifdef GET_POSITION_METHOD2 snd_timestamp_t* ts; snd_pcm_uframes_t framesAvail; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/sun/nio/ch/EPoll.c --- a/jdk/src/solaris/native/sun/nio/ch/EPoll.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/native/sun/nio/ch/EPoll.c Sat May 14 11:52:15 2011 -0700 @@ -34,55 +34,7 @@ #include <dlfcn.h> #include <unistd.h> #include <sys/types.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* epoll_wait(2) man page */ - -typedef union epoll_data { - void *ptr; - int fd; - __uint32_t u32; - __uint64_t u64; -} epoll_data_t; - -struct epoll_event { - __uint32_t events; /* Epoll events */ - epoll_data_t data; /* User data variable */ -} __attribute__ ((__packed__)); - -#ifdef __cplusplus -} -#endif - -/* - * epoll event notification is new in 2.6 kernel. As the offical build - * platform for the JDK is on a 2.4-based distribution then we must - * obtain the addresses of the epoll functions dynamically. - */ -typedef int (*epoll_create_t)(int size); -typedef int (*epoll_ctl_t) (int epfd, int op, int fd, struct epoll_event *event); -typedef int (*epoll_wait_t) (int epfd, struct epoll_event *events, int maxevents, int timeout); - -static epoll_create_t epoll_create_func; -static epoll_ctl_t epoll_ctl_func; -static epoll_wait_t epoll_wait_func; - - -JNIEXPORT void JNICALL -Java_sun_nio_ch_EPoll_init(JNIEnv *env, jclass this) -{ - epoll_create_func = (epoll_create_t) dlsym(RTLD_DEFAULT, "epoll_create"); - epoll_ctl_func = (epoll_ctl_t) dlsym(RTLD_DEFAULT, "epoll_ctl"); - epoll_wait_func = (epoll_wait_t) dlsym(RTLD_DEFAULT, "epoll_wait"); - - if ((epoll_create_func == NULL) || (epoll_ctl_func == NULL) || - (epoll_wait_func == NULL)) { - JNU_ThrowInternalError(env, "unable to get address of epoll functions, pre-2.6 kernel?"); - } -} +#include <sys/epoll.h> JNIEXPORT jint JNICALL Java_sun_nio_ch_EPoll_eventSize(JNIEnv* env, jclass this) @@ -108,7 +60,7 @@ * epoll_create expects a size as a hint to the kernel about how to * dimension internal structures. We can't predict the size in advance. */ - int epfd = (*epoll_create_func)(256); + int epfd = epoll_create(256); if (epfd < 0) { JNU_ThrowIOExceptionWithLastError(env, "epoll_create failed"); } @@ -125,7 +77,7 @@ event.events = events; event.data.fd = fd; - RESTARTABLE((*epoll_ctl_func)(epfd, (int)opcode, (int)fd, &event), res); + RESTARTABLE(epoll_ctl(epfd, (int)opcode, (int)fd, &event), res); return (res == 0) ? 0 : errno; } @@ -137,7 +89,7 @@ struct epoll_event *events = jlong_to_ptr(address); int res; - RESTARTABLE((*epoll_wait_func)(epfd, events, numfds, -1), res); + RESTARTABLE(epoll_wait(epfd, events, numfds, -1), res); if (res < 0) { JNU_ThrowIOExceptionWithLastError(env, "epoll_wait failed"); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c Sat May 14 11:52:15 2011 -0700 @@ -33,33 +33,10 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/poll.h> +#include <sys/inotify.h> #include "sun_nio_fs_LinuxWatchService.h" -/* inotify.h may not be available at build time */ -#ifdef __cplusplus -extern "C" { -#endif -struct inotify_event -{ - int wd; - uint32_t mask; - uint32_t cookie; - uint32_t len; - char name __flexarr; -}; -#ifdef __cplusplus -} -#endif - -typedef int inotify_init_func(void); -typedef int inotify_add_watch_func(int fd, const char* path, uint32_t mask); -typedef int inotify_rm_watch_func(int fd, uint32_t wd); - -inotify_init_func* my_inotify_init_func = NULL; -inotify_add_watch_func* my_inotify_add_watch_func = NULL; -inotify_rm_watch_func* my_inotify_rm_watch_func = NULL; - static void throwUnixException(JNIEnv* env, int errnum) { jobject x = JNU_NewObjectByName(env, "sun/nio/fs/UnixException", "(I)V", errnum); @@ -68,22 +45,6 @@ } } -JNIEXPORT void JNICALL -Java_sun_nio_fs_LinuxWatchService_init(JNIEnv *env, jclass clazz) -{ - my_inotify_init_func = (inotify_init_func*) - dlsym(RTLD_DEFAULT, "inotify_init"); - my_inotify_add_watch_func = - (inotify_add_watch_func*) dlsym(RTLD_DEFAULT, "inotify_add_watch"); - my_inotify_rm_watch_func = - (inotify_rm_watch_func*) dlsym(RTLD_DEFAULT, "inotify_rm_watch"); - - if ((my_inotify_init_func == NULL) || (my_inotify_add_watch_func == NULL) || - (my_inotify_rm_watch_func == NULL)) { - JNU_ThrowInternalError(env, "unable to get address of inotify functions"); - } -} - JNIEXPORT jint JNICALL Java_sun_nio_fs_LinuxWatchService_eventSize(JNIEnv *env, jclass clazz) { @@ -111,7 +72,7 @@ Java_sun_nio_fs_LinuxWatchService_inotifyInit (JNIEnv* env, jclass clazz) { - int ifd = (*my_inotify_init_func)(); + int ifd = inotify_init(); if (ifd == -1) { throwUnixException(env, errno); } @@ -125,7 +86,7 @@ int wfd = -1; const char* path = (const char*)jlong_to_ptr(address); - wfd = (*my_inotify_add_watch_func)((int)fd, path, mask); + wfd = inotify_add_watch((int)fd, path, mask); if (wfd == -1) { throwUnixException(env, errno); } @@ -136,7 +97,7 @@ Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch (JNIEnv* env, jclass clazz, jint fd, jint wd) { - int err = (*my_inotify_rm_watch_func)((int)fd, (int)wd); + int err = inotify_rm_watch((int)fd, (int)wd); if (err == -1) throwUnixException(env, errno); } @@ -166,7 +127,6 @@ res[1] = (jint)sp[1]; (*env)->SetIntArrayRegion(env, sv, 0, 2, &res[0]); } - } JNIEXPORT jint JNICALL @@ -190,6 +150,4 @@ } } return (jint)n; - - } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/com/sun/management/OperatingSystem.java --- a/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Sat May 14 11:52:15 2011 -0700 @@ -58,6 +58,8 @@ public native long getProcessCpuTime(); public native long getFreePhysicalMemorySize(); public native long getTotalPhysicalMemorySize(); + public native double getSystemCpuLoad(); + public native double getProcessCpuLoad(); static { initialize(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/java/lang/ProcessEnvironment.java --- a/jdk/src/windows/classes/java/lang/ProcessEnvironment.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/java/lang/ProcessEnvironment.java Sat May 14 11:52:15 2011 -0700 @@ -143,7 +143,7 @@ public void remove() { i.remove();} }; } - private static Map.Entry<String,String> checkedEntry (Object o) { + private static Map.Entry<String,String> checkedEntry(Object o) { Map.Entry<String,String> e = (Map.Entry<String,String>) o; nonNullString(e.getKey()); nonNullString(e.getValue()); @@ -285,7 +285,7 @@ return (Map<String,String>) theEnvironment.clone(); } - // Only for use by Runtime.exec(...String[]envp...) + // Only for use by ProcessBuilder.environment(String[] envp) static Map<String,String> emptyEnvironment(int capacity) { return new ProcessEnvironment(capacity); } @@ -299,19 +299,46 @@ Collections.sort(list, entryComparator); StringBuilder sb = new StringBuilder(size()*30); - for (Map.Entry<String,String> e : list) - sb.append(e.getKey()) - .append('=') - .append(e.getValue()) - .append('\u0000'); - // Ensure double NUL termination, - // even if environment is empty. - if (sb.length() == 0) + int cmp = -1; + + // Some versions of MSVCRT.DLL require SystemRoot to be set. + // So, we make sure that it is always set, even if not provided + // by the caller. + final String SYSTEMROOT = "SystemRoot"; + + for (Map.Entry<String,String> e : list) { + String key = e.getKey(); + String value = e.getValue(); + if (cmp < 0 && (cmp = nameComparator.compare(key, SYSTEMROOT)) > 0) { + // Not set, so add it here + addToEnvIfSet(sb, SYSTEMROOT); + } + addToEnv(sb, key, value); + } + if (cmp < 0) { + // Got to end of list and still not found + addToEnvIfSet(sb, SYSTEMROOT); + } + if (sb.length() == 0) { + // Environment was empty and SystemRoot not set in parent sb.append('\u0000'); + } + // Block is double NUL terminated sb.append('\u0000'); return sb.toString(); } + // add the environment variable to the child, if it exists in parent + private static void addToEnvIfSet(StringBuilder sb, String name) { + String s = getenv(name); + if (s != null) + addToEnv(sb, name, s); + } + + private static void addToEnv(StringBuilder sb, String name, String val) { + sb.append(name).append('=').append(val).append('\u0000'); + } + static String toEnvironmentBlock(Map<String,String> map) { return map == null ? null : ((ProcessEnvironment)map).toEnvironmentBlock(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java --- a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java Sat May 14 11:52:15 2011 -0700 @@ -830,7 +830,14 @@ if( -1 == iStartOffset ){ throw new IOException(FAILURE_MSG + "invalid HTML format."); } - iReadCount = bufferedStream.skip(iStartOffset); + + int curOffset = 0; + while (curOffset < iStartOffset){ + curOffset += bufferedStream.skip(iStartOffset - curOffset); + } + + iReadCount = curOffset; + if( iStartOffset != iReadCount ){ throw new IOException(FAILURE_MSG + "Byte stream ends in description."); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java --- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -30,12 +30,15 @@ package sun.security.krb5.internal.tools; +import java.io.File; import sun.security.krb5.*; import sun.security.krb5.internal.*; import sun.security.krb5.internal.ccache.*; import java.io.IOException; import java.util.Arrays; +import javax.security.auth.kerberos.KerberosPrincipal; import sun.security.util.Password; +import javax.security.auth.kerberos.KeyTab; /** * Kinit tool for obtaining Kerberos v5 tickets. @@ -153,7 +156,6 @@ System.out.println("Principal is " + principal); } char[] psswd = options.password; - EncryptionKey[] skeys = null; boolean useKeytab = options.useKeytabFile(); if (!useKeytab) { if (princName == null) { @@ -186,17 +188,9 @@ } } - // assert princName and principal are nonnull - skeys = EncryptionKey.acquireSecretKeys(principal, ktabName); - - if (skeys == null || skeys.length == 0) { - String msg = "No supported key found in keytab"; - if (princName != null) { - msg += " for principal " + princName; - } - throw new KrbException(msg); - } - builder = new KrbAsReqBuilder(principal, skeys); + builder = new KrbAsReqBuilder(principal, ktabName == null + ? KeyTab.getInstance() + : KeyTab.getInstance(new File(ktabName))); } KDCOptions opt = new KDCOptions(); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java --- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,16 +95,15 @@ } break; case 'k': - if (klist.name == null) { - klist.target = KeyTab.getInstance(); - klist.name = KeyTab.tabName(); - } else klist.target = KeyTab.getInstance(klist.name); - if (klist.target != null) { - klist.displayTab(); - } else { + try { + KeyTab ktab = KeyTab.getInstance(klist.name); + klist.target = ktab; + klist.name = ktab.tabName(); + } catch (Exception e) { klist.displayMessage("KeyTab"); System.exit(-1); } + klist.displayTab(); break; default: if (klist.name != null) { @@ -295,9 +294,10 @@ void displayMessage(String target) { if (name == null) { - name = ""; + System.out.println("Default " + target + " not found."); + } else { + System.out.println(target + " " + name + " not found."); } - System.out.println(target + " " + name + " not found."); } /** * Reformats the date from the form - diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java --- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -321,7 +321,7 @@ * Lists key table name and entries in it. */ void listKt() { - System.out.println("Keytab name: " + KeyTab.tabName()); + System.out.println("Keytab name: " + table.tabName()); KeyTabEntry[] entries = table.getEntries(); if ((entries != null) && (entries.length > 0)) { String[][] output = new String[entries.length+1][showTime?3:2]; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/KeyStore.java --- a/jdk/src/windows/classes/sun/security/mscapi/KeyStore.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/KeyStore.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -31,6 +31,7 @@ import java.io.OutputStream; import java.math.BigInteger; import java.security.AccessController; +import java.security.InvalidKeyException; import java.security.KeyStoreSpi; import java.security.KeyStoreException; import java.security.UnrecoverableKeyException; @@ -123,6 +124,7 @@ * Sets the private key for the keystore entry. */ void setPrivateKey(RSAPrivateCrtKey key) + throws InvalidKeyException, KeyStoreException { byte[] modulusBytes = key.getModulus().toByteArray(); @@ -158,7 +160,7 @@ * Sets the certificate chain for the keystore entry. */ void setCertificateChain(X509Certificate[] chain) - throws CertificateException + throws CertificateException, KeyStoreException { for (int i = 0; i < chain.length; i++) { byte[] encoding = chain[i].getEncoded(); @@ -404,13 +406,16 @@ } entry.setAlias(alias); - entry.setPrivateKey((RSAPrivateCrtKey) key); try { + entry.setPrivateKey((RSAPrivateCrtKey) key); entry.setCertificateChain((X509Certificate[]) chain); } catch (CertificateException ce) { throw new KeyStoreException(ce); + + } catch (InvalidKeyException ike) { + throw new KeyStoreException(ike); } } else { @@ -537,7 +542,7 @@ removeCertificate(getName(), alias, encoding, encoding.length); - } catch (CertificateEncodingException e) { + } catch (CertificateException e) { throw new KeyStoreException("Cannot remove entry: " + e); } @@ -754,8 +759,14 @@ // Clear all key entries entries.clear(); - // Load keys and/or certificate chains - loadKeysOrCertificateChains(getName(), entries); + try { + + // Load keys and/or certificate chains + loadKeysOrCertificateChains(getName(), entries); + + } catch (KeyStoreException e) { + throw new IOException(e); + } } /** @@ -868,7 +879,7 @@ * @param entries Collection of key/certificate. */ private native void loadKeysOrCertificateChains(String name, - Collection<KeyEntry> entries); + Collection<KeyEntry> entries) throws KeyStoreException; /** * Stores a DER-encoded certificate into the certificate store @@ -879,7 +890,7 @@ */ private native void storeCertificate(String name, String alias, byte[] encoding, int encodingLength, long hCryptProvider, - long hCryptKey); + long hCryptKey) throws CertificateException, KeyStoreException; /** * Removes the certificate from the certificate store @@ -889,14 +900,16 @@ * @param encoding DER-encoded certificate. */ private native void removeCertificate(String name, String alias, - byte[] encoding, int encodingLength); + byte[] encoding, int encodingLength) + throws CertificateException, KeyStoreException; /** * Destroys the key container. * * @param keyContainerName The name of the key container. */ - private native void destroyKeyContainer(String keyContainerName); + private native void destroyKeyContainer(String keyContainerName) + throws KeyStoreException; /** * Generates a private-key BLOB from a key's components. @@ -910,8 +923,8 @@ byte[] primeQ, byte[] exponentP, byte[] exponentQ, - byte[] crtCoefficient); + byte[] crtCoefficient) throws InvalidKeyException; private native RSAPrivateKey storePrivateKey(byte[] keyBlob, - String keyContainerName, int keySize); + String keyContainerName, int keySize) throws KeyStoreException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSACipher.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -25,6 +25,7 @@ package sun.security.mscapi; +import java.math.BigInteger; import java.security.*; import java.security.Key; import java.security.interfaces.*; @@ -33,6 +34,8 @@ import javax.crypto.*; import javax.crypto.spec.*; +import sun.security.rsa.RSAKeyFactory; + /** * RSA cipher implementation using the Microsoft Crypto API. * Supports RSA en/decryption and signing/verifying using PKCS#1 v1.5 padding. @@ -189,8 +192,43 @@ default: throw new InvalidKeyException("Unknown mode: " + opmode); } + if (!(key instanceof sun.security.mscapi.Key)) { - throw new InvalidKeyException("Unsupported key type: " + key); + if (key instanceof java.security.interfaces.RSAPublicKey) { + java.security.interfaces.RSAPublicKey rsaKey = + (java.security.interfaces.RSAPublicKey) key; + + // Convert key to MSCAPI format + + BigInteger modulus = rsaKey.getModulus(); + BigInteger exponent = rsaKey.getPublicExponent(); + + // Check against the local and global values to make sure + // the sizes are ok. Round up to the nearest byte. + RSAKeyFactory.checkKeyLengths(((modulus.bitLength() + 7) & ~7), + exponent, -1, RSAKeyPairGenerator.KEY_SIZE_MAX); + + byte[] modulusBytes = modulus.toByteArray(); + byte[] exponentBytes = exponent.toByteArray(); + + // Adjust key length due to sign bit + int keyBitLength = (modulusBytes[0] == 0) + ? (modulusBytes.length - 1) * 8 + : modulusBytes.length * 8; + + byte[] keyBlob = RSASignature.generatePublicKeyBlob( + keyBitLength, modulusBytes, exponentBytes); + + try { + key = RSASignature.importPublicKey(keyBlob, keyBitLength); + + } catch (KeyStoreException e) { + throw new InvalidKeyException(e); + } + + } else { + throw new InvalidKeyException("Unsupported key type: " + key); + } } if (key instanceof PublicKey) { @@ -358,6 +396,10 @@ if (key instanceof sun.security.mscapi.Key) { return ((sun.security.mscapi.Key) key).bitLength(); + + } else if (key instanceof RSAKey) { + return ((RSAKey) key).getModulus().bitLength(); + } else { throw new InvalidKeyException("Unsupported key type: " + key); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -105,14 +105,20 @@ // generate the keypair. See JCA doc public KeyPair generateKeyPair() { - // Generate each keypair in a unique key container - RSAKeyPair keys = - generateRSAKeyPair(keySize, - "{" + UUID.randomUUID().toString() + "}"); + try { - return new KeyPair(keys.getPublic(), keys.getPrivate()); + // Generate each keypair in a unique key container + RSAKeyPair keys = + generateRSAKeyPair(keySize, + "{" + UUID.randomUUID().toString() + "}"); + + return new KeyPair(keys.getPublic(), keys.getPrivate()); + + } catch (KeyException e) { + throw new ProviderException(e); + } } private static native RSAKeyPair generateRSAKeyPair(int keySize, - String keyContainerName); + String keyContainerName) throws KeyException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSAPublicKey.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,9 @@ import java.math.BigInteger; import java.security.InvalidKeyException; +import java.security.KeyException; import java.security.KeyRep; +import java.security.ProviderException; import java.security.PublicKey; import sun.security.rsa.RSAPublicKeyImpl; @@ -89,9 +91,14 @@ public BigInteger getPublicExponent() { if (exponent == null) { - publicKeyBlob = getPublicKeyBlob(hCryptKey); - exponent = new BigInteger(getExponent(publicKeyBlob)); + try { + publicKeyBlob = getPublicKeyBlob(hCryptKey); + exponent = new BigInteger(1, getExponent(publicKeyBlob)); + + } catch (KeyException e) { + throw new ProviderException(e); + } } return exponent; @@ -103,8 +110,14 @@ public BigInteger getModulus() { if (modulus == null) { - publicKeyBlob = getPublicKeyBlob(hCryptKey); - modulus = new BigInteger(getModulus(publicKeyBlob)); + + try { + publicKeyBlob = getPublicKeyBlob(hCryptKey); + modulus = new BigInteger(1, getModulus(publicKeyBlob)); + + } catch (KeyException e) { + throw new ProviderException(e); + } } return modulus; @@ -147,7 +160,7 @@ encoding = new RSAPublicKeyImpl(getModulus(), getPublicExponent()).getEncoded(); - } catch (InvalidKeyException e) { + } catch (KeyException e) { // ignore } } @@ -164,15 +177,15 @@ /* * Returns the Microsoft CryptoAPI representation of the key. */ - private native byte[] getPublicKeyBlob(long hCryptKey); + private native byte[] getPublicKeyBlob(long hCryptKey) throws KeyException; /* * Returns the key's public exponent (in big-endian 2's complement format). */ - private native byte[] getExponent(byte[] keyBlob); + private native byte[] getExponent(byte[] keyBlob) throws KeyException; /* * Returns the key's modulus (in big-endian 2's complement format). */ - private native byte[] getModulus(byte[] keyBlob); + private native byte[] getModulus(byte[] keyBlob) throws KeyException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/RSASignature.java --- a/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -31,6 +31,7 @@ import java.security.InvalidKeyException; import java.security.InvalidParameterException; import java.security.InvalidAlgorithmParameterException; +import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.ProviderException; import java.security.MessageDigest; @@ -48,11 +49,20 @@ * Objects should be instantiated by calling Signature.getInstance() using the * following algorithm names: * + * . "NONEwithRSA" * . "SHA1withRSA" + * . "SHA256withRSA" + * . "SHA384withRSA" + * . "SHA512withRSA" * . "MD5withRSA" * . "MD2withRSA" * - * Note: RSA keys must be at least 512 bits long + * NOTE: RSA keys must be at least 512 bits long. + * + * NOTE: NONEwithRSA must be supplied with a pre-computed message digest. + * Only the following digest algorithms are supported: MD5, SHA-1, + * SHA-256, SHA-384, SHA-512 and a special-purpose digest algorithm + * which is a concatenation of SHA-1 and MD5 digests. * * @since 1.6 * @author Stanley Man-Kit Ho @@ -62,7 +72,10 @@ // message digest implementation we use private final MessageDigest messageDigest; - // flag indicating whether the digest is reset + // message digest name + private String messageDigestAlgorithm; + + // flag indicating whether the digest has been reset private boolean needsReset; // the signing key @@ -71,11 +84,23 @@ // the verification key private Key publicKey = null; + /** + * Constructs a new RSASignature. Used by Raw subclass. + */ + RSASignature() { + messageDigest = null; + messageDigestAlgorithm = null; + } + /** + * Constructs a new RSASignature. Used by subclasses. + */ RSASignature(String digestName) { try { messageDigest = MessageDigest.getInstance(digestName); + // Get the digest's canonical name + messageDigestAlgorithm = messageDigest.getAlgorithm(); } catch (NoSuchAlgorithmException e) { throw new ProviderException(e); @@ -84,12 +109,118 @@ needsReset = false; } + // Nested class for NONEwithRSA signatures + public static final class Raw extends RSASignature { + + // the longest supported digest is 512 bits (SHA-512) + private static final int RAW_RSA_MAX = 64; + + private final byte[] precomputedDigest; + private int offset = 0; + + public Raw() { + precomputedDigest = new byte[RAW_RSA_MAX]; + } + + // Stores the precomputed message digest value. + @Override + protected void engineUpdate(byte b) throws SignatureException { + if (offset >= precomputedDigest.length) { + offset = RAW_RSA_MAX + 1; + return; + } + precomputedDigest[offset++] = b; + } + + // Stores the precomputed message digest value. + @Override + protected void engineUpdate(byte[] b, int off, int len) + throws SignatureException { + if (offset + len > precomputedDigest.length) { + offset = RAW_RSA_MAX + 1; + return; + } + System.arraycopy(b, off, precomputedDigest, offset, len); + offset += len; + } + + // Stores the precomputed message digest value. + @Override + protected void engineUpdate(ByteBuffer byteBuffer) { + int len = byteBuffer.remaining(); + if (len <= 0) { + return; + } + if (offset + len > precomputedDigest.length) { + offset = RAW_RSA_MAX + 1; + return; + } + byteBuffer.get(precomputedDigest, offset, len); + offset += len; + } + + @Override + protected void resetDigest(){ + offset = 0; + } + + // Returns the precomputed message digest value. + @Override + protected byte[] getDigestValue() throws SignatureException { + if (offset > RAW_RSA_MAX) { + throw new SignatureException("Message digest is too long"); + } + + // Determine the digest algorithm from the digest length + if (offset == 20) { + setDigestName("SHA1"); + } else if (offset == 36) { + setDigestName("SHA1+MD5"); + } else if (offset == 32) { + setDigestName("SHA-256"); + } else if (offset == 48) { + setDigestName("SHA-384"); + } else if (offset == 64) { + setDigestName("SHA-512"); + } else if (offset == 16) { + setDigestName("MD5"); + } else { + throw new SignatureException( + "Message digest length is not supported"); + } + + byte[] result = new byte[offset]; + System.arraycopy(precomputedDigest, 0, result, 0, offset); + offset = 0; + + return result; + } + } + public static final class SHA1 extends RSASignature { public SHA1() { super("SHA1"); } } + public static final class SHA256 extends RSASignature { + public SHA256() { + super("SHA-256"); + } + } + + public static final class SHA384 extends RSASignature { + public SHA384() { + super("SHA-384"); + } + } + + public static final class SHA512 extends RSASignature { + public SHA512() { + super("SHA-512"); + } + } + public static final class MD5 extends RSASignature { public MD5() { super("MD5"); @@ -102,16 +233,7 @@ } } - /** - * Initializes this signature object with the specified - * public key for verification operations. - * - * @param publicKey the public key of the identity whose signature is - * going to be verified. - * - * @exception InvalidKeyException if the key is improperly - * encoded, parameters are missing, and so on. - */ + // initialize for signing. See JCA doc protected void engineInitVerify(PublicKey key) throws InvalidKeyException { @@ -146,30 +268,23 @@ byte[] keyBlob = generatePublicKeyBlob( keyBitLength, modulusBytes, exponentBytes); - publicKey = importPublicKey(keyBlob, keyBitLength); + try { + publicKey = importPublicKey(keyBlob, keyBitLength); + + } catch (KeyStoreException e) { + throw new InvalidKeyException(e); + } } else { publicKey = (sun.security.mscapi.RSAPublicKey) key; } - if (needsReset) { - messageDigest.reset(); - needsReset = false; - } + this.privateKey = null; + resetDigest(); } - /** - * Initializes this signature object with the specified - * private key for signing operations. - * - * @param privateKey the private key of the identity whose signature - * will be generated. - * - * @exception InvalidKeyException if the key is improperly - * encoded, parameters are missing, and so on. - */ - protected void engineInitSign(PrivateKey key) - throws InvalidKeyException + // initialize for signing. See JCA doc + protected void engineInitSign(PrivateKey key) throws InvalidKeyException { // This signature accepts only RSAPrivateKey if ((key instanceof sun.security.mscapi.RSAPrivateKey) == false) { @@ -183,12 +298,29 @@ null, RSAKeyPairGenerator.KEY_SIZE_MIN, RSAKeyPairGenerator.KEY_SIZE_MAX); + this.publicKey = null; + resetDigest(); + } + + /** + * Resets the message digest if needed. + */ + protected void resetDigest() { if (needsReset) { messageDigest.reset(); needsReset = false; } } + protected byte[] getDigestValue() throws SignatureException { + needsReset = false; + return messageDigest.digest(); + } + + protected void setDigestName(String name) { + messageDigestAlgorithm = name; + } + /** * Updates the data to be signed or verified * using the specified byte. @@ -248,13 +380,15 @@ */ protected byte[] engineSign() throws SignatureException { - byte[] hash = messageDigest.digest(); - needsReset = false; + byte[] hash = getDigestValue(); + + // Omit the hash OID when generating a Raw signature + boolean noHashOID = this instanceof Raw; // Sign hash using MS Crypto APIs - byte[] result = signHash(hash, hash.length, - messageDigest.getAlgorithm(), privateKey.getHCryptProvider(), + byte[] result = signHash(noHashOID, hash, hash.length, + messageDigestAlgorithm, privateKey.getHCryptProvider(), privateKey.getHCryptKey()); // Convert signature array from little endian to big endian @@ -282,8 +416,8 @@ * Sign hash using Microsoft Crypto API with HCRYPTKEY. * The returned data is in little-endian. */ - private native static byte[] signHash(byte[] hash, int hashSize, - String hashAlgorithm, long hCryptProv, long hCryptKey) + private native static byte[] signHash(boolean noHashOID, byte[] hash, + int hashSize, String hashAlgorithm, long hCryptProv, long hCryptKey) throws SignatureException; /** @@ -308,11 +442,10 @@ protected boolean engineVerify(byte[] sigBytes) throws SignatureException { - byte[] hash = messageDigest.digest(); - needsReset = false; + byte[] hash = getDigestValue(); return verifySignedHash(hash, hash.length, - messageDigest.getAlgorithm(), convertEndianArray(sigBytes), + messageDigestAlgorithm, convertEndianArray(sigBytes), sigBytes.length, publicKey.getHCryptProvider(), publicKey.getHCryptKey()); } @@ -379,11 +512,15 @@ /** * Generates a public-key BLOB from a key's components. */ - private native byte[] generatePublicKeyBlob( - int keyBitLength, byte[] modulus, byte[] publicExponent); + // used by RSACipher + static native byte[] generatePublicKeyBlob( + int keyBitLength, byte[] modulus, byte[] publicExponent) + throws InvalidKeyException; /** * Imports a public-key BLOB. */ - private native RSAPublicKey importPublicKey(byte[] keyBlob, int keySize); + // used by RSACipher + static native RSAPublicKey importPublicKey(byte[] keyBlob, int keySize) + throws KeyStoreException; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java --- a/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -79,22 +79,40 @@ /* * Signature engines */ + // NONEwithRSA must be supplied with a pre-computed message digest. + // Only the following digest algorithms are supported: MD5, SHA-1, + // SHA-256, SHA-384, SHA-512 and a special-purpose digest algorithm + // which is a concatenation of SHA-1 and MD5 digests. + map.put("Signature.NONEwithRSA", + "sun.security.mscapi.RSASignature$Raw"); map.put("Signature.SHA1withRSA", "sun.security.mscapi.RSASignature$SHA1"); + map.put("Signature.SHA256withRSA", + "sun.security.mscapi.RSASignature$SHA256"); + map.put("Signature.SHA384withRSA", + "sun.security.mscapi.RSASignature$SHA384"); + map.put("Signature.SHA512withRSA", + "sun.security.mscapi.RSASignature$SHA512"); map.put("Signature.MD5withRSA", "sun.security.mscapi.RSASignature$MD5"); map.put("Signature.MD2withRSA", "sun.security.mscapi.RSASignature$MD2"); // supported key classes + map.put("Signature.NONEwithRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); map.put("Signature.SHA1withRSA SupportedKeyClasses", "sun.security.mscapi.Key"); + map.put("Signature.SHA256withRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); + map.put("Signature.SHA384withRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); + map.put("Signature.SHA512withRSA SupportedKeyClasses", + "sun.security.mscapi.Key"); map.put("Signature.MD5withRSA SupportedKeyClasses", "sun.security.mscapi.Key"); map.put("Signature.MD2withRSA SupportedKeyClasses", "sun.security.mscapi.Key"); - map.put("Signature.NONEwithRSA SupportedKeyClasses", - "sun.security.mscapi.Key"); /* * Key Pair Generator engines diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/com/sun/management/OperatingSystem_md.c --- a/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, 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 @@ -34,9 +34,27 @@ #include <errno.h> #include <stdlib.h> +#include <malloc.h> +#pragma warning (push,0) +#include <windows.h> +#pragma warning (pop) +#include <stdio.h> +#include <time.h> +#include <stdint.h> +#include <assert.h> + +/* Disable warnings due to broken header files from Microsoft... */ +#pragma warning(push, 3) +#include <pdh.h> +#include <pdhmsg.h> +#include <process.h> +#pragma warning(pop) + typedef unsigned __int32 juint; typedef unsigned __int64 julong; +typedef enum boolean_values { false=0, true=1}; + static void set_low(jlong* value, jint low) { *value &= (jlong)0xffffffff << 32; *value |= (jlong)(julong)(juint)low; @@ -56,11 +74,14 @@ static HANDLE main_process; +int perfiInit(void); + JNIEXPORT void JNICALL Java_com_sun_management_OperatingSystem_initialize (JNIEnv *env, jclass cls) { main_process = GetCurrentProcess(); + perfiInit(); } JNIEXPORT jlong JNICALL @@ -132,3 +153,788 @@ GlobalMemoryStatus(&ms); return ms.dwTotalPhys; } + +// Seems WinXP PDH returns PDH_MORE_DATA whenever we send in a NULL buffer. +// Let's just ignore it, since we make sure we have enough buffer anyway. +static int +pdh_fail(PDH_STATUS pdhStat) { + return pdhStat != ERROR_SUCCESS && pdhStat != PDH_MORE_DATA; +} + +// INFO: Using PDH APIs Correctly in a Localized Language (Q287159) +// http://support.microsoft.com/default.aspx?scid=kb;EN-US;q287159 +// The index value for the base system counters and objects like processor, +// process, thread, memory, and so forth are always the same irrespective +// of the localized version of the operating system or service pack installed. +#define PDH_PROCESSOR_IDX ((DWORD) 238) +#define PDH_PROCESSOR_TIME_IDX ((DWORD) 6) +#define PDH_PRIV_PROCESSOR_TIME_IDX ((DWORD) 144) +#define PDH_PROCESS_IDX ((DWORD) 230) +#define PDH_ID_PROCESS_IDX ((DWORD) 784) +#define PDH_CONTEXT_SWITCH_RATE_IDX ((DWORD) 146) +#define PDH_SYSTEM_IDX ((DWORD) 2) +#define PDH_VIRTUAL_BYTES_IDX ((DWORD) 174) + +typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)( + HQUERY hQuery, + LPCSTR szFullCounterPath, + DWORD dwUserData, + HCOUNTER *phCounter + ); +typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)( + LPCWSTR szDataSource, + DWORD dwUserData, + HQUERY *phQuery + ); +typedef DWORD (WINAPI *PdhCloseQueryFunc)( + HQUERY hQuery + ); +typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)( + HQUERY hQuery + ); +typedef DWORD (WINAPI *PdhGetFormattedCounterValueFunc)( + HCOUNTER hCounter, + DWORD dwFormat, + LPDWORD lpdwType, + PPDH_FMT_COUNTERVALUE pValue + ); +typedef PDH_STATUS (WINAPI *PdhEnumObjectItemsFunc)( + LPCTSTR szDataSource, + LPCTSTR szMachineName, + LPCTSTR szObjectName, + LPTSTR mszCounterList, + LPDWORD pcchCounterListLength, + LPTSTR mszInstanceList, + LPDWORD pcchInstanceListLength, + DWORD dwDetailLevel, + DWORD dwFlags + ); +typedef PDH_STATUS (WINAPI *PdhRemoveCounterFunc)( + HCOUNTER hCounter + ); +typedef PDH_STATUS (WINAPI *PdhLookupPerfNameByIndexFunc)( + LPCSTR szMachineName, + DWORD dwNameIndex, + LPSTR szNameBuffer, + LPDWORD pcchNameBufferSize + ); +typedef PDH_STATUS (WINAPI *PdhMakeCounterPathFunc)( + PDH_COUNTER_PATH_ELEMENTS *pCounterPathElements, + LPTSTR szFullPathBuffer, + LPDWORD pcchBufferSize, + DWORD dwFlags + ); + +static PdhAddCounterFunc PdhAddCounter_i; +static PdhOpenQueryFunc PdhOpenQuery_i; +static PdhCloseQueryFunc PdhCloseQuery_i; +static PdhCollectQueryDataFunc PdhCollectQueryData_i; +static PdhGetFormattedCounterValueFunc PdhGetFormattedCounterValue_i; +static PdhEnumObjectItemsFunc PdhEnumObjectItems_i; +static PdhRemoveCounterFunc PdhRemoveCounter_i; +static PdhLookupPerfNameByIndexFunc PdhLookupPerfNameByIndex_i; +static PdhMakeCounterPathFunc PdhMakeCounterPath_i; + +static HANDLE thisProcess; +static double cpuFactor; +static DWORD num_cpus; + +#define FT2JLONG(X) ((((jlong)X.dwHighDateTime) << 32) | ((jlong)X.dwLowDateTime)) +#define COUNTER_BUF_SIZE 256 +// Min time between query updates. +#define MIN_UPDATE_INTERVAL 500 +#define CONFIG_SUCCESSFUL 0 + +/** + * Struct for PDH queries. + */ +typedef struct { + HQUERY query; + uint64_t lastUpdate; // Last time query was updated (current millis). +} UpdateQueryS, *UpdateQueryP; + +/** + * Struct for the processor load counters. + */ +typedef struct { + UpdateQueryS query; + HCOUNTER* counters; + int noOfCounters; +} MultipleCounterQueryS, *MultipleCounterQueryP; + +/** + * Struct for the jvm process load counter. + */ +typedef struct { + UpdateQueryS query; + HCOUNTER counter; +} SingleCounterQueryS, *SingleCounterQueryP; + +static char* getProcessPDHHeader(void); + +/** + * Currently available counters. + */ +static SingleCounterQueryS cntCtxtSwitchRate; +static SingleCounterQueryS cntVirtualSize; +static SingleCounterQueryS cntProcLoad; +static SingleCounterQueryS cntProcSystemLoad; +static MultipleCounterQueryS multiCounterCPULoad; + +static CRITICAL_SECTION processHeaderLock; +static CRITICAL_SECTION initializationLock; + +/** + * Initialize the perf module at startup. + */ +int +perfiInit(void) +{ + InitializeCriticalSection(&processHeaderLock); + InitializeCriticalSection(&initializationLock); + return 0; +} + +/** + * Dynamically sets up function pointers to the PDH library. + * + * @return CONFIG_SUCCESSFUL on success, negative on failure. + */ +static int +get_functions(HMODULE h, char *ebuf, size_t elen) { + // The 'A' at the end means the ANSI (not the UNICODE) vesions of the methods + PdhAddCounter_i = (PdhAddCounterFunc)GetProcAddress(h, "PdhAddCounterA"); + PdhOpenQuery_i = (PdhOpenQueryFunc)GetProcAddress(h, "PdhOpenQueryA"); + PdhCloseQuery_i = (PdhCloseQueryFunc)GetProcAddress(h, "PdhCloseQuery"); + PdhCollectQueryData_i = (PdhCollectQueryDataFunc)GetProcAddress(h, "PdhCollectQueryData"); + PdhGetFormattedCounterValue_i = (PdhGetFormattedCounterValueFunc)GetProcAddress(h, "PdhGetFormattedCounterValue"); + PdhEnumObjectItems_i = (PdhEnumObjectItemsFunc)GetProcAddress(h, "PdhEnumObjectItemsA"); + PdhRemoveCounter_i = (PdhRemoveCounterFunc)GetProcAddress(h, "PdhRemoveCounter"); + PdhLookupPerfNameByIndex_i = (PdhLookupPerfNameByIndexFunc)GetProcAddress(h, "PdhLookupPerfNameByIndexA"); + PdhMakeCounterPath_i = (PdhMakeCounterPathFunc)GetProcAddress(h, "PdhMakeCounterPathA"); + + if (PdhAddCounter_i == NULL || PdhOpenQuery_i == NULL || + PdhCloseQuery_i == NULL || PdhCollectQueryData_i == NULL || + PdhGetFormattedCounterValue_i == NULL || PdhEnumObjectItems_i == NULL || + PdhRemoveCounter_i == NULL || PdhLookupPerfNameByIndex_i == NULL || PdhMakeCounterPath_i == NULL) + { + _snprintf(ebuf, elen, "Required method could not be found."); + return -1; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Returns the counter value as a double for the specified query. + * Will collect the query data and update the counter values as necessary. + * + * @param query the query to update (if needed). + * @param c the counter to read. + * @param value where to store the formatted value. + * @param format the format to use (i.e. PDH_FMT_DOUBLE, PDH_FMT_LONG etc) + * @return CONFIG_SUCCESSFUL if no error + * -1 if PdhCollectQueryData fails + * -2 if PdhGetFormattedCounterValue fails + */ +static int +getPerformanceData(UpdateQueryP query, HCOUNTER c, PDH_FMT_COUNTERVALUE* value, DWORD format) { + clock_t now; + now = clock(); + + // Need to limit how often we update the query + // to mimise the heisenberg effect. + // (PDH behaves erratically if the counters are + // queried too often, especially counters that + // store and use values from two consecutive updates, + // like cpu load.) + if (now - query->lastUpdate > MIN_UPDATE_INTERVAL) { + if (PdhCollectQueryData_i(query->query) != ERROR_SUCCESS) { + return -1; + } + query->lastUpdate = now; + } + + if (PdhGetFormattedCounterValue_i(c, format, NULL, value) != ERROR_SUCCESS) { + return -2; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Places the resolved counter name of the counter at the specified index in the + * supplied buffer. There must be enough space in the buffer to hold the counter name. + * + * @param index the counter index as specified in the registry. + * @param buf the buffer in which to place the counter name. + * @param size the size of the counter name buffer. + * @param ebuf the error message buffer. + * @param elen the length of the error buffer. + * @return CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +find_name(DWORD index, char *buf, DWORD size) { + PDH_STATUS res; + + if ((res = PdhLookupPerfNameByIndex_i(NULL, index, buf, &size)) != ERROR_SUCCESS) { + + /* printf("Could not open counter %d: error=0x%08x", index, res); */ + /* if (res == PDH_CSTATUS_NO_MACHINE) { */ + /* printf("User probably does not have sufficient privileges to use"); */ + /* printf("performance counters. If you are running on Windows 2003"); */ + /* printf("or Windows Vista, make sure the user is in the"); */ + /* printf("Performance Logs user group."); */ + /* } */ + return -1; + } + + if (size == 0) { + /* printf("Failed to get counter name for %d: empty string", index); */ + return -1; + } + + // windows vista does not null-terminate the string (allthough the docs says it will) + buf[size - 1] = '\0'; + return CONFIG_SUCCESSFUL; +} + +/** + * Sets up the supplied SingleCounterQuery to listen for the specified counter. + * initPDH() must have been run prior to calling this function! + * + * @param counterQuery the counter query to set up. + * @param counterString the string specifying the path to the counter. + * @param ebuf the error buffer. + * @param elen the length of the error buffer. + * @returns CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +initSingleCounterQuery(SingleCounterQueryP counterQuery, char *counterString) { + if (PdhOpenQuery_i(NULL, 0, &counterQuery->query.query) != ERROR_SUCCESS) { + /* printf("Could not open query for %s", counterString); */ + return -1; + } + if (PdhAddCounter_i(counterQuery->query.query, counterString, 0, &counterQuery->counter) != ERROR_SUCCESS) { + /* printf("Could not add counter %s for query", counterString); */ + if (counterQuery->counter != NULL) { + PdhRemoveCounter_i(counterQuery->counter); + } + if (counterQuery->query.query != NULL) { + PdhCloseQuery_i(counterQuery->query.query); + } + memset(counterQuery, 0, sizeof(SingleCounterQueryS)); + return -1; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Sets up the supplied SingleCounterQuery to listen for the time spent + * by the HotSpot process. + * + * @param counterQuery the counter query to set up as a process counter. + * @param ebuf the error buffer. + * @param elen the length of the error buffer. + * @returns CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +initProcLoadCounter(void) { + char time[COUNTER_BUF_SIZE]; + char counter[COUNTER_BUF_SIZE*2]; + + if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) { + return -1; + } + _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time); + return initSingleCounterQuery(&cntProcLoad, counter); +} + +static int +initProcSystemLoadCounter(void) { + char time[COUNTER_BUF_SIZE]; + char counter[COUNTER_BUF_SIZE*2]; + + if (find_name(PDH_PRIV_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) { + return -1; + } + _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time); + return initSingleCounterQuery(&cntProcSystemLoad, counter); +} + +/** + * Sets up the supplied MultipleCounterQuery to check on the processors. + * (Comment: Refactor and prettify as with the the SingleCounter queries + * if more MultipleCounterQueries are discovered.) + * + * initPDH() must have been run prior to calling this function. + * + * @param multiQuery a pointer to a MultipleCounterQueryS, will be filled in with + * the necessary info to check the PDH processor counters. + * @return CONFIG_SUCCESSFUL if successful, negative on failure. + */ +static int +initProcessorCounters(void) { + char processor[COUNTER_BUF_SIZE]; //'Processor' == #238 + char time[COUNTER_BUF_SIZE]; //'Time' == 6 + DWORD c_size, i_size; + HQUERY tmpQuery; + DWORD i, p_count; + BOOL error; + char *instances, *tmp; + PDH_STATUS pdhStat; + + c_size = i_size = 0; + tmpQuery = NULL; + error = false; + + // This __try / __except stuff is there since Windows 2000 beta (or so) sometimes triggered + // an access violation when the user had insufficient privileges to use the performance + // counters. This was previously guarded by a very ugly piece of code which disabled the + // global trap handling in JRockit. Don't know if this really is needed anymore, but otoh, + // if we keep it we don't crash on Win2k beta. /Ihse, 2005-05-30 + __try { + if (find_name(PDH_PROCESSOR_IDX, processor, sizeof(processor)-1) < 0) { + return -1; + } + } __except (EXCEPTION_EXECUTE_HANDLER) { // We'll catch all exceptions here. + /* printf("User does not have sufficient privileges to use performance counters"); */ + return -1; + } + + if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) { + return -1; + } + //ok, now we have enough to enumerate all processors. + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processor, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + NULL, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + if (pdh_fail(pdhStat)) { + /* printf("could not enumerate processors (1) error=%d", pdhStat); */ + return -1; + } + + // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will) + instances = calloc(i_size, 1); + if (instances == NULL) { + /* printf("could not allocate memory (1) %d bytes", i_size); */ + error = true; + goto end; + } + + c_size = 0; + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processor, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + instances, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + + if (pdh_fail(pdhStat)) { + /* printf("could not enumerate processors (2) error=%d", pdhStat); */ + error = true; + goto end; + } + //count perf count instances. + for (p_count = 0, tmp = instances; *tmp != 0; tmp = &tmp[lstrlen(tmp)+1], p_count++); + + //is this correct for HT? + assert(p_count == num_cpus+1); + + //ok, have number of perf counters. + multiCounterCPULoad.counters = calloc(p_count, sizeof(HCOUNTER)); + if (multiCounterCPULoad.counters == NULL) { + /* printf("could not allocate memory (2) count=%d", p_count); */ + error = true; + goto end; + } + + multiCounterCPULoad.noOfCounters = p_count; + + if (PdhOpenQuery_i(NULL, 0, &multiCounterCPULoad.query.query) != ERROR_SUCCESS) { + /* printf("could not create query"); */ + error = true; + goto end; + } + //now, fetch the counters. + for (i = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[lstrlen(tmp)+1], i++) { + char counter[2*COUNTER_BUF_SIZE]; + + _snprintf(counter, sizeof(counter)-1, "\\%s(%s)\\%s", processor, tmp, time); + + if (PdhAddCounter_i(multiCounterCPULoad.query.query, counter, 0, &multiCounterCPULoad.counters[i]) != ERROR_SUCCESS) { + /* printf("error adding processor counter %s", counter); */ + error = true; + goto end; + } + } + + free(instances); + instances = NULL; + + // Query once to initialize the counters needing at least two queries + // (like the % CPU usage) to calculate correctly. + if (PdhCollectQueryData_i(multiCounterCPULoad.query.query) != ERROR_SUCCESS) + error = true; + + end: + if (instances != NULL) { + free(instances); + } + if (tmpQuery != NULL) { + PdhCloseQuery_i(tmpQuery); + } + if (error) { + int i; + + if (multiCounterCPULoad.counters != NULL) { + for (i = 0; i < multiCounterCPULoad.noOfCounters; i++) { + if (multiCounterCPULoad.counters[i] != NULL) { + PdhRemoveCounter_i(multiCounterCPULoad.counters[i]); + } + } + free(multiCounterCPULoad.counters[i]); + } + if (multiCounterCPULoad.query.query != NULL) { + PdhCloseQuery_i(multiCounterCPULoad.query.query); + } + memset(&multiCounterCPULoad, 0, sizeof(MultipleCounterQueryS)); + return -1; + } + return CONFIG_SUCCESSFUL; +} + +/** + * Help function that initializes the PDH process header for the JRockit process. + * (You should probably use getProcessPDHHeader() instead!) + * + * initPDH() must have been run prior to calling this function. + * + * @param ebuf the error buffer. + * @param elen the length of the error buffer. + * + * @return the PDH instance description corresponding to the JVM process. + */ +static char* +initProcessPDHHeader(void) { + static char hotspotheader[2*COUNTER_BUF_SIZE]; + + char counter[2*COUNTER_BUF_SIZE]; + char processes[COUNTER_BUF_SIZE]; //'Process' == #230 + char pid[COUNTER_BUF_SIZE]; //'ID Process' == 784 + char module_name[MAX_PATH]; + PDH_STATUS pdhStat; + DWORD c_size = 0, i_size = 0; + HQUERY tmpQuery = NULL; + int i, myPid = _getpid(); + BOOL error = false; + char *instances, *tmp, *instance_name, *dot_pos; + + tmpQuery = NULL; + myPid = _getpid(); + error = false; + + if (find_name(PDH_PROCESS_IDX, processes, sizeof(processes) - 1) < 0) { + return NULL; + } + + if (find_name(PDH_ID_PROCESS_IDX, pid, sizeof(pid) - 1) < 0) { + return NULL; + } + //time is same. + + c_size = 0; + i_size = 0; + + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processes, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + NULL, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + + //ok, now we have enough to enumerate all processes + if (pdh_fail(pdhStat)) { + /* printf("Could not enumerate processes (1) error=%d", pdhStat); */ + return NULL; + } + + // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will) + if ((instances = calloc(i_size, 1)) == NULL) { + /* printf("Could not allocate memory %d bytes", i_size); */ + error = true; + goto end; + } + + c_size = 0; + + pdhStat = PdhEnumObjectItems_i ( + NULL, // reserved + NULL, // local machine + processes, // object to enumerate + NULL, // pass in NULL buffers + &c_size, // and 0 length to get + instances, // required size + &i_size, // of the buffers in chars + PERF_DETAIL_WIZARD, // counter detail level + 0); + + // ok, now we have enough to enumerate all processes + if (pdh_fail(pdhStat)) { + /* printf("Could not enumerate processes (2) error=%d", pdhStat); */ + error = true; + goto end; + } + + if (PdhOpenQuery_i(NULL, 0, &tmpQuery) != ERROR_SUCCESS) { + /* printf("Could not create temporary query"); */ + error = true; + goto end; + } + + // Find our module name and use it to extract the instance name used by PDH + if (GetModuleFileName(NULL, module_name, MAX_PATH) >= MAX_PATH-1) { + /* printf("Module name truncated"); */ + error = true; + goto end; + } + instance_name = strrchr(module_name, '\\'); //drop path + instance_name++; //skip slash + dot_pos = strchr(instance_name, '.'); //drop .exe + dot_pos[0] = '\0'; + + //now, fetch the counters. + for (tmp = instances; *tmp != 0 && !error; tmp = &tmp[lstrlen(tmp)+1]) { + HCOUNTER hc = NULL; + BOOL done = false; + + // Skip until we find our own process name + if (strcmp(tmp, instance_name) != 0) { + continue; + } + + // iterate over all instance indexes and try to find our own pid + for (i = 0; !done && !error; i++){ + PDH_STATUS res; + _snprintf(counter, sizeof(counter)-1, "\\%s(%s#%d)\\%s", processes, tmp, i, pid); + + if (PdhAddCounter_i(tmpQuery, counter, 0, &hc) != ERROR_SUCCESS) { + /* printf("Failed to create process id query"); */ + error = true; + goto end; + } + + res = PdhCollectQueryData_i(tmpQuery); + + if (res == PDH_INVALID_HANDLE) { + /* printf("Failed to query process id"); */ + res = -1; + done = true; + } else if (res == PDH_NO_DATA) { + done = true; + } else { + PDH_FMT_COUNTERVALUE cv; + + PdhGetFormattedCounterValue_i(hc, PDH_FMT_LONG, NULL, &cv); + /* + * This check seems to be needed for Win2k SMP boxes, since + * they for some reason don't return PDH_NO_DATA for non existing + * counters. + */ + if (cv.CStatus != PDH_CSTATUS_VALID_DATA) { + done = true; + } else if (cv.longValue == myPid) { + _snprintf(hotspotheader, sizeof(hotspotheader)-1, "\\%s(%s#%d)\0", processes, tmp, i); + PdhRemoveCounter_i(hc); + goto end; + } + } + PdhRemoveCounter_i(hc); + } + } + end: + if (instances != NULL) { + free(instances); + } + if (tmpQuery != NULL) { + PdhCloseQuery_i(tmpQuery); + } + if (error) { + return NULL; + } + return hotspotheader; +} + +/** + * Returns the PDH string prefix identifying the HotSpot process. Use this prefix when getting + * counters from the PDH process object representing HotSpot. + * + * Note: this call may take some time to complete. + * + * @param ebuf error buffer. + * @param elen error buffer length. + * + * @return the header to be used when retrieving PDH counters from the HotSpot process. + * Will return NULL if the call failed. + */ +static char * +getProcessPDHHeader(void) { + static char *processHeader = NULL; + + EnterCriticalSection(&processHeaderLock); { + if (processHeader == NULL) { + processHeader = initProcessPDHHeader(); + } + } LeaveCriticalSection(&processHeaderLock); + return processHeader; +} + +int perfInit(void); + +double +perfGetCPULoad(int which) +{ + PDH_FMT_COUNTERVALUE cv; + HCOUNTER c; + + if (perfInit() < 0) { + // warn? + return -1.0; + } + + if (multiCounterCPULoad.query.query == NULL) { + // warn? + return -1.0; + } + + if (which == -1) { + c = multiCounterCPULoad.counters[multiCounterCPULoad.noOfCounters - 1]; + } else { + if (which < multiCounterCPULoad.noOfCounters) { + c = multiCounterCPULoad.counters[which]; + } else { + return -1.0; + } + } + if (getPerformanceData(&multiCounterCPULoad.query, c, &cv, PDH_FMT_DOUBLE ) == CONFIG_SUCCESSFUL) { + return cv.doubleValue / 100; + } + return -1.0; +} + +double +perfGetProcessLoad(void) +{ + PDH_FMT_COUNTERVALUE cv; + + if (perfInit() < 0) { + // warn? + return -1.0; + } + + if (cntProcLoad.query.query == NULL) { + // warn? + return -1.0; + } + + if (getPerformanceData(&cntProcLoad.query, cntProcLoad.counter, &cv, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100) == CONFIG_SUCCESSFUL) { + double d = cv.doubleValue / cpuFactor; + d = min(1, d); + d = max(0, d); + return d; + } + return -1.0; +} + +/** + * Helper to initialize the PDH library. Loads the library and sets up the functions. + * Note that once loaded, we will never unload the PDH library. + * + * @return CONFIG_SUCCESSFUL if successful, negative on failure. + */ +int +perfInit(void) { + static HMODULE h; + static BOOL running, inited; + + int error; + + if (running) { + return CONFIG_SUCCESSFUL; + } + + error = CONFIG_SUCCESSFUL; + + // this is double checked locking again, but we try to bypass the worst by + // implicit membar at end of lock. + EnterCriticalSection(&initializationLock); { + if (!inited) { + char buf[64] = ""; + SYSTEM_INFO si; + + // CMH. But windows will not care about our affinity when giving + // us measurements. Need the real, raw num cpus. + + GetSystemInfo(&si); + num_cpus = si.dwNumberOfProcessors; + // Initialize the denominator for the jvm load calculations + cpuFactor = num_cpus * 100; + + /** + * Do this dynamically, so we don't fail to start on systems without pdh. + */ + if ((h = LoadLibrary("pdh.dll")) == NULL) { + /* printf("Could not load pdh.dll (%d)", GetLastError()); */ + error = -2; + } else if (get_functions(h, buf, sizeof(buf)) < 0) { + FreeLibrary(h); + h = NULL; + error = -2; + /* printf("Failed to init pdh functions: %s.\n", buf); */ + } else { + if (initProcessorCounters() != 0) { + /* printf("Failed to init system load counters.\n"); */ + } else if (initProcLoadCounter() != 0) { + /* printf("Failed to init process load counter.\n"); */ + } else if (initProcSystemLoadCounter() != 0) { + /* printf("Failed to init process system load counter.\n"); */ + } else { + inited = true; + } + } + } + } LeaveCriticalSection(&initializationLock); + + if (inited && error == CONFIG_SUCCESSFUL) { + running = true; + } + + return error; +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_OperatingSystem_getSystemCpuLoad +(JNIEnv *env, jobject dummy) +{ + return perfGetCPULoad(-1); +} + +JNIEXPORT jdouble JNICALL +Java_com_sun_management_OperatingSystem_getProcessCpuLoad +(JNIEnv *env, jobject dummy) +{ + return perfGetProcessLoad(); +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp --- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp Sat May 14 11:52:15 2011 -0700 @@ -187,6 +187,7 @@ } JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); + RETURN_IF_NULL(env); pMgr = D3DPipelineManager::GetInstance(); RETURN_IF_NULL(pMgr); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/security/mscapi/security.cpp --- a/jdk/src/windows/native/sun/security/mscapi/security.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/security/mscapi/security.cpp Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -40,6 +40,8 @@ #define CERTIFICATE_PARSING_EXCEPTION \ "java/security/cert/CertificateParsingException" +#define INVALID_KEY_EXCEPTION \ + "java/security/InvalidKeyException" #define KEY_EXCEPTION "java/security/KeyException" #define KEYSTORE_EXCEPTION "java/security/KeyStoreException" #define PROVIDER_EXCEPTION "java/security/ProviderException" @@ -79,6 +81,8 @@ (strcmp("SHA-1", pszHashAlgorithm) == 0)) { algId = CALG_SHA1; + } else if (strcmp("SHA1+MD5", pszHashAlgorithm) == 0) { + algId = CALG_SSL3_SHAMD5; // a 36-byte concatenation of SHA-1 and MD5 } else if (strcmp("SHA-256", pszHashAlgorithm) == 0) { algId = CALG_SHA_256; } else if (strcmp("SHA-384", pszHashAlgorithm) == 0) { @@ -471,16 +475,18 @@ /* * Class: sun_security_mscapi_RSASignature * Method: signHash - * Signature: ([BILjava/lang/String;JJ)[B + * Signature: (Z[BILjava/lang/String;JJ)[B */ JNIEXPORT jbyteArray JNICALL Java_sun_security_mscapi_RSASignature_signHash - (JNIEnv *env, jclass clazz, jbyteArray jHash, jint jHashSize, - jstring jHashAlgorithm, jlong hCryptProv, jlong hCryptKey) + (JNIEnv *env, jclass clazz, jboolean noHashOID, jbyteArray jHash, + jint jHashSize, jstring jHashAlgorithm, jlong hCryptProv, + jlong hCryptKey) { HCRYPTHASH hHash = NULL; jbyte* pHashBuffer = NULL; jbyte* pSignedHashBuffer = NULL; jbyteArray jSignedHash = NULL; + HCRYPTPROV hCryptProvAlt = NULL; __try { @@ -490,8 +496,32 @@ // Acquire a hash object handle. if (::CryptCreateHash(HCRYPTPROV(hCryptProv), algId, 0, 0, &hHash) == FALSE) { - ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); - __leave; + // Failover to using the PROV_RSA_AES CSP + + DWORD cbData = 256; + BYTE pbData[256]; + pbData[0] = '\0'; + + // Get name of the key container + ::CryptGetProvParam((HCRYPTPROV)hCryptProv, PP_CONTAINER, + (BYTE *)pbData, &cbData, 0); + + // Acquire an alternative CSP handle + if (::CryptAcquireContext(&hCryptProvAlt, LPCSTR(pbData), NULL, + PROV_RSA_AES, 0) == FALSE) + { + + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } + + // Acquire a hash object handle. + if (::CryptCreateHash(HCRYPTPROV(hCryptProvAlt), algId, 0, 0, + &hHash) == FALSE) + { + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } } // Copy hash from Java to native buffer @@ -521,14 +551,20 @@ // Determine size of buffer DWORD dwBufLen = 0; - if (::CryptSignHash(hHash, dwKeySpec, NULL, NULL, NULL, &dwBufLen) == FALSE) + DWORD dwFlags = 0; + + if (noHashOID == JNI_TRUE) { + dwFlags = CRYPT_NOHASHOID; // omit hash OID in NONEwithRSA signature + } + + if (::CryptSignHash(hHash, dwKeySpec, NULL, dwFlags, NULL, &dwBufLen) == FALSE) { ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); __leave; } pSignedHashBuffer = new jbyte[dwBufLen]; - if (::CryptSignHash(hHash, dwKeySpec, NULL, NULL, (BYTE*)pSignedHashBuffer, &dwBufLen) == FALSE) + if (::CryptSignHash(hHash, dwKeySpec, NULL, dwFlags, (BYTE*)pSignedHashBuffer, &dwBufLen) == FALSE) { ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); __leave; @@ -544,6 +580,9 @@ } __finally { + if (hCryptProvAlt) + ::CryptReleaseContext(hCryptProvAlt, 0); + if (pSignedHashBuffer) delete [] pSignedHashBuffer; @@ -572,6 +611,7 @@ jbyte* pSignedHashBuffer = NULL; DWORD dwSignedHashBufferLen = jSignedHashSize; jboolean result = JNI_FALSE; + HCRYPTPROV hCryptProvAlt = NULL; __try { @@ -582,8 +622,32 @@ if (::CryptCreateHash(HCRYPTPROV(hCryptProv), algId, 0, 0, &hHash) == FALSE) { - ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); - __leave; + // Failover to using the PROV_RSA_AES CSP + + DWORD cbData = 256; + BYTE pbData[256]; + pbData[0] = '\0'; + + // Get name of the key container + ::CryptGetProvParam((HCRYPTPROV)hCryptProv, PP_CONTAINER, + (BYTE *)pbData, &cbData, 0); + + // Acquire an alternative CSP handle + if (::CryptAcquireContext(&hCryptProvAlt, LPCSTR(pbData), NULL, + PROV_RSA_AES, 0) == FALSE) + { + + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } + + // Acquire a hash object handle. + if (::CryptCreateHash(HCRYPTPROV(hCryptProvAlt), algId, 0, 0, + &hHash) == FALSE) + { + ThrowException(env, SIGNATURE_EXCEPTION, GetLastError()); + __leave; + } } // Copy hash and signedHash from Java to native buffer @@ -614,6 +678,9 @@ __finally { + if (hCryptProvAlt) + ::CryptReleaseContext(hCryptProvAlt, 0); + if (pSignedHashBuffer) delete [] pSignedHashBuffer; @@ -646,15 +713,27 @@ pszKeyContainerName = env->GetStringUTFChars(keyContainerName, NULL); // Acquire a CSP context (create a new key container). + // Prefer a PROV_RSA_AES CSP, when available, due to its support + // for SHA-2-based signatures. if (::CryptAcquireContext( &hCryptProv, pszKeyContainerName, NULL, - PROV_RSA_FULL, + PROV_RSA_AES, CRYPT_NEWKEYSET) == FALSE) { - ThrowException(env, KEY_EXCEPTION, GetLastError()); - __leave; + // Failover to using the default CSP (PROV_RSA_FULL) + + if (::CryptAcquireContext( + &hCryptProv, + pszKeyContainerName, + NULL, + PROV_RSA_FULL, + CRYPT_NEWKEYSET) == FALSE) + { + ThrowException(env, KEY_EXCEPTION, GetLastError()); + __leave; + } } // Generate an RSA keypair @@ -1398,7 +1477,7 @@ jbyteArray blob = NULL; DWORD dwBlobLen; - BYTE* pbKeyBlob; + BYTE* pbKeyBlob = NULL; __try { @@ -1656,7 +1735,7 @@ // Sanity check jsize jPublicExponentLength = env->GetArrayLength(jPublicExponent); if (jPublicExponentLength > sizeof(pRsaPubKey->pubexp)) { - ThrowException(env, KEY_EXCEPTION, NTE_BAD_TYPE); + ThrowException(env, INVALID_KEY_EXCEPTION, NTE_BAD_TYPE); __leave; } // The length argument must be the smaller of jPublicExponentLength @@ -1847,15 +1926,27 @@ pbKeyBlob = (BYTE *) env->GetByteArrayElements(keyBlob, 0); // Acquire a CSP context (create a new key container). + // Prefer a PROV_RSA_AES CSP, when available, due to its support + // for SHA-2-based signatures. if (::CryptAcquireContext( &hCryptProv, NULL, NULL, - PROV_RSA_FULL, + PROV_RSA_AES, CRYPT_VERIFYCONTEXT) == FALSE) { - ThrowException(env, KEYSTORE_EXCEPTION, GetLastError()); - __leave; + // Failover to using the default CSP (PROV_RSA_FULL) + + if (::CryptAcquireContext( + &hCryptProv, + NULL, + NULL, + PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT) == FALSE) + { + ThrowException(env, KEYSTORE_EXCEPTION, GetLastError()); + __leave; + } } // Import the public key diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/ObjectList.cpp --- a/jdk/src/windows/native/sun/windows/ObjectList.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/ObjectList.cpp Sat May 14 11:52:15 2011 -0700 @@ -48,7 +48,7 @@ m_head = item; } -void AwtObjectList::Remove(AwtObject* obj) +BOOL AwtObjectList::Remove(AwtObject* obj) { CriticalSection::Lock l(m_lock); @@ -64,11 +64,14 @@ } DASSERT(item != NULL); delete item; - return; + return TRUE; } lastItem = item; item = item->next; } + + return FALSE; + // DASSERT(FALSE); // should never get here... // even if it does it shouldn't be fatal. } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/ObjectList.h --- a/jdk/src/windows/native/sun/windows/ObjectList.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/ObjectList.h Sat May 14 11:52:15 2011 -0700 @@ -46,7 +46,7 @@ AwtObjectList(); void Add(AwtObject* obj); - void Remove(AwtObject* obj); + BOOL Remove(AwtObject* obj); #ifdef DEBUG /* Used for sanity checks only. */ AwtObject* LookUp(AwtObject* obj); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Clipboard.cpp --- a/jdk/src/windows/native/sun/windows/awt_Clipboard.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Clipboard.cpp Sat May 14 11:52:15 2011 -0700 @@ -294,7 +294,7 @@ if (format == CF_HDROP) { DROPFILES *dropfiles = (DROPFILES *)dataout; dropfiles->pFiles = sizeof(DROPFILES); - dropfiles->fWide = FALSE; // good guess! + dropfiles->fWide = TRUE; // we publish only Unicode dataout += sizeof(DROPFILES); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Component.cpp --- a/jdk/src/windows/native/sun/windows/awt_Component.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp Sat May 14 11:52:15 2011 -0700 @@ -549,8 +549,6 @@ m_hwnd = hwnd; - ImmAssociateContext(NULL); - SetDrawState((jint)JAWT_LOCK_SURFACE_CHANGED | (jint)JAWT_LOCK_BOUNDS_CHANGED | (jint)JAWT_LOCK_CLIP_CHANGED); @@ -1203,7 +1201,7 @@ WIN_MSG(WM_IME_COMPOSITIONFULL) WIN_MSG(WM_IME_SELECT) WIN_MSG(WM_IME_CHAR) - FMT_MSG(0x0288, "WM_IME_REQUEST") + FMT_MSG(WM_IME_REQUEST) WIN_MSG(WM_IME_KEYDOWN) WIN_MSG(WM_IME_KEYUP) FMT_MSG(0x02A1, "WM_MOUSEHOVER") @@ -1733,7 +1731,7 @@ case WM_IME_SELECT: case WM_IME_KEYUP: case WM_IME_KEYDOWN: - case 0x0288: // WM_IME_REQUEST + case WM_IME_REQUEST: CallProxyDefWindowProc(message, wParam, lParam, retValue, mr); break; case WM_CHAR: @@ -1969,7 +1967,9 @@ { // fix for 6259348: we should enter the SyncCall critical section before // disposing the native object, that is value 1 of lParam is intended for - AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)this, (LPARAM)1); + if(m_peerObject != NULL) { // is not being terminating + AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)m_peerObject, (LPARAM)1); + } return mrConsume; } @@ -2020,25 +2020,6 @@ MsgRouting AwtComponent::WmShowWindow(BOOL show, UINT status) { - // NULL-InputContext is associated to all window just after they created. - // ( see CreateHWnd() ) - // But to TextField and TextArea on Win95, valid InputContext is associated - // by system after that. This is not happen on NT4.0 - // For workaround, force context to NULL here. - - // Fix for 4730228 - // Check if we already have Java-associated input method - HIMC context = 0; - if (m_InputMethod != NULL) { - // If so get the appropriate context from it and use it instead of empty context - JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - context = (HIMC)(UINT_PTR)(JNU_GetFieldByName(env, NULL, m_InputMethod, "context", "I").i); - } - - if (ImmGetContext() != 0 && ImmGetContext() != context) { - ImmAssociateContext(context); - } - return mrDoDefault; } @@ -4655,10 +4636,6 @@ ret: if (c && ::IsWindow(c->GetHWnd())) { sm_focusOwner = c->GetHWnd(); - AwtFrame *owner = (AwtFrame*)GetComponent(c->GetProxyToplevelContainer()); - if (owner) { - owner->SetLastProxiedFocusOwner(sm_focusOwner); - } } else { sm_focusOwner = NULL; } @@ -6534,8 +6511,7 @@ { TRY_NO_HANG; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_DnDDS.cpp --- a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Sat May 14 11:52:15 2011 -0700 @@ -843,7 +843,7 @@ dropfiles->pt.x = m_dropPoint.x; dropfiles->pt.y = m_dropPoint.y; dropfiles->fNC = m_fNC; - dropfiles->fWide = TRUE; // good guess! + dropfiles->fWide = TRUE; // we publish only Unicode dataout += sizeof(DROPFILES); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Frame.cpp --- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp Sat May 14 11:52:15 2011 -0700 @@ -109,7 +109,7 @@ m_isMenuDropped = FALSE; m_isInputMethodWindow = FALSE; m_isUndecorated = FALSE; - m_lastProxiedFocusOwner = NULL; + m_imeTargetComponent = NULL; m_actualFocusedWindow = NULL; m_iconic = FALSE; m_zoomed = FALSE; @@ -311,6 +311,8 @@ LRESULT retValue = 0L; AwtComponent *focusOwner = NULL; + AwtComponent *imeTargetComponent = NULL; + // IME and input language related messages need to be sent to a window // which has the Java input focus switch (message) { @@ -323,15 +325,29 @@ case WM_IME_COMPOSITIONFULL: case WM_IME_SELECT: case WM_IME_CHAR: - case 0x0288: // WM_IME_REQUEST + case WM_IME_REQUEST: case WM_IME_KEYDOWN: case WM_IME_KEYUP: case WM_INPUTLANGCHANGEREQUEST: case WM_INPUTLANGCHANGE: + if (message == WM_IME_STARTCOMPOSITION) { + SetImeTargetComponent(sm_focusOwner); + } + imeTargetComponent = AwtComponent::GetComponent(GetImeTargetComponent()); + if (imeTargetComponent != NULL && + imeTargetComponent != this) // avoid recursive calls + { + retValue = imeTargetComponent->WindowProc(message, wParam, lParam); + mr = mrConsume; + } + if (message == WM_IME_ENDCOMPOSITION) { + SetImeTargetComponent(NULL); + } + break; // TODO: when a Choice's list is dropped down and we're scrolling in // the list WM_MOUSEWHEEL messages come to the poxy, not to the list. Why? case WM_MOUSEWHEEL: - focusOwner = AwtComponent::GetComponent(GetLastProxiedFocusOwner()); + focusOwner = AwtComponent::GetComponent(sm_focusOwner); if (focusOwner != NULL && focusOwner != this) // avoid recursive calls { @@ -340,12 +356,16 @@ } break; case WM_SETFOCUS: + if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain + if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) { AwtSetActiveWindow(); } mr = mrConsume; break; case WM_KILLFOCUS: + if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain + if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) { AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Frame.h --- a/jdk/src/windows/native/sun/windows/awt_Frame.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Frame.h Sat May 14 11:52:15 2011 -0700 @@ -150,8 +150,8 @@ void CheckRetainActualFocusedWindow(HWND activatedOpositeHWnd); BOOL CheckActivateActualFocusedWindow(HWND deactivatedOpositeHWnd); - INLINE HWND GetLastProxiedFocusOwner() { return m_lastProxiedFocusOwner; } - INLINE void SetLastProxiedFocusOwner(HWND hwnd) { m_lastProxiedFocusOwner = hwnd; } + INLINE HWND GetImeTargetComponent() { return m_imeTargetComponent; } + INLINE void SetImeTargetComponent(HWND hwnd) { m_imeTargetComponent = hwnd; } protected: /* The frame is undecorated. */ @@ -179,9 +179,8 @@ /* The frame is an InputMethodWindow */ BOOL m_isInputMethodWindow; - /* Retains the last/current sm_focusOwner proxied. Actually, it should be - * a component of an owned window last/currently active. */ - HWND m_lastProxiedFocusOwner; + // retains the target component for the IME messages + HWND m_imeTargetComponent; /* * Fix for 4823903. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_MenuItem.cpp --- a/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp Sat May 14 11:52:15 2011 -0700 @@ -974,8 +974,7 @@ { TRY_NO_HANG; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Object.cpp --- a/jdk/src/windows/native/sun/windows/awt_Object.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Object.cpp Sat May 14 11:52:15 2011 -0700 @@ -60,11 +60,20 @@ void AwtObject::Dispose() { - theAwtObjectList.Remove(this); + AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0); +} + +void AwtObject::_Dispose(jobject self) +{ + TRY_NO_VERIFY; + + CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS()); // value 0 of lParam means that we should not attempt to enter the // SyncCall critical section, as it was entered someshere earlier - AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0); + AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)self, (LPARAM)0); + + CATCH_BAD_ALLOC; } void AwtObject::_Dispose(PDATA pData) @@ -73,14 +82,10 @@ CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS()); - if (pData != NULL) { - AwtObject *o = (AwtObject *)pData; - AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)o, (LPARAM)0); - } + AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSEPDATA, (WPARAM)pData, (LPARAM)0); CATCH_BAD_ALLOC; } - /* * Return the peer associated with some target. This information is * maintained in a hashtable at the java level. diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Object.h --- a/jdk/src/windows/native/sun/windows/awt_Object.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Object.h Sat May 14 11:52:15 2011 -0700 @@ -67,6 +67,10 @@ virtual void Dispose(); // Static method to be called from JNI methods to dispose AwtObject + // specified by jobject + static void _Dispose(jobject self); + + // Static method to be called from JNI methods to dispose AwtObject // specified by pData static void _Dispose(PDATA pData); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Robot.cpp --- a/jdk/src/windows/native/sun/windows/awt_Robot.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Robot.cpp Sat May 14 11:52:15 2011 -0700 @@ -353,8 +353,7 @@ { TRY_NO_VERIFY; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_TextComponent.cpp --- a/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Sat May 14 11:52:15 2011 -0700 @@ -191,8 +191,11 @@ { HIMC hIMC = ImmGetContext(); // rc is not used for text component. - COMPOSITIONFORM cf = { CFS_POINT, {0,0}, {0,0,0,0} }; + COMPOSITIONFORM cf = { CFS_FORCE_POSITION, {0,0}, {0,0,0,0} }; GetCaretPos(&(cf.ptCurrentPos)); + // the proxy is the native focus owner and it contains the composition window + // let's convert the position to a coordinate space relative to proxy + ::MapWindowPoints(GetHWnd(), GetProxyFocusOwner(), (LPPOINT)&cf.ptCurrentPos, 1); ImmSetCompositionWindow(hIMC, &cf); LOGFONT lf; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_Toolkit.cpp --- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Sat May 14 11:52:15 2011 -0700 @@ -740,18 +740,34 @@ canDispose = syncCS.TryEnter(); } if (canDispose) { - AwtObject *o = (AwtObject *)wParam; - o->Dispose(); - if (shouldEnterCriticalSection) { - syncCS.Leave(); + if(wParam != NULL) { + AwtObject *o = (AwtObject *) JNI_GET_PDATA((jobject)wParam); + if(o != NULL && theAwtObjectList.Remove(o)) { + o->Dispose(); + } + if (shouldEnterCriticalSection) { + syncCS.Leave(); + } } } else { AwtToolkit::GetInstance().PostMessage(WM_AWT_DISPOSE, wParam, lParam); } return 0; } + case WM_AWT_DISPOSEPDATA: { + /* + * NOTE: synchronization routine (like in WM_AWT_DISPOSE) was omitted because + * this handler is called ONLY while disposing Cursor and Font objects where + * synchronization takes place. + */ + AwtObject *o = (AwtObject *) wParam; + if(o != NULL && theAwtObjectList.Remove(o)) { + o->Dispose(); + } + return 0; + } case WM_AWT_DELETEOBJECT: { - AwtObject *p = (AwtObject *)wParam; + AwtObject *p = (AwtObject *) wParam; if (p->CanBeDeleted()) { // all the messages for this component are processed, so // it can be deleted diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp --- a/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Sat May 14 11:52:15 2011 -0700 @@ -926,8 +926,7 @@ { TRY; - PDATA pData = JNI_GET_PDATA(self); - AwtObject::_Dispose(pData); + AwtObject::_Dispose(self); CATCH_BAD_ALLOC; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/src/windows/native/sun/windows/awtmsg.h --- a/jdk/src/windows/native/sun/windows/awtmsg.h Wed May 11 16:12:01 2011 -0700 +++ b/jdk/src/windows/native/sun/windows/awtmsg.h Sat May 14 11:52:15 2011 -0700 @@ -219,6 +219,7 @@ WM_AWT_ENDCOMPOSITION, WM_AWT_DISPOSE, + WM_AWT_DISPOSEPDATA, WM_AWT_DELETEOBJECT, WM_AWT_SETCONVERSIONSTATUS, WM_AWT_GETCONVERSIONSTATUS, diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011, 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 7028071 + * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad() + * + * @run main GetProcessCpuLoad + */ + +import java.lang.management.*; +import com.sun.management.OperatingSystemMXBean; + +public class GetProcessCpuLoad { + public static void main(String[] argv) throws Exception { + OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean) + ManagementFactory.getOperatingSystemMXBean(); + double load; + for(int i=0; i<10; i++) { + load = mbean.getProcessCpuLoad(); + if((load<0.0 || load>1.0) && load != -1.0) { + throw new RuntimeException("getProcessCpuLoad() returns " + load + + " which is not in the [0.0,1.0] interval"); + } + try { + Thread.sleep(200); + } catch(InterruptedException e) { + e.printStackTrace(); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011, 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 7028071 + * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad() + * + * @run main GetSystemCpuLoad + */ + +import java.lang.management.*; +import com.sun.management.OperatingSystemMXBean; + +public class GetSystemCpuLoad { + public static void main(String[] argv) throws Exception { + OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean) + ManagementFactory.getOperatingSystemMXBean(); + double load; + for(int i=0; i<10; i++) { + load = mbean.getSystemCpuLoad(); + if((load<0.0 || load>1.0) && load != -1.0) { + throw new RuntimeException("getSystemCpuLoad() returns " + load + + " which is not in the [0.0,1.0] interval"); + } + try { + Thread.sleep(200); + } catch(InterruptedException e) { + e.printStackTrace(); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/Component/Revalidate/Revalidate.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/Component/Revalidate/Revalidate.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2011, 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 7036669 + @summary Test Component.revalidate() method + @author anthony.petrov@oracle.com: area=awt.component + @run main Revalidate +*/ + +import java.awt.*; + +public class Revalidate { + private static Frame frame = new Frame(); + private static Panel panel = new Panel() { + @Override + public boolean isValidateRoot() { + return true; + } + }; + private static Button button = new Button("Test"); + + private static void sleep() { + try { Thread.sleep(500); } catch (Exception e) {} + } + + private static void printState(String str) { + System.out.println(str + " isValid state: "); + System.out.println(" frame: " + frame.isValid()); + System.out.println(" panel: " + panel.isValid()); + System.out.println(" button: " + button.isValid()); + } + + private static void fail(String msg) { + frame.dispose(); + throw new RuntimeException(msg); + } + + private static void check(String n, Component c, boolean v) { + if (c.isValid() != v) { + fail(n + ".isValid() = " + c.isValid() + "; expected: " + v); + } + } + private static void check(String str, boolean f, boolean p, boolean b) { + printState(str); + + check("frame", frame, f); + check("panel", panel, p); + check("button", button, b); + } + + public static void main(String[] args) { + // setup + frame.add(panel); + panel.add(button); + frame.setBounds(200, 200, 300, 200); + frame.setVisible(true); + sleep(); + check("Upon showing", true, true, true); + + button.setBounds(1, 1, 30, 30); + sleep(); + check("button.setBounds():", true, false, false); + + button.revalidate(); + sleep(); + check("button.revalidate():", true, true, true); + + button.setBounds(1, 1, 30, 30); + sleep(); + check("button.setBounds():", true, false, false); + + panel.revalidate(); + sleep(); + // because the panel's validate root is actually OK + check("panel.revalidate():", true, false, false); + + button.revalidate(); + sleep(); + check("button.revalidate():", true, true, true); + + panel.setBounds(2, 2, 125, 130); + sleep(); + check("panel.setBounds():", false, false, true); + + button.revalidate(); + sleep(); + check("button.revalidate():", false, true, true); + + panel.setBounds(3, 3, 152, 121); + sleep(); + check("panel.setBounds():", false, false, true); + + panel.revalidate(); + sleep(); + check("panel.revalidate():", true, true, true); + + // cleanup + frame.dispose(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/List/ScrollOutside/ScrollOut.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/List/ScrollOutside/ScrollOut.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2011 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 7036733 + @summary Regression : NullPointerException when scrolling horizontally on AWT List + @author Andrei Dmitriev area=awt-list + @library ../../regtesthelpers + @build Util + @run main ScrollOut +*/ + +import java.awt.*; +import java.awt.event.*; +import sun.awt.SunToolkit; +import test.java.awt.regtesthelpers.Util; + +public class ScrollOut +{ + public static final void main(String args[]) + { + final Frame frame = new Frame(); + final List list = new List(); + Robot robot = null; + + for (int i = 0; i < 5; i++){ + list.add("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"); + } + + frame.add(list); + + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + try{ + robot = new Robot(); + }catch(AWTException e){ + throw new RuntimeException(e); + } + + //Drag from center to the outside on left + Point from = new Point(list.getLocationOnScreen().x + list.getWidth()/2, + list.getLocationOnScreen().y + list.getHeight()/2); + Point to = new Point(list.getLocationOnScreen().x - 30, + from.y); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + Util.drag(robot, from, to, InputEvent.BUTTON1_MASK); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + //Drag from center to the outside on up + to = new Point(from.x, + list.getLocationOnScreen().y - 50); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + Util.drag(robot, from, to, InputEvent.BUTTON1_MASK); + + }//End init() +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 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 @@ -50,6 +50,11 @@ public class InfiniteRecursion { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; + static int actualEvents = 0; public static void main(String []s) @@ -96,8 +101,10 @@ Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 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 @@ -50,6 +50,9 @@ public class InfiniteRecursion_1 { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; static int actualEvents = 0; public static void main(String []s) @@ -95,8 +98,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -56,6 +56,9 @@ public class InfiniteRecursion_2 extends Applet { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; static int actualEvents = 0; public void init() @@ -107,8 +110,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } }// start() } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 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 @@ -50,6 +50,9 @@ public class InfiniteRecursion_3 extends Applet { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions, + //*2 as Java sends the wheel event to every for nested component in hierarchy under cursor + final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2; static int actualEvents = 0; public void init() @@ -91,8 +94,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } }// start() } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,8 @@ public class InfiniteRecursion_4 { final static Robot robot = Util.createRobot(); final static int MOVE_COUNT = 5; + //*2 for both rotation directions over a single frame without any siblings + final static int EXPECTED_COUNT = MOVE_COUNT * 2; static int actualEvents = 0; public static void main(String []s) @@ -80,8 +82,10 @@ } Util.waitForIdle(robot); - if (actualEvents != MOVE_COUNT * 2) { - AbstractTest.fail("Expected events count: "+ MOVE_COUNT+" Actual events count: "+ actualEvents); + //Not fair to check for multiplier 4 as it's not specified actual number of WheelEvents + //result in a single wheel rotation. + if (actualEvents != EXPECTED_COUNT) { + AbstractTest.fail("Expected events count: "+ EXPECTED_COUNT+" Actual events count: "+ actualEvents); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011, 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 6799551 + @library ../../regtesthelpers + @build Util Sysout + @summary Extended key codes for small letters undefined + @author Andrei Dmitriev: area=awt.keyboard + @run main EqualKeyCode +*/ + + +import sun.awt.*; +import java.awt.*; +import test.java.awt.regtesthelpers.Util; +import test.java.awt.regtesthelpers.Sysout; + +public class EqualKeyCode { + + final static String LETTERS = "abcdefghijklmnopqrstuvwxyz"; + + public static void main(String []s) { + for (int i = 0; i < LETTERS.length(); i++){ + char cSmall = LETTERS.charAt(i); + char cLarge = Character.toUpperCase(cSmall); + + int iSmall = ExtendedKeyCodes.getExtendedKeyCodeForChar(cSmall); + int iLarge = ExtendedKeyCodes.getExtendedKeyCodeForChar(cLarge); + + System.out.print(" " + cSmall + ":" + iSmall + " ---- "); + System.out.println(" " + cLarge + " : " + iLarge); + if (ExtendedKeyCodes.getExtendedKeyCodeForChar(cSmall) != + ExtendedKeyCodes.getExtendedKeyCodeForChar(cLarge)) + { + throw new RuntimeException("ExtendedKeyCode doesn't exist or doesn't match between capital and small letters."); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/beans/XMLEncoder/java_io_File.java --- a/jdk/test/java/beans/XMLEncoder/java_io_File.java Wed May 11 16:12:01 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008, 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 6708550 - * @summary Tests File encoding - * @author Sergey Malenkov - */ - -import java.io.File; - -public final class java_io_File extends AbstractTest<File> { - public static void main(String[] args) { - new java_io_File().test(true); - } - - @Override - protected File getObject() { - return new File("test.txt"); // NON-NLS: local file - } - - @Override - protected File getAnotherObject() { - return new File("/pub/demo/"); // NON-NLS: path - } -} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Character/CheckProp.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/Character/CheckProp.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2011, 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 7037261 + * @summary Check j.l.Character.isLowerCase/isUppercase/isAlphabetic/isIdeographic + */ + +import java.util.regex.*; +import java.util.*; +import java.io.*; +import static java.lang.Character.*; + +public class CheckProp { + + public static void main(String[] args) throws IOException { + File fPropList = new File(System.getProperty("test.src", "."), "PropList.txt"); + int i, j; + BufferedReader sbfr = new BufferedReader(new FileReader(fPropList)); + Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher(""); + Map<String, ArrayList<Integer>> propMap = new LinkedHashMap<>(); + + String line = null; + int lineNo = 0; + while ((line = sbfr.readLine()) != null) { + lineNo++; + if (line.length() <= 1 || line.charAt(0) == '#') { + continue; + } + m.reset(line); + if (m.matches()) { + int start = Integer.parseInt(m.group(1), 16); + int end = (m.group(2)==null)?start + :Integer.parseInt(m.group(2), 16); + String name = m.group(3); + + ArrayList<Integer> list = propMap.get(name); + if (list == null) { + list = new ArrayList<Integer>(); + propMap.put(name, list); + } + while (start <= end) + list.add(start++); + } else { + System.out.printf("Warning: Unrecognized line %d <%s>%n", lineNo, line); + } + } + sbfr.close(); + //for (String name: propMap.keySet()) { + // System.out.printf("%s %d%n", name, propMap.get(name).size()); + //} + + Integer[] otherLowercase = propMap.get("Other_Lowercase").toArray(new Integer[0]); + Integer[] otherUppercase = propMap.get("Other_Uppercase").toArray(new Integer[0]); + Integer[] otherAlphabetic = propMap.get("Other_Alphabetic").toArray(new Integer[0]); + Integer[] ideographic = propMap.get("Ideographic").toArray(new Integer[0]); + + int fails = 0; + for (int cp = MIN_CODE_POINT; cp < MAX_CODE_POINT; cp++) { + int type = getType(cp); + if (isLowerCase(cp) != + (type == LOWERCASE_LETTER || + Arrays.binarySearch(otherLowercase, cp) >= 0)) + { + fails++; + System.err.printf("Wrong isLowerCase(U+%04x)\n", cp); + } + if (isUpperCase(cp) != + (type == UPPERCASE_LETTER || + Arrays.binarySearch(otherUppercase, cp) >= 0)) + { + fails++; + System.err.printf("Wrong isUpperCase(U+%04x)\n", cp); + } + if (isAlphabetic(cp) != + (type == UPPERCASE_LETTER || type == LOWERCASE_LETTER || + type == TITLECASE_LETTER || type == MODIFIER_LETTER || + type == OTHER_LETTER || type == OTHER_LETTER || + type == LETTER_NUMBER || + Arrays.binarySearch(otherAlphabetic, cp) >=0)) + { + fails++; + System.err.printf("Wrong isAlphabetic(U+%04x)\n", cp); + } + if (isIdeographic(cp) != + (Arrays.binarySearch(ideographic, cp) >= 0)) + { + fails++; + System.err.printf("Wrong isIdeographic(U+%04x)\n", cp); + } + } + if (fails != 0) + throw new RuntimeException("CheckProp failed=" + fails); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Character/PropList.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/Character/PropList.txt Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,1296 @@ +# PropList-6.0.0.txt +# Date: 2010-08-19, 00:48:28 GMT [MD] +# +# Unicode Character Database +# Copyright (c) 1991-2010 Unicode, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# For documentation, see http://www.unicode.org/reports/tr44/ + +# ================================================ + +0009..000D ; White_Space # Cc [5] <control-0009>..<control-000D> +0020 ; White_Space # Zs SPACE +0085 ; White_Space # Cc <control-0085> +00A0 ; White_Space # Zs NO-BREAK SPACE +1680 ; White_Space # Zs OGHAM SPACE MARK +180E ; White_Space # Zs MONGOLIAN VOWEL SEPARATOR +2000..200A ; White_Space # Zs [11] EN QUAD..HAIR SPACE +2028 ; White_Space # Zl LINE SEPARATOR +2029 ; White_Space # Zp PARAGRAPH SEPARATOR +202F ; White_Space # Zs NARROW NO-BREAK SPACE +205F ; White_Space # Zs MEDIUM MATHEMATICAL SPACE +3000 ; White_Space # Zs IDEOGRAPHIC SPACE + +# Total code points: 26 + +# ================================================ + +200E..200F ; Bidi_Control # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK +202A..202E ; Bidi_Control # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE + +# Total code points: 7 + +# ================================================ + +200C..200D ; Join_Control # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER + +# Total code points: 2 + +# ================================================ + +002D ; Dash # Pd HYPHEN-MINUS +058A ; Dash # Pd ARMENIAN HYPHEN +05BE ; Dash # Pd HEBREW PUNCTUATION MAQAF +1400 ; Dash # Pd CANADIAN SYLLABICS HYPHEN +1806 ; Dash # Pd MONGOLIAN TODO SOFT HYPHEN +2010..2015 ; Dash # Pd [6] HYPHEN..HORIZONTAL BAR +2053 ; Dash # Po SWUNG DASH +207B ; Dash # Sm SUPERSCRIPT MINUS +208B ; Dash # Sm SUBSCRIPT MINUS +2212 ; Dash # Sm MINUS SIGN +2E17 ; Dash # Pd DOUBLE OBLIQUE HYPHEN +2E1A ; Dash # Pd HYPHEN WITH DIAERESIS +301C ; Dash # Pd WAVE DASH +3030 ; Dash # Pd WAVY DASH +30A0 ; Dash # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +FE31..FE32 ; Dash # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE58 ; Dash # Pd SMALL EM DASH +FE63 ; Dash # Pd SMALL HYPHEN-MINUS +FF0D ; Dash # Pd FULLWIDTH HYPHEN-MINUS + +# Total code points: 25 + +# ================================================ + +002D ; Hyphen # Pd HYPHEN-MINUS +00AD ; Hyphen # Cf SOFT HYPHEN +058A ; Hyphen # Pd ARMENIAN HYPHEN +1806 ; Hyphen # Pd MONGOLIAN TODO SOFT HYPHEN +2010..2011 ; Hyphen # Pd [2] HYPHEN..NON-BREAKING HYPHEN +2E17 ; Hyphen # Pd DOUBLE OBLIQUE HYPHEN +30FB ; Hyphen # Po KATAKANA MIDDLE DOT +FE63 ; Hyphen # Pd SMALL HYPHEN-MINUS +FF0D ; Hyphen # Pd FULLWIDTH HYPHEN-MINUS +FF65 ; Hyphen # Po HALFWIDTH KATAKANA MIDDLE DOT + +# Total code points: 11 + +# ================================================ + +0022 ; Quotation_Mark # Po QUOTATION MARK +0027 ; Quotation_Mark # Po APOSTROPHE +00AB ; Quotation_Mark # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00BB ; Quotation_Mark # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +2018 ; Quotation_Mark # Pi LEFT SINGLE QUOTATION MARK +2019 ; Quotation_Mark # Pf RIGHT SINGLE QUOTATION MARK +201A ; Quotation_Mark # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; Quotation_Mark # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; Quotation_Mark # Pf RIGHT DOUBLE QUOTATION MARK +201E ; Quotation_Mark # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; Quotation_Mark # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2039 ; Quotation_Mark # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Quotation_Mark # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +300C ; Quotation_Mark # Ps LEFT CORNER BRACKET +300D ; Quotation_Mark # Pe RIGHT CORNER BRACKET +300E ; Quotation_Mark # Ps LEFT WHITE CORNER BRACKET +300F ; Quotation_Mark # Pe RIGHT WHITE CORNER BRACKET +301D ; Quotation_Mark # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Quotation_Mark # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +FE41 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE42 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE43 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE44 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FF02 ; Quotation_Mark # Po FULLWIDTH QUOTATION MARK +FF07 ; Quotation_Mark # Po FULLWIDTH APOSTROPHE +FF62 ; Quotation_Mark # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; Quotation_Mark # Pe HALFWIDTH RIGHT CORNER BRACKET + +# Total code points: 29 + +# ================================================ + +0021 ; Terminal_Punctuation # Po EXCLAMATION MARK +002C ; Terminal_Punctuation # Po COMMA +002E ; Terminal_Punctuation # Po FULL STOP +003A..003B ; Terminal_Punctuation # Po [2] COLON..SEMICOLON +003F ; Terminal_Punctuation # Po QUESTION MARK +037E ; Terminal_Punctuation # Po GREEK QUESTION MARK +0387 ; Terminal_Punctuation # Po GREEK ANO TELEIA +0589 ; Terminal_Punctuation # Po ARMENIAN FULL STOP +05C3 ; Terminal_Punctuation # Po HEBREW PUNCTUATION SOF PASUQ +060C ; Terminal_Punctuation # Po ARABIC COMMA +061B ; Terminal_Punctuation # Po ARABIC SEMICOLON +061F ; Terminal_Punctuation # Po ARABIC QUESTION MARK +06D4 ; Terminal_Punctuation # Po ARABIC FULL STOP +0700..070A ; Terminal_Punctuation # Po [11] SYRIAC END OF PARAGRAPH..SYRIAC CONTRACTION +070C ; Terminal_Punctuation # Po SYRIAC HARKLEAN METOBELUS +07F8..07F9 ; Terminal_Punctuation # Po [2] NKO COMMA..NKO EXCLAMATION MARK +0830..083E ; Terminal_Punctuation # Po [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU +085E ; Terminal_Punctuation # Po MANDAIC PUNCTUATION +0964..0965 ; Terminal_Punctuation # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0E5A..0E5B ; Terminal_Punctuation # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0F08 ; Terminal_Punctuation # Po TIBETAN MARK SBRUL SHAD +0F0D..0F12 ; Terminal_Punctuation # Po [6] TIBETAN MARK SHAD..TIBETAN MARK RGYA GRAM SHAD +104A..104B ; Terminal_Punctuation # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION +1361..1368 ; Terminal_Punctuation # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +166D..166E ; Terminal_Punctuation # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +16EB..16ED ; Terminal_Punctuation # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +17D4..17D6 ; Terminal_Punctuation # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17DA ; Terminal_Punctuation # Po KHMER SIGN KOOMUUT +1802..1805 ; Terminal_Punctuation # Po [4] MONGOLIAN COMMA..MONGOLIAN FOUR DOTS +1808..1809 ; Terminal_Punctuation # Po [2] MONGOLIAN MANCHU COMMA..MONGOLIAN MANCHU FULL STOP +1944..1945 ; Terminal_Punctuation # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK +1AA8..1AAB ; Terminal_Punctuation # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B5A..1B5B ; Terminal_Punctuation # Po [2] BALINESE PANTI..BALINESE PAMADA +1B5D..1B5F ; Terminal_Punctuation # Po [3] BALINESE CARIK PAMUNGKAH..BALINESE CARIK PAREREN +1C3B..1C3F ; Terminal_Punctuation # Po [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK +1C7E..1C7F ; Terminal_Punctuation # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +203C..203D ; Terminal_Punctuation # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +2047..2049 ; Terminal_Punctuation # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2E2E ; Terminal_Punctuation # Po REVERSED QUESTION MARK +3001..3002 ; Terminal_Punctuation # Po [2] IDEOGRAPHIC COMMA..IDEOGRAPHIC FULL STOP +A4FE..A4FF ; Terminal_Punctuation # Po [2] LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP +A60D..A60F ; Terminal_Punctuation # Po [3] VAI COMMA..VAI QUESTION MARK +A6F3..A6F7 ; Terminal_Punctuation # Po [5] BAMUM FULL STOP..BAMUM QUESTION MARK +A876..A877 ; Terminal_Punctuation # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD +A8CE..A8CF ; Terminal_Punctuation # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA +A92F ; Terminal_Punctuation # Po KAYAH LI SIGN SHYA +A9C7..A9C9 ; Terminal_Punctuation # Po [3] JAVANESE PADA PANGKAT..JAVANESE PADA LUNGSI +AA5D..AA5F ; Terminal_Punctuation # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA +AADF ; Terminal_Punctuation # Po TAI VIET SYMBOL KOI KOI +ABEB ; Terminal_Punctuation # Po MEETEI MAYEK CHEIKHEI +FE50..FE52 ; Terminal_Punctuation # Po [3] SMALL COMMA..SMALL FULL STOP +FE54..FE57 ; Terminal_Punctuation # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK +FF01 ; Terminal_Punctuation # Po FULLWIDTH EXCLAMATION MARK +FF0C ; Terminal_Punctuation # Po FULLWIDTH COMMA +FF0E ; Terminal_Punctuation # Po FULLWIDTH FULL STOP +FF1A..FF1B ; Terminal_Punctuation # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON +FF1F ; Terminal_Punctuation # Po FULLWIDTH QUESTION MARK +FF61 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF64 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC COMMA +1039F ; Terminal_Punctuation # Po UGARITIC WORD DIVIDER +103D0 ; Terminal_Punctuation # Po OLD PERSIAN WORD DIVIDER +10857 ; Terminal_Punctuation # Po IMPERIAL ARAMAIC SECTION SIGN +1091F ; Terminal_Punctuation # Po PHOENICIAN WORD SEPARATOR +10B3A..10B3F ; Terminal_Punctuation # Po [6] TINY TWO DOTS OVER ONE DOT PUNCTUATION..LARGE ONE RING OVER TWO RINGS PUNCTUATION +11047..1104D ; Terminal_Punctuation # Po [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS +110BE..110C1 ; Terminal_Punctuation # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA +12470..12473 ; Terminal_Punctuation # Po [4] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON + +# Total code points: 169 + +# ================================================ + +005E ; Other_Math # Sk CIRCUMFLEX ACCENT +03D0..03D2 ; Other_Math # L& [3] GREEK BETA SYMBOL..GREEK UPSILON WITH HOOK SYMBOL +03D5 ; Other_Math # L& GREEK PHI SYMBOL +03F0..03F1 ; Other_Math # L& [2] GREEK KAPPA SYMBOL..GREEK RHO SYMBOL +03F4..03F5 ; Other_Math # L& [2] GREEK CAPITAL THETA SYMBOL..GREEK LUNATE EPSILON SYMBOL +2016 ; Other_Math # Po DOUBLE VERTICAL LINE +2032..2034 ; Other_Math # Po [3] PRIME..TRIPLE PRIME +2040 ; Other_Math # Pc CHARACTER TIE +2061..2064 ; Other_Math # Cf [4] FUNCTION APPLICATION..INVISIBLE PLUS +207D ; Other_Math # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; Other_Math # Pe SUPERSCRIPT RIGHT PARENTHESIS +208D ; Other_Math # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; Other_Math # Pe SUBSCRIPT RIGHT PARENTHESIS +20D0..20DC ; Other_Math # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE +20E1 ; Other_Math # Mn COMBINING LEFT RIGHT ARROW ABOVE +20E5..20E6 ; Other_Math # Mn [2] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING DOUBLE VERTICAL STROKE OVERLAY +20EB..20EF ; Other_Math # Mn [5] COMBINING LONG DOUBLE SOLIDUS OVERLAY..COMBINING RIGHT ARROW BELOW +2102 ; Other_Math # L& DOUBLE-STRUCK CAPITAL C +2107 ; Other_Math # L& EULER CONSTANT +210A..2113 ; Other_Math # L& [10] SCRIPT SMALL G..SCRIPT SMALL L +2115 ; Other_Math # L& DOUBLE-STRUCK CAPITAL N +2119..211D ; Other_Math # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +2124 ; Other_Math # L& DOUBLE-STRUCK CAPITAL Z +2128 ; Other_Math # L& BLACK-LETTER CAPITAL Z +2129 ; Other_Math # So TURNED GREEK SMALL LETTER IOTA +212C..212D ; Other_Math # L& [2] SCRIPT CAPITAL B..BLACK-LETTER CAPITAL C +212F..2131 ; Other_Math # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F +2133..2134 ; Other_Math # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O +2135..2138 ; Other_Math # Lo [4] ALEF SYMBOL..DALET SYMBOL +213C..213F ; Other_Math # L& [4] DOUBLE-STRUCK SMALL PI..DOUBLE-STRUCK CAPITAL PI +2145..2149 ; Other_Math # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J +2195..2199 ; Other_Math # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219C..219F ; Other_Math # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A1..21A2 ; Other_Math # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A4..21A5 ; Other_Math # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A7 ; Other_Math # So DOWNWARDS ARROW FROM BAR +21A9..21AD ; Other_Math # So [5] LEFTWARDS ARROW WITH HOOK..LEFT RIGHT WAVE ARROW +21B0..21B1 ; Other_Math # So [2] UPWARDS ARROW WITH TIP LEFTWARDS..UPWARDS ARROW WITH TIP RIGHTWARDS +21B6..21B7 ; Other_Math # So [2] ANTICLOCKWISE TOP SEMICIRCLE ARROW..CLOCKWISE TOP SEMICIRCLE ARROW +21BC..21CD ; Other_Math # So [18] LEFTWARDS HARPOON WITH BARB UPWARDS..LEFTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; Other_Math # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D3 ; Other_Math # So DOWNWARDS DOUBLE ARROW +21D5..21DB ; Other_Math # So [7] UP DOWN DOUBLE ARROW..RIGHTWARDS TRIPLE ARROW +21DD ; Other_Math # So RIGHTWARDS SQUIGGLE ARROW +21E4..21E5 ; Other_Math # So [2] LEFTWARDS ARROW TO BAR..RIGHTWARDS ARROW TO BAR +23B4..23B5 ; Other_Math # So [2] TOP SQUARE BRACKET..BOTTOM SQUARE BRACKET +23B7 ; Other_Math # So RADICAL SYMBOL BOTTOM +23D0 ; Other_Math # So VERTICAL LINE EXTENSION +23E2 ; Other_Math # So WHITE TRAPEZIUM +25A0..25A1 ; Other_Math # So [2] BLACK SQUARE..WHITE SQUARE +25AE..25B6 ; Other_Math # So [9] BLACK VERTICAL RECTANGLE..BLACK RIGHT-POINTING TRIANGLE +25BC..25C0 ; Other_Math # So [5] BLACK DOWN-POINTING TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C6..25C7 ; Other_Math # So [2] BLACK DIAMOND..WHITE DIAMOND +25CA..25CB ; Other_Math # So [2] LOZENGE..WHITE CIRCLE +25CF..25D3 ; Other_Math # So [5] BLACK CIRCLE..CIRCLE WITH UPPER HALF BLACK +25E2 ; Other_Math # So BLACK LOWER RIGHT TRIANGLE +25E4 ; Other_Math # So BLACK UPPER LEFT TRIANGLE +25E7..25EC ; Other_Math # So [6] SQUARE WITH LEFT HALF BLACK..WHITE UP-POINTING TRIANGLE WITH DOT +2605..2606 ; Other_Math # So [2] BLACK STAR..WHITE STAR +2640 ; Other_Math # So FEMALE SIGN +2642 ; Other_Math # So MALE SIGN +2660..2663 ; Other_Math # So [4] BLACK SPADE SUIT..BLACK CLUB SUIT +266D..266E ; Other_Math # So [2] MUSIC FLAT SIGN..MUSIC NATURAL SIGN +27C5 ; Other_Math # Ps LEFT S-SHAPED BAG DELIMITER +27C6 ; Other_Math # Pe RIGHT S-SHAPED BAG DELIMITER +27E6 ; Other_Math # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Other_Math # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Other_Math # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Other_Math # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Other_Math # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Other_Math # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27EC ; Other_Math # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET +27ED ; Other_Math # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET +27EE ; Other_Math # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS +27EF ; Other_Math # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS +2983 ; Other_Math # Ps LEFT WHITE CURLY BRACKET +2984 ; Other_Math # Pe RIGHT WHITE CURLY BRACKET +2985 ; Other_Math # Ps LEFT WHITE PARENTHESIS +2986 ; Other_Math # Pe RIGHT WHITE PARENTHESIS +2987 ; Other_Math # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Other_Math # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Other_Math # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Other_Math # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Other_Math # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Other_Math # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Other_Math # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Other_Math # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Other_Math # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Other_Math # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Other_Math # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Other_Math # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Other_Math # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Other_Math # Pe RIGHT BLACK TORTOISE SHELL BRACKET +29D8 ; Other_Math # Ps LEFT WIGGLY FENCE +29D9 ; Other_Math # Pe RIGHT WIGGLY FENCE +29DA ; Other_Math # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Other_Math # Pe RIGHT DOUBLE WIGGLY FENCE +29FC ; Other_Math # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Other_Math # Pe RIGHT-POINTING CURVED ANGLE BRACKET +FE61 ; Other_Math # Po SMALL ASTERISK +FE63 ; Other_Math # Pd SMALL HYPHEN-MINUS +FE68 ; Other_Math # Po SMALL REVERSE SOLIDUS +FF3C ; Other_Math # Po FULLWIDTH REVERSE SOLIDUS +FF3E ; Other_Math # Sk FULLWIDTH CIRCUMFLEX ACCENT +1D400..1D454 ; Other_Math # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G +1D456..1D49C ; Other_Math # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; Other_Math # L& MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; Other_Math # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B9 ; Other_Math # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D +1D4BB ; Other_Math # L& MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C3 ; Other_Math # L& [7] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D505 ; Other_Math # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; Other_Math # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; Other_Math # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; Other_Math # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D51E..1D539 ; Other_Math # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; Other_Math # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; Other_Math # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; Other_Math # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; Other_Math # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D552..1D6A5 ; Other_Math # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D6A8..1D6C0 ; Other_Math # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6C2..1D6DA ; Other_Math # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DC..1D6FA ; Other_Math # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA +1D6FC..1D714 ; Other_Math # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D716..1D734 ; Other_Math # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D736..1D74E ; Other_Math # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D750..1D76E ; Other_Math # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D770..1D788 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D78A..1D7A8 ; Other_Math # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA +1D7AA..1D7C2 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C4..1D7CB ; Other_Math # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1D7CE..1D7FF ; Other_Math # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 1217 + +# ================================================ + +0030..0039 ; Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE +0041..0046 ; Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F +0061..0066 ; Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F +FF10..FF19 ; Hex_Digit # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +FF21..FF26 ; Hex_Digit # L& [6] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER F +FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER F + +# Total code points: 44 + +# ================================================ + +0030..0039 ; ASCII_Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE +0041..0046 ; ASCII_Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F +0061..0066 ; ASCII_Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F + +# Total code points: 22 + +# ================================================ + +0345 ; Other_Alphabetic # Mn COMBINING GREEK YPOGEGRAMMENI +05B0..05BD ; Other_Alphabetic # Mn [14] HEBREW POINT SHEVA..HEBREW POINT METEG +05BF ; Other_Alphabetic # Mn HEBREW POINT RAFE +05C1..05C2 ; Other_Alphabetic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4..05C5 ; Other_Alphabetic # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT +05C7 ; Other_Alphabetic # Mn HEBREW POINT QAMATS QATAN +0610..061A ; Other_Alphabetic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA +064B..0657 ; Other_Alphabetic # Mn [13] ARABIC FATHATAN..ARABIC INVERTED DAMMA +0659..065F ; Other_Alphabetic # Mn [7] ARABIC ZWARAKAY..ARABIC WAVY HAMZA BELOW +0670 ; Other_Alphabetic # Mn ARABIC LETTER SUPERSCRIPT ALEF +06D6..06DC ; Other_Alphabetic # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06E1..06E4 ; Other_Alphabetic # Mn [4] ARABIC SMALL HIGH DOTLESS HEAD OF KHAH..ARABIC SMALL HIGH MADDA +06E7..06E8 ; Other_Alphabetic # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06ED ; Other_Alphabetic # Mn ARABIC SMALL LOW MEEM +0711 ; Other_Alphabetic # Mn SYRIAC LETTER SUPERSCRIPT ALAPH +0730..073F ; Other_Alphabetic # Mn [16] SYRIAC PTHAHA ABOVE..SYRIAC RWAHA +07A6..07B0 ; Other_Alphabetic # Mn [11] THAANA ABAFILI..THAANA SUKUN +0816..0817 ; Other_Alphabetic # Mn [2] SAMARITAN MARK IN..SAMARITAN MARK IN-ALAF +081B..0823 ; Other_Alphabetic # Mn [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A +0825..0827 ; Other_Alphabetic # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U +0829..082C ; Other_Alphabetic # Mn [4] SAMARITAN VOWEL SIGN LONG I..SAMARITAN VOWEL SIGN SUKUN +0900..0902 ; Other_Alphabetic # Mn [3] DEVANAGARI SIGN INVERTED CANDRABINDU..DEVANAGARI SIGN ANUSVARA +0903 ; Other_Alphabetic # Mc DEVANAGARI SIGN VISARGA +093A ; Other_Alphabetic # Mn DEVANAGARI VOWEL SIGN OE +093B ; Other_Alphabetic # Mc DEVANAGARI VOWEL SIGN OOE +093E..0940 ; Other_Alphabetic # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0941..0948 ; Other_Alphabetic # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +0949..094C ; Other_Alphabetic # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +094E..094F ; Other_Alphabetic # Mc [2] DEVANAGARI VOWEL SIGN PRISHTHAMATRA E..DEVANAGARI VOWEL SIGN AW +0955..0957 ; Other_Alphabetic # Mn [3] DEVANAGARI VOWEL SIGN CANDRA LONG E..DEVANAGARI VOWEL SIGN UUE +0962..0963 ; Other_Alphabetic # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0981 ; Other_Alphabetic # Mn BENGALI SIGN CANDRABINDU +0982..0983 ; Other_Alphabetic # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +09BE..09C0 ; Other_Alphabetic # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C1..09C4 ; Other_Alphabetic # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09C7..09C8 ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09D7 ; Other_Alphabetic # Mc BENGALI AU LENGTH MARK +09E2..09E3 ; Other_Alphabetic # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +0A01..0A02 ; Other_Alphabetic # Mn [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI +0A03 ; Other_Alphabetic # Mc GURMUKHI SIGN VISARGA +0A3E..0A40 ; Other_Alphabetic # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A41..0A42 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4C ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN OO..GURMUKHI VOWEL SIGN AU +0A51 ; Other_Alphabetic # Mn GURMUKHI SIGN UDAAT +0A70..0A71 ; Other_Alphabetic # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A75 ; Other_Alphabetic # Mn GURMUKHI SIGN YAKASH +0A81..0A82 ; Other_Alphabetic # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0A83 ; Other_Alphabetic # Mc GUJARATI SIGN VISARGA +0ABE..0AC0 ; Other_Alphabetic # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC1..0AC5 ; Other_Alphabetic # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0AC9 ; Other_Alphabetic # Mc GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; Other_Alphabetic # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0AE2..0AE3 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL +0B01 ; Other_Alphabetic # Mn ORIYA SIGN CANDRABINDU +0B02..0B03 ; Other_Alphabetic # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B3E ; Other_Alphabetic # Mc ORIYA VOWEL SIGN AA +0B3F ; Other_Alphabetic # Mn ORIYA VOWEL SIGN I +0B40 ; Other_Alphabetic # Mc ORIYA VOWEL SIGN II +0B41..0B44 ; Other_Alphabetic # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR +0B47..0B48 ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B56 ; Other_Alphabetic # Mn ORIYA AI LENGTH MARK +0B57 ; Other_Alphabetic # Mc ORIYA AU LENGTH MARK +0B62..0B63 ; Other_Alphabetic # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL +0B82 ; Other_Alphabetic # Mn TAMIL SIGN ANUSVARA +0BBE..0BBF ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC0 ; Other_Alphabetic # Mn TAMIL VOWEL SIGN II +0BC1..0BC2 ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BD7 ; Other_Alphabetic # Mc TAMIL AU LENGTH MARK +0C01..0C03 ; Other_Alphabetic # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C3E..0C40 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C41..0C44 ; Other_Alphabetic # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C46..0C48 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4C ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU +0C55..0C56 ; Other_Alphabetic # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK +0C62..0C63 ; Other_Alphabetic # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL +0C82..0C83 ; Other_Alphabetic # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0CBE ; Other_Alphabetic # Mc KANNADA VOWEL SIGN AA +0CBF ; Other_Alphabetic # Mn KANNADA VOWEL SIGN I +0CC0..0CC4 ; Other_Alphabetic # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC6 ; Other_Alphabetic # Mn KANNADA VOWEL SIGN E +0CC7..0CC8 ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CCC ; Other_Alphabetic # Mn KANNADA VOWEL SIGN AU +0CD5..0CD6 ; Other_Alphabetic # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0CE2..0CE3 ; Other_Alphabetic # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL +0D02..0D03 ; Other_Alphabetic # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D3E..0D40 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D41..0D44 ; Other_Alphabetic # Mn [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR +0D46..0D48 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D57 ; Other_Alphabetic # Mc MALAYALAM AU LENGTH MARK +0D62..0D63 ; Other_Alphabetic # Mn [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL +0D82..0D83 ; Other_Alphabetic # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0DCF..0DD1 ; Other_Alphabetic # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD2..0DD4 ; Other_Alphabetic # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; Other_Alphabetic # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA +0DD8..0DDF ; Other_Alphabetic # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; Other_Alphabetic # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0E31 ; Other_Alphabetic # Mn THAI CHARACTER MAI HAN-AKAT +0E34..0E3A ; Other_Alphabetic # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU +0E4D ; Other_Alphabetic # Mn THAI CHARACTER NIKHAHIT +0EB1 ; Other_Alphabetic # Mn LAO VOWEL SIGN MAI KAN +0EB4..0EB9 ; Other_Alphabetic # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU +0EBB..0EBC ; Other_Alphabetic # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0ECD ; Other_Alphabetic # Mn LAO NIGGAHITA +0F71..0F7E ; Other_Alphabetic # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO +0F7F ; Other_Alphabetic # Mc TIBETAN SIGN RNAM BCAD +0F80..0F81 ; Other_Alphabetic # Mn [2] TIBETAN VOWEL SIGN REVERSED I..TIBETAN VOWEL SIGN REVERSED II +0F8D..0F97 ; Other_Alphabetic # Mn [11] TIBETAN SUBJOINED SIGN LCE TSA CAN..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; Other_Alphabetic # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +102B..102C ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN TALL AA..MYANMAR VOWEL SIGN AA +102D..1030 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1031 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN E +1032..1036 ; Other_Alphabetic # Mn [5] MYANMAR VOWEL SIGN AI..MYANMAR SIGN ANUSVARA +1038 ; Other_Alphabetic # Mc MYANMAR SIGN VISARGA +103B..103C ; Other_Alphabetic # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA +103D..103E ; Other_Alphabetic # Mn [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA +1056..1057 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +1058..1059 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +105E..1060 ; Other_Alphabetic # Mn [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA +1062 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN SGAW KAREN EU +1067..1068 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN WESTERN PWO KAREN EU..MYANMAR VOWEL SIGN WESTERN PWO KAREN UE +1071..1074 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN GEBA KAREN I..MYANMAR VOWEL SIGN KAYAH EE +1082 ; Other_Alphabetic # Mn MYANMAR CONSONANT SIGN SHAN MEDIAL WA +1083..1084 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN SHAN AA..MYANMAR VOWEL SIGN SHAN E +1085..1086 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN SHAN E ABOVE..MYANMAR VOWEL SIGN SHAN FINAL Y +109C ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN AITON A +109D ; Other_Alphabetic # Mn MYANMAR VOWEL SIGN AITON AI +135F ; Other_Alphabetic # Mn ETHIOPIC COMBINING GEMINATION MARK +1712..1713 ; Other_Alphabetic # Mn [2] TAGALOG VOWEL SIGN I..TAGALOG VOWEL SIGN U +1732..1733 ; Other_Alphabetic # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1752..1753 ; Other_Alphabetic # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1772..1773 ; Other_Alphabetic # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +17B6 ; Other_Alphabetic # Mc KHMER VOWEL SIGN AA +17B7..17BD ; Other_Alphabetic # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17BE..17C5 ; Other_Alphabetic # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C6 ; Other_Alphabetic # Mn KHMER SIGN NIKAHIT +17C7..17C8 ; Other_Alphabetic # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +18A9 ; Other_Alphabetic # Mn MONGOLIAN LETTER ALI GALI DAGALGA +1920..1922 ; Other_Alphabetic # Mn [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U +1923..1926 ; Other_Alphabetic # Mc [4] LIMBU VOWEL SIGN EE..LIMBU VOWEL SIGN AU +1927..1928 ; Other_Alphabetic # Mn [2] LIMBU VOWEL SIGN E..LIMBU VOWEL SIGN O +1929..192B ; Other_Alphabetic # Mc [3] LIMBU SUBJOINED LETTER YA..LIMBU SUBJOINED LETTER WA +1930..1931 ; Other_Alphabetic # Mc [2] LIMBU SMALL LETTER KA..LIMBU SMALL LETTER NGA +1932 ; Other_Alphabetic # Mn LIMBU SMALL LETTER ANUSVARA +1933..1938 ; Other_Alphabetic # Mc [6] LIMBU SMALL LETTER TA..LIMBU SMALL LETTER LA +19B0..19C0 ; Other_Alphabetic # Mc [17] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE VOWEL SIGN IY +19C8..19C9 ; Other_Alphabetic # Mc [2] NEW TAI LUE TONE MARK-1..NEW TAI LUE TONE MARK-2 +1A17..1A18 ; Other_Alphabetic # Mn [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U +1A19..1A1B ; Other_Alphabetic # Mc [3] BUGINESE VOWEL SIGN E..BUGINESE VOWEL SIGN AE +1A55 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN MEDIAL RA +1A56 ; Other_Alphabetic # Mn TAI THAM CONSONANT SIGN MEDIAL LA +1A57 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN LA TANG LAI +1A58..1A5E ; Other_Alphabetic # Mn [7] TAI THAM SIGN MAI KANG LAI..TAI THAM CONSONANT SIGN SA +1A61 ; Other_Alphabetic # Mc TAI THAM VOWEL SIGN A +1A62 ; Other_Alphabetic # Mn TAI THAM VOWEL SIGN MAI SAT +1A63..1A64 ; Other_Alphabetic # Mc [2] TAI THAM VOWEL SIGN AA..TAI THAM VOWEL SIGN TALL AA +1A65..1A6C ; Other_Alphabetic # Mn [8] TAI THAM VOWEL SIGN I..TAI THAM VOWEL SIGN OA BELOW +1A6D..1A72 ; Other_Alphabetic # Mc [6] TAI THAM VOWEL SIGN OY..TAI THAM VOWEL SIGN THAM AI +1A73..1A74 ; Other_Alphabetic # Mn [2] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN MAI KANG +1B00..1B03 ; Other_Alphabetic # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG +1B04 ; Other_Alphabetic # Mc BALINESE SIGN BISAH +1B35 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN TEDUNG +1B36..1B3A ; Other_Alphabetic # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA +1B3B ; Other_Alphabetic # Mc BALINESE VOWEL SIGN RA REPA TEDUNG +1B3C ; Other_Alphabetic # Mn BALINESE VOWEL SIGN LA LENGA +1B3D..1B41 ; Other_Alphabetic # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG +1B42 ; Other_Alphabetic # Mn BALINESE VOWEL SIGN PEPET +1B43 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN PEPET TEDUNG +1B80..1B81 ; Other_Alphabetic # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR +1B82 ; Other_Alphabetic # Mc SUNDANESE SIGN PANGWISAD +1BA1 ; Other_Alphabetic # Mc SUNDANESE CONSONANT SIGN PAMINGKAL +1BA2..1BA5 ; Other_Alphabetic # Mn [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU +1BA6..1BA7 ; Other_Alphabetic # Mc [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG +1BA8..1BA9 ; Other_Alphabetic # Mn [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG +1BE7 ; Other_Alphabetic # Mc BATAK VOWEL SIGN E +1BE8..1BE9 ; Other_Alphabetic # Mn [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE +1BEA..1BEC ; Other_Alphabetic # Mc [3] BATAK VOWEL SIGN I..BATAK VOWEL SIGN O +1BED ; Other_Alphabetic # Mn BATAK VOWEL SIGN KARO O +1BEE ; Other_Alphabetic # Mc BATAK VOWEL SIGN U +1BEF..1BF1 ; Other_Alphabetic # Mn [3] BATAK VOWEL SIGN U FOR SIMALUNGUN SA..BATAK CONSONANT SIGN H +1C24..1C2B ; Other_Alphabetic # Mc [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU +1C2C..1C33 ; Other_Alphabetic # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T +1C34..1C35 ; Other_Alphabetic # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG +1CF2 ; Other_Alphabetic # Mc VEDIC SIGN ARDHAVISARGA +24B6..24E9 ; Other_Alphabetic # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z +2DE0..2DFF ; Other_Alphabetic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS +A823..A824 ; Other_Alphabetic # Mc [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I +A825..A826 ; Other_Alphabetic # Mn [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E +A827 ; Other_Alphabetic # Mc SYLOTI NAGRI VOWEL SIGN OO +A880..A881 ; Other_Alphabetic # Mc [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA +A8B4..A8C3 ; Other_Alphabetic # Mc [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU +A926..A92A ; Other_Alphabetic # Mn [5] KAYAH LI VOWEL UE..KAYAH LI VOWEL O +A947..A951 ; Other_Alphabetic # Mn [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R +A952 ; Other_Alphabetic # Mc REJANG CONSONANT SIGN H +A980..A982 ; Other_Alphabetic # Mn [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR +A983 ; Other_Alphabetic # Mc JAVANESE SIGN WIGNYAN +A9B4..A9B5 ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TARUNG..JAVANESE VOWEL SIGN TOLONG +A9B6..A9B9 ; Other_Alphabetic # Mn [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT +A9BA..A9BB ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TALING..JAVANESE VOWEL SIGN DIRGA MURE +A9BC ; Other_Alphabetic # Mn JAVANESE VOWEL SIGN PEPET +A9BD..A9BF ; Other_Alphabetic # Mc [3] JAVANESE CONSONANT SIGN KERET..JAVANESE CONSONANT SIGN CAKRA +AA29..AA2E ; Other_Alphabetic # Mn [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE +AA2F..AA30 ; Other_Alphabetic # Mc [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI +AA31..AA32 ; Other_Alphabetic # Mn [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE +AA33..AA34 ; Other_Alphabetic # Mc [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA +AA35..AA36 ; Other_Alphabetic # Mn [2] CHAM CONSONANT SIGN LA..CHAM CONSONANT SIGN WA +AA43 ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL NG +AA4C ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL M +AA4D ; Other_Alphabetic # Mc CHAM CONSONANT SIGN FINAL H +AAB0 ; Other_Alphabetic # Mn TAI VIET MAI KANG +AAB2..AAB4 ; Other_Alphabetic # Mn [3] TAI VIET VOWEL I..TAI VIET VOWEL U +AAB7..AAB8 ; Other_Alphabetic # Mn [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA +AABE ; Other_Alphabetic # Mn TAI VIET VOWEL AM +ABE3..ABE4 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP +ABE5 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN ANAP +ABE6..ABE7 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN YENAP..MEETEI MAYEK VOWEL SIGN SOUNAP +ABE8 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN UNAP +ABE9..ABEA ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN CHEINAP..MEETEI MAYEK VOWEL SIGN NUNG +FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA +10A01..10A03 ; Other_Alphabetic # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R +10A05..10A06 ; Other_Alphabetic # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O +10A0C..10A0F ; Other_Alphabetic # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA +11000 ; Other_Alphabetic # Mc BRAHMI SIGN CANDRABINDU +11001 ; Other_Alphabetic # Mn BRAHMI SIGN ANUSVARA +11002 ; Other_Alphabetic # Mc BRAHMI SIGN VISARGA +11038..11045 ; Other_Alphabetic # Mn [14] BRAHMI VOWEL SIGN AA..BRAHMI VOWEL SIGN AU +11082 ; Other_Alphabetic # Mc KAITHI SIGN VISARGA +110B0..110B2 ; Other_Alphabetic # Mc [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II +110B3..110B6 ; Other_Alphabetic # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI +110B7..110B8 ; Other_Alphabetic # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU + +# Total code points: 795 + +# ================================================ + +3006 ; Ideographic # Lo IDEOGRAPHIC CLOSING MARK +3007 ; Ideographic # Nl IDEOGRAPHIC NUMBER ZERO +3021..3029 ; Ideographic # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3038..303A ; Ideographic # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +3400..4DB5 ; Ideographic # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FCB ; Ideographic # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB +F900..FA2D ; Ideographic # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6D ; Ideographic # Lo [62] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6D +FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9 +20000..2A6D6 ; Ideographic # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2A700..2B734 ; Ideographic # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +2B740..2B81D ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D +2F800..2FA1D ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D + +# Total code points: 75630 + +# ================================================ + +005E ; Diacritic # Sk CIRCUMFLEX ACCENT +0060 ; Diacritic # Sk GRAVE ACCENT +00A8 ; Diacritic # Sk DIAERESIS +00AF ; Diacritic # Sk MACRON +00B4 ; Diacritic # Sk ACUTE ACCENT +00B7 ; Diacritic # Po MIDDLE DOT +00B8 ; Diacritic # Sk CEDILLA +02B0..02C1 ; Diacritic # Lm [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP +02C2..02C5 ; Diacritic # Sk [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD +02C6..02D1 ; Diacritic # Lm [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON +02D2..02DF ; Diacritic # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT +02E0..02E4 ; Diacritic # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02E5..02EB ; Diacritic # Sk [7] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER YANG DEPARTING TONE MARK +02EC ; Diacritic # Lm MODIFIER LETTER VOICING +02ED ; Diacritic # Sk MODIFIER LETTER UNASPIRATED +02EE ; Diacritic # Lm MODIFIER LETTER DOUBLE APOSTROPHE +02EF..02FF ; Diacritic # Sk [17] MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW +0300..034E ; Diacritic # Mn [79] COMBINING GRAVE ACCENT..COMBINING UPWARDS ARROW BELOW +0350..0357 ; Diacritic # Mn [8] COMBINING RIGHT ARROWHEAD ABOVE..COMBINING RIGHT HALF RING ABOVE +035D..0362 ; Diacritic # Mn [6] COMBINING DOUBLE BREVE..COMBINING DOUBLE RIGHTWARDS ARROW BELOW +0374 ; Diacritic # Lm GREEK NUMERAL SIGN +0375 ; Diacritic # Sk GREEK LOWER NUMERAL SIGN +037A ; Diacritic # Lm GREEK YPOGEGRAMMENI +0384..0385 ; Diacritic # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS +0483..0487 ; Diacritic # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE +0559 ; Diacritic # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0591..05A1 ; Diacritic # Mn [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER +05A3..05BD ; Diacritic # Mn [27] HEBREW ACCENT MUNAH..HEBREW POINT METEG +05BF ; Diacritic # Mn HEBREW POINT RAFE +05C1..05C2 ; Diacritic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4 ; Diacritic # Mn HEBREW MARK UPPER DOT +064B..0652 ; Diacritic # Mn [8] ARABIC FATHATAN..ARABIC SUKUN +0657..0658 ; Diacritic # Mn [2] ARABIC INVERTED DAMMA..ARABIC MARK NOON GHUNNA +06DF..06E0 ; Diacritic # Mn [2] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO +06E5..06E6 ; Diacritic # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH +06EA..06EC ; Diacritic # Mn [3] ARABIC EMPTY CENTRE LOW STOP..ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE +0730..074A ; Diacritic # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH +07A6..07B0 ; Diacritic # Mn [11] THAANA ABAFILI..THAANA SUKUN +07EB..07F3 ; Diacritic # Mn [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE +07F4..07F5 ; Diacritic # Lm [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE +0818..0819 ; Diacritic # Mn [2] SAMARITAN MARK OCCLUSION..SAMARITAN MARK DAGESH +093C ; Diacritic # Mn DEVANAGARI SIGN NUKTA +094D ; Diacritic # Mn DEVANAGARI SIGN VIRAMA +0951..0954 ; Diacritic # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT +0971 ; Diacritic # Lm DEVANAGARI SIGN HIGH SPACING DOT +09BC ; Diacritic # Mn BENGALI SIGN NUKTA +09CD ; Diacritic # Mn BENGALI SIGN VIRAMA +0A3C ; Diacritic # Mn GURMUKHI SIGN NUKTA +0A4D ; Diacritic # Mn GURMUKHI SIGN VIRAMA +0ABC ; Diacritic # Mn GUJARATI SIGN NUKTA +0ACD ; Diacritic # Mn GUJARATI SIGN VIRAMA +0B3C ; Diacritic # Mn ORIYA SIGN NUKTA +0B4D ; Diacritic # Mn ORIYA SIGN VIRAMA +0BCD ; Diacritic # Mn TAMIL SIGN VIRAMA +0C4D ; Diacritic # Mn TELUGU SIGN VIRAMA +0CBC ; Diacritic # Mn KANNADA SIGN NUKTA +0CCD ; Diacritic # Mn KANNADA SIGN VIRAMA +0D4D ; Diacritic # Mn MALAYALAM SIGN VIRAMA +0DCA ; Diacritic # Mn SINHALA SIGN AL-LAKUNA +0E47..0E4C ; Diacritic # Mn [6] THAI CHARACTER MAITAIKHU..THAI CHARACTER THANTHAKHAT +0E4E ; Diacritic # Mn THAI CHARACTER YAMAKKAN +0EC8..0ECC ; Diacritic # Mn [5] LAO TONE MAI EK..LAO CANCELLATION MARK +0F18..0F19 ; Diacritic # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F35 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG NYI ZLA +0F37 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS +0F39 ; Diacritic # Mn TIBETAN MARK TSA -PHRU +0F3E..0F3F ; Diacritic # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F82..0F84 ; Diacritic # Mn [3] TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA +0F86..0F87 ; Diacritic # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +0FC6 ; Diacritic # Mn TIBETAN SYMBOL PADMA GDAN +1037 ; Diacritic # Mn MYANMAR SIGN DOT BELOW +1039..103A ; Diacritic # Mn [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT +1087..108C ; Diacritic # Mc [6] MYANMAR SIGN SHAN TONE-2..MYANMAR SIGN SHAN COUNCIL TONE-3 +108D ; Diacritic # Mn MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE +108F ; Diacritic # Mc MYANMAR SIGN RUMAI PALAUNG TONE-5 +109A..109B ; Diacritic # Mc [2] MYANMAR SIGN KHAMTI TONE-1..MYANMAR SIGN KHAMTI TONE-3 +17C9..17D3 ; Diacritic # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT +17DD ; Diacritic # Mn KHMER SIGN ATTHACAN +1939..193B ; Diacritic # Mn [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I +1A75..1A7C ; Diacritic # Mn [8] TAI THAM SIGN TONE-1..TAI THAM SIGN KHUEN-LUE KARAN +1A7F ; Diacritic # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT +1B34 ; Diacritic # Mn BALINESE SIGN REREKAN +1B44 ; Diacritic # Mc BALINESE ADEG ADEG +1B6B..1B73 ; Diacritic # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG +1BAA ; Diacritic # Mc SUNDANESE SIGN PAMAAEH +1C36..1C37 ; Diacritic # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA +1C78..1C7D ; Diacritic # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD +1CD0..1CD2 ; Diacritic # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA +1CD3 ; Diacritic # Po VEDIC SIGN NIHSHVASA +1CD4..1CE0 ; Diacritic # Mn [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA +1CE1 ; Diacritic # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA +1CE2..1CE8 ; Diacritic # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL +1CED ; Diacritic # Mn VEDIC SIGN TIRYAK +1D2C..1D61 ; Diacritic # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI +1D62..1D6A ; Diacritic # L& [9] LATIN SUBSCRIPT SMALL LETTER I..GREEK SUBSCRIPT SMALL LETTER CHI +1DC4..1DCF ; Diacritic # Mn [12] COMBINING MACRON-ACUTE..COMBINING ZIGZAG BELOW +1DFD..1DFF ; Diacritic # Mn [3] COMBINING ALMOST EQUAL TO BELOW..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1FBD ; Diacritic # Sk GREEK KORONIS +1FBF..1FC1 ; Diacritic # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FCD..1FCF ; Diacritic # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FDD..1FDF ; Diacritic # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FED..1FEF ; Diacritic # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FFD..1FFE ; Diacritic # Sk [2] GREEK OXIA..GREEK DASIA +2CEF..2CF1 ; Diacritic # Mn [3] COPTIC COMBINING NI ABOVE..COPTIC COMBINING SPIRITUS LENIS +2E2F ; Diacritic # Lm VERTICAL TILDE +302A..302F ; Diacritic # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK +3099..309A ; Diacritic # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309B..309C ; Diacritic # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +30FC ; Diacritic # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK +A66F ; Diacritic # Mn COMBINING CYRILLIC VZMET +A67C..A67D ; Diacritic # Mn [2] COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK +A67F ; Diacritic # Lm CYRILLIC PAYEROK +A6F0..A6F1 ; Diacritic # Mn [2] BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS +A717..A71F ; Diacritic # Lm [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK +A720..A721 ; Diacritic # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE +A788 ; Diacritic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT +A8C4 ; Diacritic # Mn SAURASHTRA SIGN VIRAMA +A8E0..A8F1 ; Diacritic # Mn [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA +A92B..A92D ; Diacritic # Mn [3] KAYAH LI TONE PLOPHU..KAYAH LI TONE CALYA PLOPHU +A92E ; Diacritic # Po KAYAH LI SIGN CWI +A953 ; Diacritic # Mc REJANG VIRAMA +A9B3 ; Diacritic # Mn JAVANESE SIGN CECAK TELU +A9C0 ; Diacritic # Mc JAVANESE PANGKON +AA7B ; Diacritic # Mc MYANMAR SIGN PAO KAREN TONE +AABF ; Diacritic # Mn TAI VIET TONE MAI EK +AAC0 ; Diacritic # Lo TAI VIET TONE MAI NUENG +AAC1 ; Diacritic # Mn TAI VIET TONE MAI THO +AAC2 ; Diacritic # Lo TAI VIET TONE MAI SONG +ABEC ; Diacritic # Mc MEETEI MAYEK LUM IYEK +ABED ; Diacritic # Mn MEETEI MAYEK APUN IYEK +FB1E ; Diacritic # Mn HEBREW POINT JUDEO-SPANISH VARIKA +FE20..FE26 ; Diacritic # Mn [7] COMBINING LIGATURE LEFT HALF..COMBINING CONJOINING MACRON +FF3E ; Diacritic # Sk FULLWIDTH CIRCUMFLEX ACCENT +FF40 ; Diacritic # Sk FULLWIDTH GRAVE ACCENT +FF70 ; Diacritic # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF9E..FF9F ; Diacritic # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +FFE3 ; Diacritic # Sk FULLWIDTH MACRON +110B9..110BA ; Diacritic # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA +1D167..1D169 ; Diacritic # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 +1D16D..1D172 ; Diacritic # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 +1D17B..1D182 ; Diacritic # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D185..1D18B ; Diacritic # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE +1D1AA..1D1AD ; Diacritic # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO + +# Total code points: 639 + +# ================================================ + +00B7 ; Extender # Po MIDDLE DOT +02D0..02D1 ; Extender # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON +0640 ; Extender # Lm ARABIC TATWEEL +07FA ; Extender # Lm NKO LAJANYALAN +0E46 ; Extender # Lm THAI CHARACTER MAIYAMOK +0EC6 ; Extender # Lm LAO KO LA +1843 ; Extender # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN +1AA7 ; Extender # Lm TAI THAM SIGN MAI YAMOK +1C36 ; Extender # Mn LEPCHA SIGN RAN +1C7B ; Extender # Lm OL CHIKI RELAA +3005 ; Extender # Lm IDEOGRAPHIC ITERATION MARK +3031..3035 ; Extender # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +309D..309E ; Extender # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +30FC..30FE ; Extender # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +A015 ; Extender # Lm YI SYLLABLE WU +A60C ; Extender # Lm VAI SYLLABLE LENGTHENER +A9CF ; Extender # Lm JAVANESE PANGRANGKEP +AA70 ; Extender # Lm MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION +AADD ; Extender # Lm TAI VIET SYMBOL SAM +FF70 ; Extender # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK + +# Total code points: 28 + +# ================================================ + +02B0..02B8 ; Other_Lowercase # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02C0..02C1 ; Other_Lowercase # Lm [2] MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP +02E0..02E4 ; Other_Lowercase # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +0345 ; Other_Lowercase # Mn COMBINING GREEK YPOGEGRAMMENI +037A ; Other_Lowercase # Lm GREEK YPOGEGRAMMENI +1D2C..1D61 ; Other_Lowercase # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI +1D78 ; Other_Lowercase # Lm MODIFIER LETTER CYRILLIC EN +1D9B..1DBF ; Other_Lowercase # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA +2090..2094 ; Other_Lowercase # Lm [5] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER SCHWA +2170..217F ; Other_Lowercase # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND +24D0..24E9 ; Other_Lowercase # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +2C7D ; Other_Lowercase # Lm MODIFIER LETTER CAPITAL V +A770 ; Other_Lowercase # Lm MODIFIER LETTER US + +# Total code points: 159 + +# ================================================ + +2160..216F ; Other_Uppercase # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND +24B6..24CF ; Other_Uppercase # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z + +# Total code points: 42 + +# ================================================ + +FDD0..FDEF ; Noncharacter_Code_Point # Cn [32] <noncharacter-FDD0>..<noncharacter-FDEF> +FFFE..FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-FFFE>..<noncharacter-FFFF> +1FFFE..1FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-1FFFE>..<noncharacter-1FFFF> +2FFFE..2FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-2FFFE>..<noncharacter-2FFFF> +3FFFE..3FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-3FFFE>..<noncharacter-3FFFF> +4FFFE..4FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-4FFFE>..<noncharacter-4FFFF> +5FFFE..5FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-5FFFE>..<noncharacter-5FFFF> +6FFFE..6FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-6FFFE>..<noncharacter-6FFFF> +7FFFE..7FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-7FFFE>..<noncharacter-7FFFF> +8FFFE..8FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-8FFFE>..<noncharacter-8FFFF> +9FFFE..9FFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-9FFFE>..<noncharacter-9FFFF> +AFFFE..AFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-AFFFE>..<noncharacter-AFFFF> +BFFFE..BFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-BFFFE>..<noncharacter-BFFFF> +CFFFE..CFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-CFFFE>..<noncharacter-CFFFF> +DFFFE..DFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-DFFFE>..<noncharacter-DFFFF> +EFFFE..EFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-EFFFE>..<noncharacter-EFFFF> +FFFFE..FFFFF ; Noncharacter_Code_Point # Cn [2] <noncharacter-FFFFE>..<noncharacter-FFFFF> +10FFFE..10FFFF; Noncharacter_Code_Point # Cn [2] <noncharacter-10FFFE>..<noncharacter-10FFFF> + +# Total code points: 66 + +# ================================================ + +09BE ; Other_Grapheme_Extend # Mc BENGALI VOWEL SIGN AA +09D7 ; Other_Grapheme_Extend # Mc BENGALI AU LENGTH MARK +0B3E ; Other_Grapheme_Extend # Mc ORIYA VOWEL SIGN AA +0B57 ; Other_Grapheme_Extend # Mc ORIYA AU LENGTH MARK +0BBE ; Other_Grapheme_Extend # Mc TAMIL VOWEL SIGN AA +0BD7 ; Other_Grapheme_Extend # Mc TAMIL AU LENGTH MARK +0CC2 ; Other_Grapheme_Extend # Mc KANNADA VOWEL SIGN UU +0CD5..0CD6 ; Other_Grapheme_Extend # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0D3E ; Other_Grapheme_Extend # Mc MALAYALAM VOWEL SIGN AA +0D57 ; Other_Grapheme_Extend # Mc MALAYALAM AU LENGTH MARK +0DCF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN AELA-PILLA +0DDF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN GAYANUKITTA +200C..200D ; Other_Grapheme_Extend # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER +FF9E..FF9F ; Other_Grapheme_Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +1D165 ; Other_Grapheme_Extend # Mc MUSICAL SYMBOL COMBINING STEM +1D16E..1D172 ; Other_Grapheme_Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 + +# Total code points: 23 + +# ================================================ + +2FF0..2FF1 ; IDS_Binary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW +2FF4..2FFB ; IDS_Binary_Operator # So [8] IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID + +# Total code points: 10 + +# ================================================ + +2FF2..2FF3 ; IDS_Trinary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW + +# Total code points: 2 + +# ================================================ + +2E80..2E99 ; Radical # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; Radical # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; Radical # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE + +# Total code points: 329 + +# ================================================ + +3400..4DB5 ; Unified_Ideograph # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FCB ; Unified_Ideograph # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB +FA0E..FA0F ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F +FA11 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA11 +FA13..FA14 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14 +FA1F ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA1F +FA21 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA21 +FA23..FA24 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24 +FA27..FA29 ; Unified_Ideograph # Lo [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29 +20000..2A6D6 ; Unified_Ideograph # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2A700..2B734 ; Unified_Ideograph # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +2B740..2B81D ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D + +# Total code points: 74616 + +# ================================================ + +034F ; Other_Default_Ignorable_Code_Point # Mn COMBINING GRAPHEME JOINER +115F..1160 ; Other_Default_Ignorable_Code_Point # Lo [2] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER +2065..2069 ; Other_Default_Ignorable_Code_Point # Cn [5] <reserved-2065>..<reserved-2069> +3164 ; Other_Default_Ignorable_Code_Point # Lo HANGUL FILLER +FFA0 ; Other_Default_Ignorable_Code_Point # Lo HALFWIDTH HANGUL FILLER +FFF0..FFF8 ; Other_Default_Ignorable_Code_Point # Cn [9] <reserved-FFF0>..<reserved-FFF8> +E0000 ; Other_Default_Ignorable_Code_Point # Cn <reserved-E0000> +E0002..E001F ; Other_Default_Ignorable_Code_Point # Cn [30] <reserved-E0002>..<reserved-E001F> +E0080..E00FF ; Other_Default_Ignorable_Code_Point # Cn [128] <reserved-E0080>..<reserved-E00FF> +E01F0..E0FFF ; Other_Default_Ignorable_Code_Point # Cn [3600] <reserved-E01F0>..<reserved-E0FFF> + +# Total code points: 3778 + +# ================================================ + +0149 ; Deprecated # L& LATIN SMALL LETTER N PRECEDED BY APOSTROPHE +0673 ; Deprecated # Lo ARABIC LETTER ALEF WITH WAVY HAMZA BELOW +0F77 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC RR +0F79 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC LL +17A3..17A4 ; Deprecated # Lo [2] KHMER INDEPENDENT VOWEL QAQ..KHMER INDEPENDENT VOWEL QAA +206A..206F ; Deprecated # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +2329 ; Deprecated # Ps LEFT-POINTING ANGLE BRACKET +232A ; Deprecated # Pe RIGHT-POINTING ANGLE BRACKET +E0001 ; Deprecated # Cf LANGUAGE TAG +E0020..E007F ; Deprecated # Cf [96] TAG SPACE..CANCEL TAG + +# Total code points: 111 + +# ================================================ + +0069..006A ; Soft_Dotted # L& [2] LATIN SMALL LETTER I..LATIN SMALL LETTER J +012F ; Soft_Dotted # L& LATIN SMALL LETTER I WITH OGONEK +0249 ; Soft_Dotted # L& LATIN SMALL LETTER J WITH STROKE +0268 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH STROKE +029D ; Soft_Dotted # L& LATIN SMALL LETTER J WITH CROSSED-TAIL +02B2 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J +03F3 ; Soft_Dotted # L& GREEK LETTER YOT +0456 ; Soft_Dotted # L& CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I +0458 ; Soft_Dotted # L& CYRILLIC SMALL LETTER JE +1D62 ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER I +1D96 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH RETROFLEX HOOK +1DA4 ; Soft_Dotted # Lm MODIFIER LETTER SMALL I WITH STROKE +1DA8 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J WITH CROSSED-TAIL +1E2D ; Soft_Dotted # L& LATIN SMALL LETTER I WITH TILDE BELOW +1ECB ; Soft_Dotted # L& LATIN SMALL LETTER I WITH DOT BELOW +2071 ; Soft_Dotted # Lm SUPERSCRIPT LATIN SMALL LETTER I +2148..2149 ; Soft_Dotted # L& [2] DOUBLE-STRUCK ITALIC SMALL I..DOUBLE-STRUCK ITALIC SMALL J +2C7C ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER J +1D422..1D423 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SMALL I..MATHEMATICAL BOLD SMALL J +1D456..1D457 ; Soft_Dotted # L& [2] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL J +1D48A..1D48B ; Soft_Dotted # L& [2] MATHEMATICAL BOLD ITALIC SMALL I..MATHEMATICAL BOLD ITALIC SMALL J +1D4BE..1D4BF ; Soft_Dotted # L& [2] MATHEMATICAL SCRIPT SMALL I..MATHEMATICAL SCRIPT SMALL J +1D4F2..1D4F3 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SCRIPT SMALL I..MATHEMATICAL BOLD SCRIPT SMALL J +1D526..1D527 ; Soft_Dotted # L& [2] MATHEMATICAL FRAKTUR SMALL I..MATHEMATICAL FRAKTUR SMALL J +1D55A..1D55B ; Soft_Dotted # L& [2] MATHEMATICAL DOUBLE-STRUCK SMALL I..MATHEMATICAL DOUBLE-STRUCK SMALL J +1D58E..1D58F ; Soft_Dotted # L& [2] MATHEMATICAL BOLD FRAKTUR SMALL I..MATHEMATICAL BOLD FRAKTUR SMALL J +1D5C2..1D5C3 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF SMALL I..MATHEMATICAL SANS-SERIF SMALL J +1D5F6..1D5F7 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD SMALL I..MATHEMATICAL SANS-SERIF BOLD SMALL J +1D62A..1D62B ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF ITALIC SMALL I..MATHEMATICAL SANS-SERIF ITALIC SMALL J +1D65E..1D65F ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J +1D692..1D693 ; Soft_Dotted # L& [2] MATHEMATICAL MONOSPACE SMALL I..MATHEMATICAL MONOSPACE SMALL J + +# Total code points: 46 + +# ================================================ + +0E40..0E44 ; Logical_Order_Exception # Lo [5] THAI CHARACTER SARA E..THAI CHARACTER SARA AI MAIMALAI +0EC0..0EC4 ; Logical_Order_Exception # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +AAB5..AAB6 ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL E..TAI VIET VOWEL O +AAB9 ; Logical_Order_Exception # Lo TAI VIET VOWEL UEA +AABB..AABC ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL AUE..TAI VIET VOWEL AY + +# Total code points: 15 + +# ================================================ + +2118 ; Other_ID_Start # Sm SCRIPT CAPITAL P +212E ; Other_ID_Start # So ESTIMATED SYMBOL +309B..309C ; Other_ID_Start # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK + +# Total code points: 4 + +# ================================================ + +00B7 ; Other_ID_Continue # Po MIDDLE DOT +0387 ; Other_ID_Continue # Po GREEK ANO TELEIA +1369..1371 ; Other_ID_Continue # No [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +19DA ; Other_ID_Continue # No NEW TAI LUE THAM DIGIT ONE + +# Total code points: 12 + +# ================================================ + +0021 ; STerm # Po EXCLAMATION MARK +002E ; STerm # Po FULL STOP +003F ; STerm # Po QUESTION MARK +055C ; STerm # Po ARMENIAN EXCLAMATION MARK +055E ; STerm # Po ARMENIAN QUESTION MARK +0589 ; STerm # Po ARMENIAN FULL STOP +061F ; STerm # Po ARABIC QUESTION MARK +06D4 ; STerm # Po ARABIC FULL STOP +0700..0702 ; STerm # Po [3] SYRIAC END OF PARAGRAPH..SYRIAC SUBLINEAR FULL STOP +07F9 ; STerm # Po NKO EXCLAMATION MARK +0964..0965 ; STerm # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +104A..104B ; STerm # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION +1362 ; STerm # Po ETHIOPIC FULL STOP +1367..1368 ; STerm # Po [2] ETHIOPIC QUESTION MARK..ETHIOPIC PARAGRAPH SEPARATOR +166E ; STerm # Po CANADIAN SYLLABICS FULL STOP +1735..1736 ; STerm # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1803 ; STerm # Po MONGOLIAN FULL STOP +1809 ; STerm # Po MONGOLIAN MANCHU FULL STOP +1944..1945 ; STerm # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK +1AA8..1AAB ; STerm # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU +1B5A..1B5B ; STerm # Po [2] BALINESE PANTI..BALINESE PAMADA +1B5E..1B5F ; STerm # Po [2] BALINESE CARIK SIKI..BALINESE CARIK PAREREN +1C3B..1C3C ; STerm # Po [2] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION NYET THYOOM TA-ROL +1C7E..1C7F ; STerm # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD +203C..203D ; STerm # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +2047..2049 ; STerm # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK +2E2E ; STerm # Po REVERSED QUESTION MARK +3002 ; STerm # Po IDEOGRAPHIC FULL STOP +A4FF ; STerm # Po LISU PUNCTUATION FULL STOP +A60E..A60F ; STerm # Po [2] VAI FULL STOP..VAI QUESTION MARK +A6F3 ; STerm # Po BAMUM FULL STOP +A6F7 ; STerm # Po BAMUM QUESTION MARK +A876..A877 ; STerm # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD +A8CE..A8CF ; STerm # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA +A92F ; STerm # Po KAYAH LI SIGN SHYA +A9C8..A9C9 ; STerm # Po [2] JAVANESE PADA LINGSA..JAVANESE PADA LUNGSI +AA5D..AA5F ; STerm # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA +ABEB ; STerm # Po MEETEI MAYEK CHEIKHEI +FE52 ; STerm # Po SMALL FULL STOP +FE56..FE57 ; STerm # Po [2] SMALL QUESTION MARK..SMALL EXCLAMATION MARK +FF01 ; STerm # Po FULLWIDTH EXCLAMATION MARK +FF0E ; STerm # Po FULLWIDTH FULL STOP +FF1F ; STerm # Po FULLWIDTH QUESTION MARK +FF61 ; STerm # Po HALFWIDTH IDEOGRAPHIC FULL STOP +10A56..10A57 ; STerm # Po [2] KHAROSHTHI PUNCTUATION DANDA..KHAROSHTHI PUNCTUATION DOUBLE DANDA +11047..11048 ; STerm # Po [2] BRAHMI DANDA..BRAHMI DOUBLE DANDA +110BE..110C1 ; STerm # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA + +# Total code points: 76 + +# ================================================ + +180B..180D ; Variation_Selector # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +FE00..FE0F ; Variation_Selector # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +E0100..E01EF ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 + +# Total code points: 259 + +# ================================================ + +0009..000D ; Pattern_White_Space # Cc [5] <control-0009>..<control-000D> +0020 ; Pattern_White_Space # Zs SPACE +0085 ; Pattern_White_Space # Cc <control-0085> +200E..200F ; Pattern_White_Space # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK +2028 ; Pattern_White_Space # Zl LINE SEPARATOR +2029 ; Pattern_White_Space # Zp PARAGRAPH SEPARATOR + +# Total code points: 11 + +# ================================================ + +0021..0023 ; Pattern_Syntax # Po [3] EXCLAMATION MARK..NUMBER SIGN +0024 ; Pattern_Syntax # Sc DOLLAR SIGN +0025..0027 ; Pattern_Syntax # Po [3] PERCENT SIGN..APOSTROPHE +0028 ; Pattern_Syntax # Ps LEFT PARENTHESIS +0029 ; Pattern_Syntax # Pe RIGHT PARENTHESIS +002A ; Pattern_Syntax # Po ASTERISK +002B ; Pattern_Syntax # Sm PLUS SIGN +002C ; Pattern_Syntax # Po COMMA +002D ; Pattern_Syntax # Pd HYPHEN-MINUS +002E..002F ; Pattern_Syntax # Po [2] FULL STOP..SOLIDUS +003A..003B ; Pattern_Syntax # Po [2] COLON..SEMICOLON +003C..003E ; Pattern_Syntax # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN +003F..0040 ; Pattern_Syntax # Po [2] QUESTION MARK..COMMERCIAL AT +005B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET +005C ; Pattern_Syntax # Po REVERSE SOLIDUS +005D ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET +005E ; Pattern_Syntax # Sk CIRCUMFLEX ACCENT +0060 ; Pattern_Syntax # Sk GRAVE ACCENT +007B ; Pattern_Syntax # Ps LEFT CURLY BRACKET +007C ; Pattern_Syntax # Sm VERTICAL LINE +007D ; Pattern_Syntax # Pe RIGHT CURLY BRACKET +007E ; Pattern_Syntax # Sm TILDE +00A1 ; Pattern_Syntax # Po INVERTED EXCLAMATION MARK +00A2..00A5 ; Pattern_Syntax # Sc [4] CENT SIGN..YEN SIGN +00A6..00A7 ; Pattern_Syntax # So [2] BROKEN BAR..SECTION SIGN +00A9 ; Pattern_Syntax # So COPYRIGHT SIGN +00AB ; Pattern_Syntax # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00AC ; Pattern_Syntax # Sm NOT SIGN +00AE ; Pattern_Syntax # So REGISTERED SIGN +00B0 ; Pattern_Syntax # So DEGREE SIGN +00B1 ; Pattern_Syntax # Sm PLUS-MINUS SIGN +00B6 ; Pattern_Syntax # So PILCROW SIGN +00BB ; Pattern_Syntax # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +00BF ; Pattern_Syntax # Po INVERTED QUESTION MARK +00D7 ; Pattern_Syntax # Sm MULTIPLICATION SIGN +00F7 ; Pattern_Syntax # Sm DIVISION SIGN +2010..2015 ; Pattern_Syntax # Pd [6] HYPHEN..HORIZONTAL BAR +2016..2017 ; Pattern_Syntax # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE +2018 ; Pattern_Syntax # Pi LEFT SINGLE QUOTATION MARK +2019 ; Pattern_Syntax # Pf RIGHT SINGLE QUOTATION MARK +201A ; Pattern_Syntax # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; Pattern_Syntax # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; Pattern_Syntax # Pf RIGHT DOUBLE QUOTATION MARK +201E ; Pattern_Syntax # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; Pattern_Syntax # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2020..2027 ; Pattern_Syntax # Po [8] DAGGER..HYPHENATION POINT +2030..2038 ; Pattern_Syntax # Po [9] PER MILLE SIGN..CARET +2039 ; Pattern_Syntax # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Pattern_Syntax # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +203B..203E ; Pattern_Syntax # Po [4] REFERENCE MARK..OVERLINE +2041..2043 ; Pattern_Syntax # Po [3] CARET INSERTION POINT..HYPHEN BULLET +2044 ; Pattern_Syntax # Sm FRACTION SLASH +2045 ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH QUILL +2047..2051 ; Pattern_Syntax # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2052 ; Pattern_Syntax # Sm COMMERCIAL MINUS SIGN +2053 ; Pattern_Syntax # Po SWUNG DASH +2055..205E ; Pattern_Syntax # Po [10] FLOWER PUNCTUATION MARK..VERTICAL FOUR DOTS +2190..2194 ; Pattern_Syntax # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +2195..2199 ; Pattern_Syntax # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219A..219B ; Pattern_Syntax # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +219C..219F ; Pattern_Syntax # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A0 ; Pattern_Syntax # Sm RIGHTWARDS TWO HEADED ARROW +21A1..21A2 ; Pattern_Syntax # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A3 ; Pattern_Syntax # Sm RIGHTWARDS ARROW WITH TAIL +21A4..21A5 ; Pattern_Syntax # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A6 ; Pattern_Syntax # Sm RIGHTWARDS ARROW FROM BAR +21A7..21AD ; Pattern_Syntax # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AE ; Pattern_Syntax # Sm LEFT RIGHT ARROW WITH STROKE +21AF..21CD ; Pattern_Syntax # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21CE..21CF ; Pattern_Syntax # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; Pattern_Syntax # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D2 ; Pattern_Syntax # Sm RIGHTWARDS DOUBLE ARROW +21D3 ; Pattern_Syntax # So DOWNWARDS DOUBLE ARROW +21D4 ; Pattern_Syntax # Sm LEFT RIGHT DOUBLE ARROW +21D5..21F3 ; Pattern_Syntax # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW +21F4..22FF ; Pattern_Syntax # Sm [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP +2300..2307 ; Pattern_Syntax # So [8] DIAMETER SIGN..WAVY LINE +2308..230B ; Pattern_Syntax # Sm [4] LEFT CEILING..RIGHT FLOOR +230C..231F ; Pattern_Syntax # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER +2320..2321 ; Pattern_Syntax # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2322..2328 ; Pattern_Syntax # So [7] FROWN..KEYBOARD +2329 ; Pattern_Syntax # Ps LEFT-POINTING ANGLE BRACKET +232A ; Pattern_Syntax # Pe RIGHT-POINTING ANGLE BRACKET +232B..237B ; Pattern_Syntax # So [81] ERASE TO THE LEFT..NOT CHECK MARK +237C ; Pattern_Syntax # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +237D..239A ; Pattern_Syntax # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL +239B..23B3 ; Pattern_Syntax # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +23B4..23DB ; Pattern_Syntax # So [40] TOP SQUARE BRACKET..FUSE +23DC..23E1 ; Pattern_Syntax # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET +23E2..23F3 ; Pattern_Syntax # So [18] WHITE TRAPEZIUM..HOURGLASS WITH FLOWING SAND +23F4..23FF ; Pattern_Syntax # Cn [12] <reserved-23F4>..<reserved-23FF> +2400..2426 ; Pattern_Syntax # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2427..243F ; Pattern_Syntax # Cn [25] <reserved-2427>..<reserved-243F> +2440..244A ; Pattern_Syntax # So [11] OCR HOOK..OCR DOUBLE BACKSLASH +244B..245F ; Pattern_Syntax # Cn [21] <reserved-244B>..<reserved-245F> +2500..25B6 ; Pattern_Syntax # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE +25B7 ; Pattern_Syntax # Sm WHITE RIGHT-POINTING TRIANGLE +25B8..25C0 ; Pattern_Syntax # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C1 ; Pattern_Syntax # Sm WHITE LEFT-POINTING TRIANGLE +25C2..25F7 ; Pattern_Syntax # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +25F8..25FF ; Pattern_Syntax # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +2600..266E ; Pattern_Syntax # So [111] BLACK SUN WITH RAYS..MUSIC NATURAL SIGN +266F ; Pattern_Syntax # Sm MUSIC SHARP SIGN +2670..26FF ; Pattern_Syntax # So [144] WEST SYRIAC CROSS..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE +2700 ; Pattern_Syntax # Cn <reserved-2700> +2701..2767 ; Pattern_Syntax # So [103] UPPER BLADE SCISSORS..ROTATED FLORAL HEART BULLET +2768 ; Pattern_Syntax # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; Pattern_Syntax # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; Pattern_Syntax # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; Pattern_Syntax # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; Pattern_Syntax # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; Pattern_Syntax # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; Pattern_Syntax # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; Pattern_Syntax # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; Pattern_Syntax # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; Pattern_Syntax # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +2794..27BF ; Pattern_Syntax # So [44] HEAVY WIDE-HEADED RIGHTWARDS ARROW..DOUBLE CURLY LOOP +27C0..27C4 ; Pattern_Syntax # Sm [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET +27C5 ; Pattern_Syntax # Ps LEFT S-SHAPED BAG DELIMITER +27C6 ; Pattern_Syntax # Pe RIGHT S-SHAPED BAG DELIMITER +27C7..27CA ; Pattern_Syntax # Sm [4] OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE +27CB ; Pattern_Syntax # Cn <reserved-27CB> +27CC ; Pattern_Syntax # Sm LONG DIVISION +27CD ; Pattern_Syntax # Cn <reserved-27CD> +27CE..27E5 ; Pattern_Syntax # Sm [24] SQUARED LOGICAL AND..WHITE SQUARE WITH RIGHTWARDS TICK +27E6 ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Pattern_Syntax # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Pattern_Syntax # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Pattern_Syntax # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27EC ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET +27ED ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET +27EE ; Pattern_Syntax # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS +27EF ; Pattern_Syntax # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS +27F0..27FF ; Pattern_Syntax # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2800..28FF ; Pattern_Syntax # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2900..2982 ; Pattern_Syntax # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2983 ; Pattern_Syntax # Ps LEFT WHITE CURLY BRACKET +2984 ; Pattern_Syntax # Pe RIGHT WHITE CURLY BRACKET +2985 ; Pattern_Syntax # Ps LEFT WHITE PARENTHESIS +2986 ; Pattern_Syntax # Pe RIGHT WHITE PARENTHESIS +2987 ; Pattern_Syntax # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Pattern_Syntax # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Pattern_Syntax # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Pattern_Syntax # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Pattern_Syntax # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Pattern_Syntax # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Pattern_Syntax # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Pattern_Syntax # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Pattern_Syntax # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Pattern_Syntax # Pe RIGHT BLACK TORTOISE SHELL BRACKET +2999..29D7 ; Pattern_Syntax # Sm [63] DOTTED FENCE..BLACK HOURGLASS +29D8 ; Pattern_Syntax # Ps LEFT WIGGLY FENCE +29D9 ; Pattern_Syntax # Pe RIGHT WIGGLY FENCE +29DA ; Pattern_Syntax # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Pattern_Syntax # Pe RIGHT DOUBLE WIGGLY FENCE +29DC..29FB ; Pattern_Syntax # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FC ; Pattern_Syntax # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Pattern_Syntax # Pe RIGHT-POINTING CURVED ANGLE BRACKET +29FE..2AFF ; Pattern_Syntax # Sm [258] TINY..N-ARY WHITE VERTICAL BAR +2B00..2B2F ; Pattern_Syntax # So [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE +2B30..2B44 ; Pattern_Syntax # Sm [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET +2B45..2B46 ; Pattern_Syntax # So [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW +2B47..2B4C ; Pattern_Syntax # Sm [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR +2B4D..2B4F ; Pattern_Syntax # Cn [3] <reserved-2B4D>..<reserved-2B4F> +2B50..2B59 ; Pattern_Syntax # So [10] WHITE MEDIUM STAR..HEAVY CIRCLED SALTIRE +2B5A..2BFF ; Pattern_Syntax # Cn [166] <reserved-2B5A>..<reserved-2BFF> +2E00..2E01 ; Pattern_Syntax # Po [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER +2E02 ; Pattern_Syntax # Pi LEFT SUBSTITUTION BRACKET +2E03 ; Pattern_Syntax # Pf RIGHT SUBSTITUTION BRACKET +2E04 ; Pattern_Syntax # Pi LEFT DOTTED SUBSTITUTION BRACKET +2E05 ; Pattern_Syntax # Pf RIGHT DOTTED SUBSTITUTION BRACKET +2E06..2E08 ; Pattern_Syntax # Po [3] RAISED INTERPOLATION MARKER..DOTTED TRANSPOSITION MARKER +2E09 ; Pattern_Syntax # Pi LEFT TRANSPOSITION BRACKET +2E0A ; Pattern_Syntax # Pf RIGHT TRANSPOSITION BRACKET +2E0B ; Pattern_Syntax # Po RAISED SQUARE +2E0C ; Pattern_Syntax # Pi LEFT RAISED OMISSION BRACKET +2E0D ; Pattern_Syntax # Pf RIGHT RAISED OMISSION BRACKET +2E0E..2E16 ; Pattern_Syntax # Po [9] EDITORIAL CORONIS..DOTTED RIGHT-POINTING ANGLE +2E17 ; Pattern_Syntax # Pd DOUBLE OBLIQUE HYPHEN +2E18..2E19 ; Pattern_Syntax # Po [2] INVERTED INTERROBANG..PALM BRANCH +2E1A ; Pattern_Syntax # Pd HYPHEN WITH DIAERESIS +2E1B ; Pattern_Syntax # Po TILDE WITH RING ABOVE +2E1C ; Pattern_Syntax # Pi LEFT LOW PARAPHRASE BRACKET +2E1D ; Pattern_Syntax # Pf RIGHT LOW PARAPHRASE BRACKET +2E1E..2E1F ; Pattern_Syntax # Po [2] TILDE WITH DOT ABOVE..TILDE WITH DOT BELOW +2E20 ; Pattern_Syntax # Pi LEFT VERTICAL BAR WITH QUILL +2E21 ; Pattern_Syntax # Pf RIGHT VERTICAL BAR WITH QUILL +2E22 ; Pattern_Syntax # Ps TOP LEFT HALF BRACKET +2E23 ; Pattern_Syntax # Pe TOP RIGHT HALF BRACKET +2E24 ; Pattern_Syntax # Ps BOTTOM LEFT HALF BRACKET +2E25 ; Pattern_Syntax # Pe BOTTOM RIGHT HALF BRACKET +2E26 ; Pattern_Syntax # Ps LEFT SIDEWAYS U BRACKET +2E27 ; Pattern_Syntax # Pe RIGHT SIDEWAYS U BRACKET +2E28 ; Pattern_Syntax # Ps LEFT DOUBLE PARENTHESIS +2E29 ; Pattern_Syntax # Pe RIGHT DOUBLE PARENTHESIS +2E2A..2E2E ; Pattern_Syntax # Po [5] TWO DOTS OVER ONE DOT PUNCTUATION..REVERSED QUESTION MARK +2E2F ; Pattern_Syntax # Lm VERTICAL TILDE +2E30..2E31 ; Pattern_Syntax # Po [2] RING POINT..WORD SEPARATOR MIDDLE DOT +2E32..2E7F ; Pattern_Syntax # Cn [78] <reserved-2E32>..<reserved-2E7F> +3001..3003 ; Pattern_Syntax # Po [3] IDEOGRAPHIC COMMA..DITTO MARK +3008 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET +3009 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET +300A ; Pattern_Syntax # Ps LEFT DOUBLE ANGLE BRACKET +300B ; Pattern_Syntax # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; Pattern_Syntax # Ps LEFT CORNER BRACKET +300D ; Pattern_Syntax # Pe RIGHT CORNER BRACKET +300E ; Pattern_Syntax # Ps LEFT WHITE CORNER BRACKET +300F ; Pattern_Syntax # Pe RIGHT WHITE CORNER BRACKET +3010 ; Pattern_Syntax # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; Pattern_Syntax # Pe RIGHT BLACK LENTICULAR BRACKET +3012..3013 ; Pattern_Syntax # So [2] POSTAL MARK..GETA MARK +3014 ; Pattern_Syntax # Ps LEFT TORTOISE SHELL BRACKET +3015 ; Pattern_Syntax # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; Pattern_Syntax # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; Pattern_Syntax # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; Pattern_Syntax # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; Pattern_Syntax # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; Pattern_Syntax # Ps LEFT WHITE SQUARE BRACKET +301B ; Pattern_Syntax # Pe RIGHT WHITE SQUARE BRACKET +301C ; Pattern_Syntax # Pd WAVE DASH +301D ; Pattern_Syntax # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; Pattern_Syntax # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +3020 ; Pattern_Syntax # So POSTAL MARK FACE +3030 ; Pattern_Syntax # Pd WAVY DASH +FD3E ; Pattern_Syntax # Ps ORNATE LEFT PARENTHESIS +FD3F ; Pattern_Syntax # Pe ORNATE RIGHT PARENTHESIS +FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT + +# Total code points: 2760 + +# EOF diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Double/ParseDouble.java --- a/jdk/test/java/lang/Double/ParseDouble.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Double/ParseDouble.java Sat May 14 11:52:15 2011 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4160406 4705734 4707389 4826774 4895911 4421494 7021568 + * @bug 4160406 4705734 4707389 4826774 4895911 4421494 7021568 7039369 * @summary Test for Double.parseDouble method and acceptance regex */ diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/ProcessBuilder/Basic.java --- a/jdk/test/java/lang/ProcessBuilder/Basic.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/ProcessBuilder/Basic.java Sat May 14 11:52:15 2011 -0700 @@ -26,7 +26,7 @@ * @bug 4199068 4738465 4937983 4930681 4926230 4931433 4932663 4986689 * 5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313 * 6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958 - * 4947220 7018606 + * 4947220 7018606 7034570 * @summary Basic tests for Process and Environment Variable code * @run main/othervm/timeout=300 Basic * @author Martin Buchholz @@ -1440,11 +1440,12 @@ // Check for sort order of environment variables on Windows. //---------------------------------------------------------------- try { + String systemRoot = "SystemRoot=" + System.getenv("SystemRoot"); // '+' < 'A' < 'Z' < '_' < 'a' < 'z' < '~' String[]envp = {"FOO=BAR","BAZ=GORP","QUUX=", - "+=+", "_=_", "~=~"}; + "+=+", "_=_", "~=~", systemRoot}; String output = nativeEnv(envp); - String expected = "+=+\nBAZ=GORP\nFOO=BAR\nQUUX=\n_=_\n~=~\n"; + String expected = "+=+\nBAZ=GORP\nFOO=BAR\nQUUX=\n"+systemRoot+"\n_=_\n~=~\n"; // On Windows, Java must keep the environment sorted. // Order is random on Unix, so this test does the sort. if (! Windows.is()) @@ -1453,6 +1454,21 @@ } catch (Throwable t) { unexpected(t); } //---------------------------------------------------------------- + // Test Runtime.exec(...envp...) + // and check SystemRoot gets set automatically on Windows + //---------------------------------------------------------------- + try { + if (Windows.is()) { + String systemRoot = "SystemRoot=" + System.getenv("SystemRoot"); + String[]envp = {"FOO=BAR","BAZ=GORP","QUUX=", + "+=+", "_=_", "~=~"}; + String output = nativeEnv(envp); + String expected = "+=+\nBAZ=GORP\nFOO=BAR\nQUUX=\n"+systemRoot+"\n_=_\n~=~\n"; + equal(output, expected); + } + } catch (Throwable t) { unexpected(t); } + + //---------------------------------------------------------------- // System.getenv() must be consistent with System.getenv(String) //---------------------------------------------------------------- try { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Throwable/ChainedExceptions.java --- a/jdk/test/java/lang/Throwable/ChainedExceptions.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Throwable/ChainedExceptions.java Sat May 14 11:52:15 2011 -0700 @@ -13,28 +13,28 @@ StackTraceElement[] highTrace = e.getStackTrace(); int depthTrim = highTrace.length - 2; - check(highTrace[0], "a", 48); - check(highTrace[1], "main", 11); + check(e, highTrace[0], "a", 48); + check(e, highTrace[1], "main", 11); Throwable mid = e.getCause(); StackTraceElement[] midTrace = mid.getStackTrace(); if (midTrace.length - depthTrim != 4) throw new RuntimeException("Mid depth"); - check(midTrace[0], "c", 58); - check(midTrace[1], "b", 52); - check(midTrace[2], "a", 46); - check(midTrace[3], "main", 11); + check(mid, midTrace[0], "c", 58); + check(mid, midTrace[1], "b", 52); + check(mid, midTrace[2], "a", 46); + check(mid, midTrace[3], "main", 11); Throwable low = mid.getCause(); StackTraceElement[] lowTrace = low.getStackTrace(); if (lowTrace.length - depthTrim != 6) throw new RuntimeException("Low depth"); - check(lowTrace[0], "e", 65); - check(lowTrace[1], "d", 62); - check(lowTrace[2], "c", 56); - check(lowTrace[3], "b", 52); - check(lowTrace[4], "a", 46); - check(lowTrace[5], "main", 11); + check(low, lowTrace[0], "e", 65); + check(low, lowTrace[1], "d", 62); + check(low, lowTrace[2], "c", 56); + check(low, lowTrace[3], "b", 52); + check(low, lowTrace[4], "a", 46); + check(low, lowTrace[5], "main", 11); if (low.getCause() != null) throw new RuntimeException("Low cause != null"); @@ -68,15 +68,15 @@ private static final String OUR_CLASS = ChainedExceptions.class.getName(); private static final String OUR_FILE_NAME = "ChainedExceptions.java"; - private static void check(StackTraceElement e, String methodName, int n) { + private static void check(Throwable t, StackTraceElement e, String methodName, int n) { if (!e.getClassName().equals(OUR_CLASS)) - throw new RuntimeException("Class: " + e); + throw new RuntimeException("Class: " + e, t); if (!e.getMethodName().equals(methodName)) - throw new RuntimeException("Method name: " + e); + throw new RuntimeException("Method name: " + e, t); if (!e.getFileName().equals(OUR_FILE_NAME)) - throw new RuntimeException("File name: " + e); + throw new RuntimeException("File name: " + e, t); if (e.getLineNumber() != n) - throw new RuntimeException("Line number: " + e); + throw new RuntimeException("Line number: " + e, t); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Throwable/StackTraceSerialization.java --- a/jdk/test/java/lang/Throwable/StackTraceSerialization.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Throwable/StackTraceSerialization.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ /* * @test - * @bug 4202914 4363318 6991528 + * @bug 4202914 4363318 6991528 6998871 * @summary Basic test of serialization of stack trace information * @author Josh Bloch */ @@ -37,14 +37,52 @@ testWithFillInStackTrace(); } - private static void testWithSetStackTrace() throws Exception { - Throwable t = new Throwable(); + private static void testWithSetStackTrace() { + StackTraceElement[] stackTrace = {new StackTraceElement("foo", "bar", "baz", -1)}; + + Throwable t = new TestThrowable(true, false); // Immutable and empty stack + assertEmptyStackTrace(t); + + // Verify fillInStackTrace is now a no-op. + t.fillInStackTrace(); + assertEmptyStackTrace(t); + + // Verify setStackTrace is now a no-op. + t.setStackTrace(stackTrace); + assertEmptyStackTrace(t); - t.setStackTrace(new StackTraceElement[] - {new StackTraceElement("foo", "bar", "baz", -1)}); + // Verify null-handling + try { + t.setStackTrace(null); + throw new RuntimeException("No NPE on a null stack trace."); + } catch(NullPointerException npe) { + assertEmptyStackTrace(t); + } + + try { + t.setStackTrace(new StackTraceElement[]{null}); + throw new RuntimeException("No NPE on a null stack trace element."); + } catch(NullPointerException npe) { + assertEmptyStackTrace(t); + } if (!equal(t, reconstitute(t))) - throw new Exception("Unequal Throwables with set stacktrace"); + throw new RuntimeException("Unequal Throwables with set stacktrace"); + + Throwable t2 = new Throwable(); + t2.setStackTrace(stackTrace); + if (!equal(t2, reconstitute(t2))) + throw new RuntimeException("Unequal Throwables with set stacktrace"); + + } + + private static class TestThrowable extends Throwable { + public TestThrowable(boolean enableSuppression, + boolean writableStackTrace) { + super("the medium", null, + enableSuppression, + writableStackTrace); + } } private static void assertEmptyStackTrace(Throwable t) { @@ -52,7 +90,7 @@ throw new AssertionError("Nonempty stacktrace."); } - private static void testWithFillInStackTrace() throws Exception { + private static void testWithFillInStackTrace() { Throwable original = null; try { a(); @@ -61,16 +99,14 @@ } if (!equal(original, reconstitute(original))) - throw new Exception("Unequal Throwables with filled-in stacktrace"); + throw new RuntimeException("Unequal Throwables with filled-in stacktrace"); } - /** * Serialize the argument and return the deserialized result. */ - private static Throwable reconstitute(Throwable t) throws Exception { + private static Throwable reconstitute(Throwable t) { Throwable result = null; - try(ByteArrayOutputStream bout = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream(bout)) { out.writeObject(t); @@ -80,8 +116,9 @@ ObjectInputStream in = new ObjectInputStream(bin)) { result = (Throwable) in.readObject(); } + } catch(IOException | ClassNotFoundException e) { + throw new RuntimeException(e); } - return result; } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/lang/Throwable/SuppressedExceptions.java --- a/jdk/test/java/lang/Throwable/SuppressedExceptions.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/lang/Throwable/SuppressedExceptions.java Sat May 14 11:52:15 2011 -0700 @@ -193,6 +193,7 @@ // Make sure addSuppressed(null) throws an NPE try { t.addSuppressed(null); + throw new RuntimeException("NPE not thrown!"); } catch(NullPointerException e) { ; // Expected } @@ -204,7 +205,7 @@ private static class NoSuppression extends Throwable { public NoSuppression(boolean enableSuppression) { - super("The medium.", null, enableSuppression); + super("The medium.", null, enableSuppression, true); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/nio/charset/StandardCharset/Standard.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/nio/charset/StandardCharset/Standard.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2011, 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 4884238 + * @summary Test standard charset name constants. + * @author Mike Duigou + * @run main Standard + */ + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.io.*; +import java.nio.charset.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +public class Standard { + + private final static String standardCharsets[] = { + "US-ASCII", "ISO-8859-1", "UTF-8", + "UTF-16BE", "UTF-16LE", "UTF-16" }; + + public static void realMain(String[] args) { + check(StandardCharset.US_ASCII instanceof Charset); + check(StandardCharset.ISO_8859_1 instanceof Charset); + check(StandardCharset.UTF_8 instanceof Charset); + check(StandardCharset.UTF_16BE instanceof Charset); + check(StandardCharset.UTF_16LE instanceof Charset); + check(StandardCharset.UTF_16 instanceof Charset); + + check("US-ASCII".equals(StandardCharset.US_ASCII.name())); + check("ISO-8859-1".equals(StandardCharset.ISO_8859_1.name())); + check("UTF-8".equals(StandardCharset.UTF_8.name())); + check("UTF-16BE".equals(StandardCharset.UTF_16BE.name())); + check("UTF-16LE".equals(StandardCharset.UTF_16LE.name())); + check("UTF-16".equals(StandardCharset.UTF_16.name())); + + Set<String> charsets = new HashSet<>(); + Field standardCharsetFields[] = StandardCharset.class.getFields(); + + for(Field charsetField : standardCharsetFields) { + check(StandardCharset.class == charsetField.getDeclaringClass()); + check(Modifier.isFinal(charsetField.getModifiers())); + check(Modifier.isStatic(charsetField.getModifiers())); + check(Modifier.isPublic(charsetField.getModifiers())); + Object value; + try { + value = charsetField.get(null); + } catch(IllegalAccessException failure) { + unexpected(failure); + continue; + } + check(value instanceof Charset); + charsets.add(((Charset)value).name()); + } + + check(charsets.containsAll(Arrays.asList(standardCharsets))); + charsets.removeAll(Arrays.asList(standardCharsets)); + check(charsets.isEmpty()); + } + + //--------------------- Infrastructure --------------------------- + static volatile int passed = 0, failed = 0; + static void pass() { passed++; } + static void fail() { failed++; Thread.dumpStack(); } + static void fail(String msg) { System.out.println(msg); fail(); } + static void unexpected(Throwable t) { failed++; t.printStackTrace(); } + static void check(boolean cond) { if (cond) pass(); else fail(); } + static void equal(Object x, Object y) { + if (x == null ? y == null : x.equals(y)) pass(); + else {System.out.println(x + " not equal to " + y); fail();}} + static void equal2(Object x, Object y) {equal(x, y); equal(y, x);} + public static void main(String[] args) throws Throwable { + try { realMain(args); } catch (Throwable t) { unexpected(t); } + + System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); + if (failed > 0) throw new Exception("Some tests failed"); + } + private static abstract class Fun {abstract void f() throws Throwable;} + private static void THROWS(Class<? extends Throwable> k, Fun... fs) { + for (Fun f : fs) + try { f.f(); fail("Expected " + k.getName() + " not thrown"); } + catch (Throwable t) { + if (k.isAssignableFrom(t.getClass())) pass(); + else unexpected(t);}} + static byte[] serializedForm(Object obj) { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + new ObjectOutputStream(baos).writeObject(obj); + return baos.toByteArray(); + } catch (IOException e) { throw new Error(e); }} + static Object readObject(byte[] bytes) + throws IOException, ClassNotFoundException { + InputStream is = new ByteArrayInputStream(bytes); + return new ObjectInputStream(is).readObject();} + @SuppressWarnings("unchecked") + static <T> T serialClone(T obj) { + try { return (T) readObject(serializedForm(obj)); } + catch (Exception e) { throw new Error(e); }} + +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/security/spec/EllipticCurveMatch.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/security/spec/EllipticCurveMatch.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2011, 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 6738532 + * @summary Check EllipticCurve.equals() does not compare seed value of curve. + * @run main/othervm EllipticCurveMatch + * @author Mike StJohns + */ + +import java.security.spec.*; +import java.math.BigInteger; +import java.security.SecureRandom; + +public class EllipticCurveMatch { + static String primeP256 = + "0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"; + static String aP256 = + "0FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC"; + static String bP256 = + "05AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"; + static String seedP256 = + "0C49D360886E704936A6678E1139D26B7819F7E90"; + + private static EllipticCurve addSeedToCurve(EllipticCurve curve) + { + SecureRandom rand = new SecureRandom(); + byte[] seed = new byte[12]; + rand.nextBytes(seed); + + return new EllipticCurve (curve.getField(), curve.getA(), curve.getB(), + seed); + } + + private static EllipticCurve getP256Curve() + { + ECFieldFp field = new ECFieldFp(new BigInteger (primeP256,16)); + BigInteger a = new BigInteger (aP256, 16); + BigInteger b = new BigInteger (bP256, 16); + + return new EllipticCurve (field, a, b); + } + + public static void main (String[] argv) throws Exception { + EllipticCurve firstCurve = getP256Curve(); + EllipticCurve secondCurve = addSeedToCurve(firstCurve); + EllipticCurve thirdCurve = addSeedToCurve(firstCurve); + + if (!firstCurve.equals(firstCurve)) + throw new Exception("Original curve doesn't equal itself"); + + if (!firstCurve.equals(secondCurve)) + throw new Exception ("Original curve doesn't equal seeded curve"); + + if (!secondCurve.equals(secondCurve)) + throw new Exception ("Seeded curve doesn't equal itself"); + + if (!secondCurve.equals(thirdCurve)) + throw new Exception ("Seeded curve doesn't equal differently " + + "seeded curve"); + System.out.println("Curve equals test passed"); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/Locale/LocaleEnhanceTest.java --- a/jdk/test/java/util/Locale/LocaleEnhanceTest.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/Locale/LocaleEnhanceTest.java Sat May 14 11:52:15 2011 -0700 @@ -45,7 +45,7 @@ /** * @test - * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 + * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 7044019 * @summary test API changes to Locale * @compile LocaleEnhanceTest.java * @run main/othervm -esa LocaleEnhanceTest @@ -616,11 +616,9 @@ assertEquals("latn US", "Latin", latnLocale.getDisplayScript()); assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript()); - // note, no localization data yet other than US - // this should break when we have localization data for DE Locale.setDefault(Locale.GERMANY); - assertEquals("latn DE", "Latin", latnLocale.getDisplayScript()); - assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript()); + assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript()); + assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript()); Locale.setDefault(oldLocale); } @@ -632,10 +630,8 @@ assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US)); assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US)); - // note, no localization data yet other than US - // this should break when we have localization data for DE - assertEquals("latn DE", "Latin", latnLocale.getDisplayScript(Locale.GERMANY)); - assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript(Locale.GERMANY)); + assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript(Locale.GERMANY)); + assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript(Locale.GERMANY)); } public void testGetDisplayName() { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java --- a/jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/jar/JarInputStream/ScanSignedJar.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,11 +27,9 @@ * @summary Confirm that JarEntry.getCertificates identifies signed entries. */ -import java.io.*; import java.net.URL; import java.security.CodeSigner; import java.security.cert.Certificate; -import java.util.Enumeration; import java.util.jar.*; /* @@ -72,6 +70,9 @@ if (signers == null && certificates == null) { System.out.println("[unsigned]\t" + name + "\t(" + size + " bytes)"); + if (name.equals("Count.class")) { + throw new Exception("Count.class should be signed"); + } } else if (signers != null && certificates != null) { System.out.println("[" + signers.length + (signers.length == 1 ? " signer" : " signers") + "]\t" + diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java --- a/jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -37,7 +37,7 @@ public static void main(String...args) throws Throwable { try (JarInputStream jis = new JarInputStream( - new FileInputStream(System.getProperty("tst.src", ".") + + new FileInputStream(System.getProperty("test.src", ".") + System.getProperty("file.separator") + "BadSignedJar.jar"))) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/regex/POSIX_ASCII.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/util/regex/POSIX_ASCII.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2011, 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. + */ + + +final class POSIX_ASCII { + + static final int UPPER = 0x00000100; + + static final int LOWER = 0x00000200; + + static final int DIGIT = 0x00000400; + + static final int SPACE = 0x00000800; + + static final int PUNCT = 0x00001000; + + static final int CNTRL = 0x00002000; + + static final int BLANK = 0x00004000; + + static final int HEX = 0x00008000; + + static final int UNDER = 0x00010000; + + static final int ASCII = 0x0000FF00; + + static final int ALPHA = (UPPER|LOWER); + + static final int ALNUM = (UPPER|LOWER|DIGIT); + + static final int GRAPH = (PUNCT|UPPER|LOWER|DIGIT); + + static final int WORD = (UPPER|LOWER|UNDER|DIGIT); + + static final int XDIGIT = (HEX); + + private static final int[] ctype = new int[] { + CNTRL, /* 00 (NUL) */ + CNTRL, /* 01 (SOH) */ + CNTRL, /* 02 (STX) */ + CNTRL, /* 03 (ETX) */ + CNTRL, /* 04 (EOT) */ + CNTRL, /* 05 (ENQ) */ + CNTRL, /* 06 (ACK) */ + CNTRL, /* 07 (BEL) */ + CNTRL, /* 08 (BS) */ + SPACE+CNTRL+BLANK, /* 09 (HT) */ + SPACE+CNTRL, /* 0A (LF) */ + SPACE+CNTRL, /* 0B (VT) */ + SPACE+CNTRL, /* 0C (FF) */ + SPACE+CNTRL, /* 0D (CR) */ + CNTRL, /* 0E (SI) */ + CNTRL, /* 0F (SO) */ + CNTRL, /* 10 (DLE) */ + CNTRL, /* 11 (DC1) */ + CNTRL, /* 12 (DC2) */ + CNTRL, /* 13 (DC3) */ + CNTRL, /* 14 (DC4) */ + CNTRL, /* 15 (NAK) */ + CNTRL, /* 16 (SYN) */ + CNTRL, /* 17 (ETB) */ + CNTRL, /* 18 (CAN) */ + CNTRL, /* 19 (EM) */ + CNTRL, /* 1A (SUB) */ + CNTRL, /* 1B (ESC) */ + CNTRL, /* 1C (FS) */ + CNTRL, /* 1D (GS) */ + CNTRL, /* 1E (RS) */ + CNTRL, /* 1F (US) */ + SPACE+BLANK, /* 20 SPACE */ + PUNCT, /* 21 ! */ + PUNCT, /* 22 " */ + PUNCT, /* 23 # */ + PUNCT, /* 24 $ */ + PUNCT, /* 25 % */ + PUNCT, /* 26 & */ + PUNCT, /* 27 ' */ + PUNCT, /* 28 ( */ + PUNCT, /* 29 ) */ + PUNCT, /* 2A * */ + PUNCT, /* 2B + */ + PUNCT, /* 2C , */ + PUNCT, /* 2D - */ + PUNCT, /* 2E . */ + PUNCT, /* 2F / */ + DIGIT+HEX+0, /* 30 0 */ + DIGIT+HEX+1, /* 31 1 */ + DIGIT+HEX+2, /* 32 2 */ + DIGIT+HEX+3, /* 33 3 */ + DIGIT+HEX+4, /* 34 4 */ + DIGIT+HEX+5, /* 35 5 */ + DIGIT+HEX+6, /* 36 6 */ + DIGIT+HEX+7, /* 37 7 */ + DIGIT+HEX+8, /* 38 8 */ + DIGIT+HEX+9, /* 39 9 */ + PUNCT, /* 3A : */ + PUNCT, /* 3B ; */ + PUNCT, /* 3C < */ + PUNCT, /* 3D = */ + PUNCT, /* 3E > */ + PUNCT, /* 3F ? */ + PUNCT, /* 40 @ */ + UPPER+HEX+10, /* 41 A */ + UPPER+HEX+11, /* 42 B */ + UPPER+HEX+12, /* 43 C */ + UPPER+HEX+13, /* 44 D */ + UPPER+HEX+14, /* 45 E */ + UPPER+HEX+15, /* 46 F */ + UPPER+16, /* 47 G */ + UPPER+17, /* 48 H */ + UPPER+18, /* 49 I */ + UPPER+19, /* 4A J */ + UPPER+20, /* 4B K */ + UPPER+21, /* 4C L */ + UPPER+22, /* 4D M */ + UPPER+23, /* 4E N */ + UPPER+24, /* 4F O */ + UPPER+25, /* 50 P */ + UPPER+26, /* 51 Q */ + UPPER+27, /* 52 R */ + UPPER+28, /* 53 S */ + UPPER+29, /* 54 T */ + UPPER+30, /* 55 U */ + UPPER+31, /* 56 V */ + UPPER+32, /* 57 W */ + UPPER+33, /* 58 X */ + UPPER+34, /* 59 Y */ + UPPER+35, /* 5A Z */ + PUNCT, /* 5B [ */ + PUNCT, /* 5C \ */ + PUNCT, /* 5D ] */ + PUNCT, /* 5E ^ */ + PUNCT|UNDER, /* 5F _ */ + PUNCT, /* 60 ` */ + LOWER+HEX+10, /* 61 a */ + LOWER+HEX+11, /* 62 b */ + LOWER+HEX+12, /* 63 c */ + LOWER+HEX+13, /* 64 d */ + LOWER+HEX+14, /* 65 e */ + LOWER+HEX+15, /* 66 f */ + LOWER+16, /* 67 g */ + LOWER+17, /* 68 h */ + LOWER+18, /* 69 i */ + LOWER+19, /* 6A j */ + LOWER+20, /* 6B k */ + LOWER+21, /* 6C l */ + LOWER+22, /* 6D m */ + LOWER+23, /* 6E n */ + LOWER+24, /* 6F o */ + LOWER+25, /* 70 p */ + LOWER+26, /* 71 q */ + LOWER+27, /* 72 r */ + LOWER+28, /* 73 s */ + LOWER+29, /* 74 t */ + LOWER+30, /* 75 u */ + LOWER+31, /* 76 v */ + LOWER+32, /* 77 w */ + LOWER+33, /* 78 x */ + LOWER+34, /* 79 y */ + LOWER+35, /* 7A z */ + PUNCT, /* 7B { */ + PUNCT, /* 7C | */ + PUNCT, /* 7D } */ + PUNCT, /* 7E ~ */ + CNTRL, /* 7F (DEL) */ + }; + + static int getType(int ch) { + return ((ch & 0xFFFFFF80) == 0 ? ctype[ch] : 0); + } + + static boolean isType(int ch, int type) { + return (getType(ch) & type) != 0; + } + + static boolean isAscii(int ch) { + return ((ch & 0xFFFFFF80) == 0); + } + + static boolean isAlpha(int ch) { + return isType(ch, ALPHA); + } + + static boolean isDigit(int ch) { + return ((ch-'0')|('9'-ch)) >= 0; + } + + static boolean isAlnum(int ch) { + return isType(ch, ALNUM); + } + + static boolean isGraph(int ch) { + return isType(ch, GRAPH); + } + + static boolean isPrint(int ch) { + return ((ch-0x20)|(0x7E-ch)) >= 0; + } + + static boolean isPunct(int ch) { + return isType(ch, PUNCT); + } + + static boolean isSpace(int ch) { + return isType(ch, SPACE); + } + + static boolean isHexDigit(int ch) { + return isType(ch, HEX); + } + + static boolean isCntrl(int ch) { + return isType(ch, CNTRL); + } + + static boolean isLower(int ch) { + return ((ch-'a')|('z'-ch)) >= 0; + } + + static boolean isUpper(int ch) { + return ((ch-'A')|('Z'-ch)) >= 0; + } + + static boolean isWord(int ch) { + return isType(ch, WORD); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/regex/POSIX_Unicode.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/util/regex/POSIX_Unicode.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2011, 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.util.HashMap; +import java.util.Locale; + +final public class POSIX_Unicode { + + public static boolean isAlpha(int ch) { + return Character.isAlphabetic(ch); + } + + public static boolean isLower(int ch) { + return Character.isLowerCase(ch); + } + + public static boolean isUpper(int ch) { + return Character.isUpperCase(ch); + } + + // \p{Whitespace} + public static boolean isSpace(int ch) { + return ((((1 << Character.SPACE_SEPARATOR) | + (1 << Character.LINE_SEPARATOR) | + (1 << Character.PARAGRAPH_SEPARATOR)) >> Character.getType(ch)) & 1) + != 0 || + (ch >= 0x9 && ch <= 0xd) || + (ch == 0x85); + } + + // \p{gc=Control} + public static boolean isCntrl(int ch) { + return Character.getType(ch) == Character.CONTROL; + } + + // \p{gc=Punctuation} + public static boolean isPunct(int ch) { + return ((((1 << Character.CONNECTOR_PUNCTUATION) | + (1 << Character.DASH_PUNCTUATION) | + (1 << Character.START_PUNCTUATION) | + (1 << Character.END_PUNCTUATION) | + (1 << Character.OTHER_PUNCTUATION) | + (1 << Character.INITIAL_QUOTE_PUNCTUATION) | + (1 << Character.FINAL_QUOTE_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0; + } + + // \p{gc=Decimal_Number} + // \p{Hex_Digit} -> PropList.txt: Hex_Digit + public static boolean isHexDigit(int ch) { + return Character.isDigit(ch) || + (ch >= 0x0030 && ch <= 0x0039) || + (ch >= 0x0041 && ch <= 0x0046) || + (ch >= 0x0061 && ch <= 0x0066) || + (ch >= 0xFF10 && ch <= 0xFF19) || + (ch >= 0xFF21 && ch <= 0xFF26) || + (ch >= 0xFF41 && ch <= 0xFF46); + } + + // \p{gc=Decimal_Number} + public static boolean isDigit(int ch) { + return Character.isDigit(ch); + }; + + // \p{alpha} + // \p{digit} + public static boolean isAlnum(int ch) { + return Character.isAlphabetic(ch) || Character.isDigit(ch); + } + + // \p{Whitespace} -- + // [\N{LF} \N{VT} \N{FF} \N{CR} \N{NEL} -> 0xa, 0xb, 0xc, 0xd, 0x85 + // \p{gc=Line_Separator} + // \p{gc=Paragraph_Separator}] + public static boolean isBlank(int ch) { + int type = Character.getType(ch); + return isSpace(ch) && + ch != 0xa & ch != 0xb && ch !=0xc && ch != 0xd && ch != 0x85 && + type != Character.LINE_SEPARATOR && + type != Character.PARAGRAPH_SEPARATOR; + } + + // [^ + // \p{space} + // \p{gc=Control} + // \p{gc=Surrogate} + // \p{gc=Unassigned}] + public static boolean isGraph(int ch) { + int type = Character.getType(ch); + return !(isSpace(ch) || + Character.CONTROL == type || + Character.SURROGATE == type || + Character.UNASSIGNED == type); + } + + // \p{graph} + // \p{blank} + // -- \p{cntrl} + public static boolean isPrint(int ch) { + return (isGraph(ch) || isBlank(ch)) && !isCntrl(ch); + } + + // PropList.txt:Noncharacter_Code_Point + public static boolean isNoncharacterCodePoint(int ch) { + return (ch & 0xfffe) == 0xfffe || (ch >= 0xfdd0 && ch <= 0xfdef); + } + + // \p{alpha} + // \p{gc=Mark} + // \p{digit} + // \p{gc=Connector_Punctuation} + public static boolean isWord(int ch) { + return isAlpha(ch) || + ((((1 << Character.NON_SPACING_MARK) | + (1 << Character.ENCLOSING_MARK) | + (1 << Character.COMBINING_SPACING_MARK) | + (1 << Character.CONNECTOR_PUNCTUATION)) >> Character.getType(ch)) & 1) + != 0 || + isDigit(ch); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/java/util/regex/RegExTest.java --- a/jdk/test/java/util/regex/RegExTest.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/java/util/regex/RegExTest.java Sat May 14 11:52:15 2011 -0700 @@ -32,7 +32,7 @@ * 4872664 4803179 4892980 4900747 4945394 4938995 4979006 4994840 4997476 * 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940 * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133 - * 6350801 6676425 6878475 6919132 6931676 6948903 7014645 + * 6350801 6676425 6878475 6919132 6931676 6948903 7014645 7039066 */ import java.util.regex.*; @@ -137,6 +137,7 @@ nonBmpClassComplementTest(); unicodePropertiesTest(); unicodeHexNotationTest(); + unicodeClassesTest(); if (failure) throw new RuntimeException("Failure in the RE handling."); else @@ -3656,5 +3657,146 @@ failCount++; } report("unicodeHexNotation"); - } + } + + private static void unicodeClassesTest() throws Exception { + + Matcher lower = Pattern.compile("\\p{Lower}").matcher(""); + Matcher upper = Pattern.compile("\\p{Upper}").matcher(""); + Matcher ASCII = Pattern.compile("\\p{ASCII}").matcher(""); + Matcher alpha = Pattern.compile("\\p{Alpha}").matcher(""); + Matcher digit = Pattern.compile("\\p{Digit}").matcher(""); + Matcher alnum = Pattern.compile("\\p{Alnum}").matcher(""); + Matcher punct = Pattern.compile("\\p{Punct}").matcher(""); + Matcher graph = Pattern.compile("\\p{Graph}").matcher(""); + Matcher print = Pattern.compile("\\p{Print}").matcher(""); + Matcher blank = Pattern.compile("\\p{Blank}").matcher(""); + Matcher cntrl = Pattern.compile("\\p{Cntrl}").matcher(""); + Matcher xdigit = Pattern.compile("\\p{XDigit}").matcher(""); + Matcher space = Pattern.compile("\\p{Space}").matcher(""); + Matcher bound = Pattern.compile("\\b").matcher(""); + Matcher word = Pattern.compile("\\w++").matcher(""); + // UNICODE_CHARACTER_CLASS + Matcher lowerU = Pattern.compile("\\p{Lower}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher upperU = Pattern.compile("\\p{Upper}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher ASCIIU = Pattern.compile("\\p{ASCII}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher alphaU = Pattern.compile("\\p{Alpha}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher digitU = Pattern.compile("\\p{Digit}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher alnumU = Pattern.compile("\\p{Alnum}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher punctU = Pattern.compile("\\p{Punct}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher graphU = Pattern.compile("\\p{Graph}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher printU = Pattern.compile("\\p{Print}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher blankU = Pattern.compile("\\p{Blank}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher cntrlU = Pattern.compile("\\p{Cntrl}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher xdigitU = Pattern.compile("\\p{XDigit}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher spaceU = Pattern.compile("\\p{Space}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher boundU = Pattern.compile("\\b", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher wordU = Pattern.compile("\\w", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + // embedded flag (?U) + Matcher lowerEU = Pattern.compile("(?U)\\p{Lower}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher graphEU = Pattern.compile("(?U)\\p{Graph}", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher wordEU = Pattern.compile("(?U)\\w", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + + Matcher bwb = Pattern.compile("\\b\\w\\b").matcher(""); + Matcher bwbU = Pattern.compile("\\b\\w++\\b", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + Matcher bwbEU = Pattern.compile("(?U)\\b\\w++\\b", Pattern.UNICODE_CHARACTER_CLASS).matcher(""); + // properties + Matcher lowerP = Pattern.compile("\\p{IsLowerCase}").matcher(""); + Matcher upperP = Pattern.compile("\\p{IsUpperCase}").matcher(""); + Matcher titleP = Pattern.compile("\\p{IsTitleCase}").matcher(""); + Matcher letterP = Pattern.compile("\\p{IsLetter}").matcher(""); + Matcher alphaP = Pattern.compile("\\p{IsAlphabetic}").matcher(""); + Matcher ideogP = Pattern.compile("\\p{IsIdeographic}").matcher(""); + Matcher cntrlP = Pattern.compile("\\p{IsControl}").matcher(""); + Matcher spaceP = Pattern.compile("\\p{IsWhiteSpace}").matcher(""); + Matcher definedP = Pattern.compile("\\p{IsAssigned}").matcher(""); + Matcher nonCCPP = Pattern.compile("\\p{IsNoncharacterCodePoint}").matcher(""); + + // javaMethod + Matcher lowerJ = Pattern.compile("\\p{javaLowerCase}").matcher(""); + Matcher upperJ = Pattern.compile("\\p{javaUpperCase}").matcher(""); + Matcher alphaJ = Pattern.compile("\\p{javaAlphabetic}").matcher(""); + Matcher ideogJ = Pattern.compile("\\p{javaIdeographic}").matcher(""); + + for (int cp = 1; cp < 0x30000; cp++) { + String str = new String(Character.toChars(cp)); + int type = Character.getType(cp); + if (// lower + POSIX_ASCII.isLower(cp) != lower.reset(str).matches() || + Character.isLowerCase(cp) != lowerU.reset(str).matches() || + Character.isLowerCase(cp) != lowerP.reset(str).matches() || + Character.isLowerCase(cp) != lowerEU.reset(str).matches()|| + Character.isLowerCase(cp) != lowerJ.reset(str).matches()|| + // upper + POSIX_ASCII.isUpper(cp) != upper.reset(str).matches() || + POSIX_Unicode.isUpper(cp) != upperU.reset(str).matches() || + Character.isUpperCase(cp) != upperP.reset(str).matches() || + Character.isUpperCase(cp) != upperJ.reset(str).matches() || + // alpha + POSIX_ASCII.isAlpha(cp) != alpha.reset(str).matches() || + POSIX_Unicode.isAlpha(cp) != alphaU.reset(str).matches() || + Character.isAlphabetic(cp)!= alphaP.reset(str).matches() || + Character.isAlphabetic(cp)!= alphaJ.reset(str).matches() || + // digit + POSIX_ASCII.isDigit(cp) != digit.reset(str).matches() || + Character.isDigit(cp) != digitU.reset(str).matches() || + // alnum + POSIX_ASCII.isAlnum(cp) != alnum.reset(str).matches() || + POSIX_Unicode.isAlnum(cp) != alnumU.reset(str).matches() || + // punct + POSIX_ASCII.isPunct(cp) != punct.reset(str).matches() || + POSIX_Unicode.isPunct(cp) != punctU.reset(str).matches() || + // graph + POSIX_ASCII.isGraph(cp) != graph.reset(str).matches() || + POSIX_Unicode.isGraph(cp) != graphU.reset(str).matches() || + POSIX_Unicode.isGraph(cp) != graphEU.reset(str).matches()|| + // blank + POSIX_ASCII.isType(cp, POSIX_ASCII.BLANK) + != blank.reset(str).matches() || + POSIX_Unicode.isBlank(cp) != blankU.reset(str).matches() || + // print + POSIX_ASCII.isPrint(cp) != print.reset(str).matches() || + POSIX_Unicode.isPrint(cp) != printU.reset(str).matches() || + // cntrl + POSIX_ASCII.isCntrl(cp) != cntrl.reset(str).matches() || + POSIX_Unicode.isCntrl(cp) != cntrlU.reset(str).matches() || + (Character.CONTROL == type) != cntrlP.reset(str).matches() || + // hexdigit + POSIX_ASCII.isHexDigit(cp) != xdigit.reset(str).matches() || + POSIX_Unicode.isHexDigit(cp) != xdigitU.reset(str).matches() || + // space + POSIX_ASCII.isSpace(cp) != space.reset(str).matches() || + POSIX_Unicode.isSpace(cp) != spaceU.reset(str).matches() || + POSIX_Unicode.isSpace(cp) != spaceP.reset(str).matches() || + // word + POSIX_ASCII.isWord(cp) != word.reset(str).matches() || + POSIX_Unicode.isWord(cp) != wordU.reset(str).matches() || + POSIX_Unicode.isWord(cp) != wordEU.reset(str).matches()|| + // bwordb + POSIX_ASCII.isWord(cp) != bwb.reset(str).matches() || + POSIX_Unicode.isWord(cp) != bwbU.reset(str).matches() || + // properties + Character.isTitleCase(cp) != titleP.reset(str).matches() || + Character.isLetter(cp) != letterP.reset(str).matches()|| + Character.isIdeographic(cp) != ideogP.reset(str).matches() || + Character.isIdeographic(cp) != ideogJ.reset(str).matches() || + (Character.UNASSIGNED == type) == definedP.reset(str).matches() || + POSIX_Unicode.isNoncharacterCodePoint(cp) != nonCCPP.reset(str).matches()) + failCount++; + } + + // bounds/word align + twoFindIndexes(" \u0180sherman\u0400 ", bound, 1, 10); + if (!bwbU.reset("\u0180sherman\u0400").matches()) + failCount++; + twoFindIndexes(" \u0180sh\u0345erman\u0400 ", bound, 1, 11); + if (!bwbU.reset("\u0180sh\u0345erman\u0400").matches()) + failCount++; + twoFindIndexes(" \u0724\u0739\u0724 ", bound, 1, 4); + if (!bwbU.reset("\u0724\u0739\u0724").matches()) + failCount++; + if (!bwbEU.reset("\u0724\u0739\u0724").matches()) + failCount++; + report("unicodePredefinedClasses"); + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/javax/swing/JFileChooser/7036025/bug7036025.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JFileChooser/7036025/bug7036025.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011, 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 7036025 + @summary java.security.AccessControlException when creating JFileChooser in signed applet + @author Pavel Porvatov + @run main/othervm/policy=security.policy bug7036025 +*/ + +import javax.swing.*; +import java.io.File; + +public class bug7036025 { + public static final String DIR = "c:/temp"; + + public static void main(String[] args) throws Exception { + String systemLookAndFeelClassName = UIManager.getSystemLookAndFeelClassName(); + + if (!systemLookAndFeelClassName.toLowerCase().contains("windows")) { + System.out.println("The test is only for Windows OS."); + + return; + } + + File file = new File(DIR); + + if (!file.exists()) { + if (!file.mkdir()) { + throw new RuntimeException("Cannot create " + DIR); + } + + file.deleteOnExit(); + } + + UIManager.setLookAndFeel(systemLookAndFeelClassName); + + new JFileChooser(file); + + System.out.println("Test passed for LookAndFeel " + UIManager.getLookAndFeel().getName()); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/javax/swing/JFileChooser/7036025/security.policy --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JFileChooser/7036025/security.policy Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,5 @@ +grant { + permission java.io.FilePermission "C:\\temp\\*", "read"; + permission java.io.FilePermission "C:\\temp", "read,write,delete"; + permission java.util.PropertyPermission "*", "read"; +}; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/javax/swing/JLabel/6596966/bug6596966.java --- a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/javax/swing/JLabel/6596966/bug6596966.java Sat May 14 11:52:15 2011 -0700 @@ -24,13 +24,13 @@ /* @test @bug 6596966 @summary Some JFileChooser mnemonics do not work with sticky keys - * @library ../../regtesthelpers - * @build Util @run main bug6596966 @author Pavel Porvatov */ +import sun.awt.SunToolkit; + import javax.swing.*; import java.awt.*; import java.awt.event.KeyEvent; @@ -44,6 +44,7 @@ public static void main(String[] args) throws Exception { Robot robot = new Robot(); + SunToolkit toolkit = (SunToolkit) SunToolkit.getDefaultToolkit(); SwingUtilities.invokeAndWait(new Runnable() { public void run() { @@ -68,17 +69,17 @@ } }); - Util.blockTillDisplayed(frame); + toolkit.realSync(); robot.keyPress(KeyEvent.VK_ALT); robot.keyPress(KeyEvent.VK_L); - robot.waitForIdle(); + toolkit.realSync(); - Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new KeyEvent(label, KeyEvent.KEY_RELEASED, + toolkit.getSystemEventQueue().postEvent(new KeyEvent(label, KeyEvent.KEY_RELEASED, EventQueue.getMostRecentEventTime(), 0, KeyEvent.VK_L, 'L')); - robot.waitForIdle(); + toolkit.realSync(); try { SwingUtilities.invokeAndWait(new Runnable() { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/StrCodingBenchmarkUTF8.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/nio/cs/StrCodingBenchmarkUTF8.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2011, 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.util.*; +import java.nio.*; +import java.nio.charset.*; + +public class StrCodingBenchmarkUTF8 { + + public static void main(String[] args) throws Throwable { + + final int itrs = Integer.getInteger("iterations", 100000); + final int size = 2048; + final int subsize = Integer.getInteger("subsize", 128); + final Random rnd = new Random(); + final int maxchar = 0x7f; + + Charset charset = Charset.forName("UTF-8"); + final String csn = charset.name(); + final Charset cs = charset; + + int[] starts = new int[] { 0, 0x80, 0x800, 0x10000}; + for (int nb = 1; nb <= 4; nb++) { + + final CharsetEncoder enc = cs.newEncoder(); + + char[] cc = new char[size]; + int i = 0; + while (i < size - 3) { + i += Character.toChars(starts[nb - 1] + rnd.nextInt(maxchar), cc, i); + } + + final String string = new String(cc); + final byte[] bytes = string.getBytes(cs); + + System.out.printf("%n--------%s[nb=%d]---------%n", csn, nb); + int sz = 12; + while (sz < size) { + System.out.printf(" [len=%d]%n", sz); + final byte[] bs = Arrays.copyOf(bytes, sz); + final String str = new String(bs, csn); + StrCodingBenchmark.Job[] jobs = { + new StrCodingBenchmark.Job("String decode: csn") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + new String(bs, csn); + }}, + + new StrCodingBenchmark.Job("String decode: cs") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + new String(bs, cs); + }}, + + new StrCodingBenchmark.Job("String encode: csn") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + str.getBytes(csn); + }}, + + new StrCodingBenchmark.Job("String encode: cs") { + public void work() throws Throwable { + for (int i = 0; i < itrs; i++) + str.getBytes(cs); + }}, + }; + StrCodingBenchmark.time(StrCodingBenchmark.filter(null, jobs)); + sz <<= 1; + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/TestStringCoding.java --- a/jdk/test/sun/nio/cs/TestStringCoding.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/nio/cs/TestStringCoding.java Sat May 14 11:52:15 2011 -0700 @@ -24,7 +24,7 @@ */ /* @test - @bug 6636323 6636319 + @bug 6636323 6636319 7040220 @summary Test if StringCoding and NIO result have the same de/encoding result * @run main/othervm/timeout=2000 TestStringCoding */ @@ -111,6 +111,8 @@ //encode unmappable surrogates if (enc instanceof sun.nio.cs.ArrayEncoder && cs.contains(Charset.forName("ASCII"))) { + if (cs.name().equals("UTF-8")) // utf8 handles surrogates + return; enc.replaceWith(new byte[] { (byte)'A'}); sun.nio.cs.ArrayEncoder cae = (sun.nio.cs.ArrayEncoder)enc; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/TestStringCodingUTF8.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/nio/cs/TestStringCodingUTF8.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2011, 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 7040220 + @summary Test if StringCoding and NIO result have the same de/encoding result for UTF-8 + * @run main/othervm/timeout=2000 TestStringCodingUTF8 + */ + +import java.util.*; +import java.nio.*; +import java.nio.charset.*; + +public class TestStringCodingUTF8 { + public static void main(String[] args) throws Throwable { + test(); + // security manager on + System.setSecurityManager(new PermissiveSecurityManger()); + test(); + } + + static void test() throws Throwable { + Charset cs = Charset.forName("UTF-8"); + char[] bmp = new char[0x10000]; + for (int i = 0; i < 0x10000; i++) { + bmp[i] = (char)i; + } + test(cs, bmp, 0, bmp.length); + + ArrayList<Integer> list = new ArrayList<>(0x20000); + for (int i = 0; i < 0x20000; i++) { + list.add(i, i); + } + Collections.shuffle(list); + int j = 0; + char[] bmpsupp = new char[0x30000]; + for (int i = 0; i < 0x20000; i++) { + j += Character.toChars(list.get(i), bmpsupp, j); + } + assert (j == bmpsupp.length); + test(cs, bmpsupp, 0, bmpsupp.length); + + // randomed "off" and "len" on shuffled data + Random rnd = new Random(); + int maxlen = 1000; + int itr = 5000; + for (int i = 0; i < itr; i++) { + int off = rnd.nextInt(bmpsupp.length - maxlen); + int len = rnd.nextInt(maxlen); + test(cs, bmpsupp, off, len); + } + + // random length of bytes, test the edge corner case + for (int i = 0; i < itr; i++) { + byte[] ba = new byte[rnd.nextInt(maxlen)]; + rnd.nextBytes(ba); + //new String(csn); + if (!new String(ba, cs.name()).equals( + new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(csn) failed"); + //new String(cs); + if (!new String(ba, cs).equals( + new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(cs) failed"); + } + System.out.println("done!"); + } + + static void test(Charset cs, char[] ca, int off, int len) throws Throwable { + String str = new String(ca, off, len); + byte[] ba = encode(cs, ca, off, len); + + //getBytes(csn); + byte[] baStr = str.getBytes(cs.name()); + if (!Arrays.equals(ba, baStr)) + throw new RuntimeException("getBytes(csn) failed"); + + //getBytes(cs); + baStr = str.getBytes(cs); + if (!Arrays.equals(ba, baStr)) + throw new RuntimeException("getBytes(cs) failed"); + + //new String(csn); + if (!new String(ba, cs.name()).equals(new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(csn) failed"); + + //new String(cs); + if (!new String(ba, cs).equals(new String(decode(cs, ba, 0, ba.length)))) + throw new RuntimeException("new String(cs) failed"); + } + + // copy/paste of the StringCoding.decode() + static char[] decode(Charset cs, byte[] ba, int off, int len) { + CharsetDecoder cd = cs.newDecoder(); + int en = (int)(len * cd.maxCharsPerByte()); + char[] ca = new char[en]; + if (len == 0) + return ca; + cd.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); + + ByteBuffer bb = ByteBuffer.wrap(ba, off, len); + CharBuffer cb = CharBuffer.wrap(ca); + try { + CoderResult cr = cd.decode(bb, cb, true); + if (!cr.isUnderflow()) + cr.throwException(); + cr = cd.flush(cb); + if (!cr.isUnderflow()) + cr.throwException(); + } catch (CharacterCodingException x) { + throw new Error(x); + } + return Arrays.copyOf(ca, cb.position()); + } + + // copy/paste of the StringCoding.encode() + static byte[] encode(Charset cs, char[] ca, int off, int len) { + CharsetEncoder ce = cs.newEncoder(); + int en = (int)(len * ce.maxBytesPerChar()); + byte[] ba = new byte[en]; + if (len == 0) + return ba; + ce.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); + ByteBuffer bb = ByteBuffer.wrap(ba); + CharBuffer cb = CharBuffer.wrap(ca, off, len); + try { + CoderResult cr = ce.encode(cb, bb, true); + if (!cr.isUnderflow()) + cr.throwException(); + cr = ce.flush(bb); + if (!cr.isUnderflow()) + cr.throwException(); + } catch (CharacterCodingException x) { + throw new Error(x); + } + return Arrays.copyOf(ba, bb.position()); + } + + static class PermissiveSecurityManger extends SecurityManager { + @Override public void checkPermission(java.security.Permission p) {} + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/nio/cs/TestUTF8.java --- a/jdk/test/sun/nio/cs/TestUTF8.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/nio/cs/TestUTF8.java Sat May 14 11:52:15 2011 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 4486841 + * @bug 4486841 7040220 * @summary Test UTF-8 charset */ @@ -70,6 +70,32 @@ return dec.decode(bbf, cbf, true); } + // copy/paste of the StringCoding.decode() + static char[] decode(Charset cs, byte[] ba, int off, int len) { + CharsetDecoder cd = cs.newDecoder(); + int en = (int)(len * cd.maxCharsPerByte()); + char[] ca = new char[en]; + if (len == 0) + return ca; + cd.onMalformedInput(CodingErrorAction.REPLACE) + .onUnmappableCharacter(CodingErrorAction.REPLACE) + .reset(); + + ByteBuffer bb = ByteBuffer.wrap(ba, off, len); + CharBuffer cb = CharBuffer.wrap(ca); + try { + CoderResult cr = cd.decode(bb, cb, true); + if (!cr.isUnderflow()) + cr.throwException(); + cr = cd.flush(cb); + if (!cr.isUnderflow()) + cr.throwException(); + } catch (CharacterCodingException x) { + throw new Error(x); + } + return Arrays.copyOf(ca, cb.position()); + } + static byte[] encode(char[] cc, String csn, boolean testDirect) throws Exception { ByteBuffer bbf; @@ -142,7 +168,14 @@ bb = encode(cc, csn, true); ccO = decode(bb, csn, true); if (!Arrays.equals(cc, ccO)) { - System.out.printf(" (direct) failed"); + System.out.print(" (direct) failed"); + } + // String.getBytes()/toCharArray() goes to ArrayDe/Encoder path + if (!Arrays.equals(bb, new String(cc).getBytes(csn))) { + System.out.printf(" String.getBytes() failed"); + } + if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) { + System.out.printf(" String.toCharArray() failed"); } System.out.println(); } @@ -168,6 +201,12 @@ if (!Arrays.equals(cc, ccO)) { System.out.printf(" decoding(direct) failed%n"); } + // new String(bb, csn).getBytes(csn) will not return + // the 6 bytes surrogates as in bb, so only test + // toCharArray() here. + if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) { + System.out.printf(" String.toCharArray() failed"); + } } static void compare(String csn1, String csn2) throws Exception { @@ -274,6 +313,7 @@ static void checkMalformed(String csn) throws Exception { boolean failed = false; System.out.printf(" Check malformed <%s>...%n", csn); + Charset cs = Charset.forName(csn); for (boolean direct: new boolean[] {false, true}) { for (byte[] bins : malformed) { int mlen = bins[0]; @@ -285,10 +325,15 @@ ashex += Integer.toBinaryString((int)bin[i] & 0xff); } if (!cr.isMalformed()) { - System.out.printf(" FAIL(direct=%b): [%s] not malformed.\n", direct, ashex); + System.out.printf(" FAIL(direct=%b): [%s] not malformed.%n", direct, ashex); failed = true; } else if (cr.length() != mlen) { - System.out.printf(" FAIL(direct=%b): [%s] malformed[len=%d].\n", direct, ashex, cr.length()); + System.out.printf(" FAIL(direct=%b): [%s] malformed[len=%d].%n", direct, ashex, cr.length()); + failed = true; + } + if (!Arrays.equals(decode(cs, bin, 0, bin.length), + new String(bin, csn).toCharArray())) { + System.out.printf(" FAIL(new String(bb, %s)) failed%n", csn); failed = true; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011, 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 7040151 + * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478 + * @compile -XDignore.symbol.file NegTokenTargFields.java + * @run main NegTokenTargFields nomech + * @run main/fail NegTokenTargFields badorder + */ + +import sun.security.jgss.spnego.NegTokenTarg; + +public class NegTokenTargFields { + + // A hand-crafted NegTokenTarg with negResult and responseToken only + public static byte[] nomech = { + (byte)0xA1, (byte)0x0F, (byte)0x30, (byte)0x0D, + (byte)0xA0, (byte)0x03, (byte)0x0A, (byte)0x01, + (byte)0x02, (byte)0xA2, (byte)0x02, (byte)0x04, + (byte)0x00, (byte)0xA3, (byte)0x02, (byte)0x04, + (byte)0x00, + }; + + // A hand-crafted NegTokenTarg with negResult and supportedMech in wrong order + public static byte[] badorder = { + (byte)0xA1, (byte)0x1E, (byte)0x30, (byte)0x1C, + (byte)0xA1, (byte)0x0B, (byte)0x06, (byte)0x09, + (byte)0x2A, (byte)0x86, (byte)0x48, (byte)0x86, + (byte)0xF7, (byte)0x12, (byte)0x01, (byte)0x02, + (byte)0x02, (byte)0xA0, (byte)0x03, (byte)0x0A, + (byte)0x01, (byte)0x00, (byte)0xA2, (byte)0x03, + (byte)0x04, (byte)0x01, (byte)0x00, (byte)0xA3, + (byte)0x03, (byte)0x04, (byte)0x01, (byte)0x00, + }; + + public static void main(String[] args) throws Exception { + byte[] buf = (byte[])NegTokenTargFields.class.getField(args[0]).get(null); + new NegTokenTarg(buf); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/BadKdc.java --- a/jdk/test/sun/security/krb5/auto/BadKdc.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/BadKdc.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, 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 @@ -22,8 +22,14 @@ */ import java.io.*; +import java.net.BindException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.security.auth.login.LoginException; +import sun.security.krb5.Asn1Exception; import sun.security.krb5.Config; public class BadKdc { @@ -34,8 +40,51 @@ static final Pattern re = Pattern.compile( ">>> KDCCommunication: kdc=kdc.rabbit.hole UDP:(\\d)...., " + "timeout=(\\d)000,"); + + /* + * There are several cases this test fails: + * + * 1. The random selected port is used by another process. No good way to + * prevent this happening, coz krb5.conf must be written before KDC starts. + * There are two different outcomes: + * + * a. Cannot start the KDC. A BindException thrown. + * b. When trying to access a non-existing KDC, a response is received! + * Most likely a Asn1Exception thrown + * + * 2. Even if a KDC is started, and more than 20 seconds pass by, a timeout + * can still happens for the first UDP request. In fact, the KDC did not + * received it at all. This happens on almost all platforms, especially + * solaris-i586 and solaris-x64. + * + * To avoid them: + * + * 1. Catch those exceptions and ignore + * + * 2. a. Make the timeout longer? useless + * b. Read the output carefully, if there is a timeout, it's OK. + * Just make sure the retries times and KDCs are correct. + * This is tough. + * c. Feed the KDC a UDP packet first. The current "solution". + */ public static void go(int[]... expected) throws Exception { + try { + go0(expected); + } catch (BindException be) { + System.out.println("The random port is used by another process"); + } catch (LoginException le) { + Throwable cause = le.getCause(); + if (cause instanceof Asn1Exception) { + System.out.println("Bad packet possibly from another process"); + return; + } + throw le; + } + } + + public static void go0(int[]... expected) + throws Exception { System.setProperty("sun.security.krb5.debug", "true"); // Make sure KDCs' ports starts with 1 and 2 and 3, @@ -78,20 +127,39 @@ KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p, true); k.addPrincipal(OneKDC.USER, OneKDC.PASS); k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM); + // Feed a packet to newly started KDC to warm it up + System.err.println("-------- IGNORE THIS ERROR MESSAGE --------"); + new DatagramSocket().send( + new DatagramPacket("Hello".getBytes(), 5, + InetAddress.getByName(OneKDC.KDCHOST), p)); return k; } + private static void test(int... expected) throws Exception { + ByteArrayOutputStream bo = new ByteArrayOutputStream(); + try { + test0(bo, expected); + } catch (Exception e) { + System.out.println("----------------- ERROR -----------------"); + System.out.println(new String(bo.toByteArray())); + System.out.println("--------------- ERROR END ---------------"); + throw e; + } + } + /** * One round of test for max_retries and timeout. - * @param timeout the expected timeout * @param expected the expected kdc# timeout kdc# timeout... */ - private static void test(int... expected) throws Exception { - ByteArrayOutputStream bo = new ByteArrayOutputStream(); + private static void test0(ByteArrayOutputStream bo, int... expected) + throws Exception { PrintStream oldout = System.out; System.setOut(new PrintStream(bo)); - Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); - System.setOut(oldout); + try { + Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + } finally { + System.setOut(oldout); + } String[] lines = new String(bo.toByteArray()).split("\n"); System.out.println("----------------- TEST -----------------"); diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/Context.java --- a/jdk/test/sun/security/krb5/auto/Context.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/Context.java Sat May 14 11:52:15 2011 -0700 @@ -44,6 +44,7 @@ import com.sun.security.jgss.AuthorizationDataEntry; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import javax.security.auth.kerberos.KeyTab; /** * Context of a JGSS subject, encapsulating Subject and GSSContext. @@ -107,15 +108,19 @@ return out; } + public static Context fromUserPass( + String user, char[] pass, boolean storeKey) throws Exception { + return fromUserPass(null, user, pass, storeKey); + } /** * Logins with a username and a password, using Krb5LoginModule directly * @param storeKey true if key should be saved, used on acceptor side */ - public static Context fromUserPass(String user, char[] pass, boolean storeKey) - throws Exception { + public static Context fromUserPass(Subject s, + String user, char[] pass, boolean storeKey) throws Exception { Context out = new Context(); out.name = user; - out.s = new Subject(); + out.s = s == null ? new Subject() : s; Krb5LoginModule krb5 = new Krb5LoginModule(); Map<String, String> map = new HashMap<>(); Map<String, Object> shared = new HashMap<>(); @@ -198,12 +203,25 @@ * @throws java.lang.Exception */ public void startAsServer(final Oid mech) throws Exception { + startAsServer(null, mech); + } + + /** + * Starts as a server with the specified service name + * @param name the service name + * @param mech GSS mech + * @throws java.lang.Exception + */ + public void startAsServer(final String name, final Oid mech) throws Exception { doAs(new Action() { @Override public byte[] run(Context me, byte[] dummy) throws Exception { GSSManager m = GSSManager.getInstance(); me.x = (ExtendedGSSContext)m.createContext(m.createCredential( - null, + name == null ? null : + (name.indexOf('@') < 0 ? + m.createName(name, null) : + m.createName(name, GSSName.NT_HOSTBASED_SERVICE)), GSSCredential.INDEFINITE_LIFETIME, mech, GSSCredential.ACCEPT_ONLY)); @@ -230,6 +248,14 @@ } /** + * Accesses the internal subject. + * @return the subject + */ + public Subject s() { + return s; + } + + /** * Disposes the GSSContext within * @throws org.ietf.jgss.GSSException */ @@ -297,7 +323,7 @@ } catch (Exception e) { ;// Don't care } - System.out.println("====================================="); + System.out.println("====== Private Credentials Set ======"); for (Object o : s.getPrivateCredentials()) { System.out.println(" " + o.getClass()); if (o instanceof KerberosTicket) { @@ -315,6 +341,8 @@ for (Object k : map.keySet()) { System.out.println(" " + k + ": " + map.get(k)); } + } else { + System.out.println(" " + o); } } if (x != null && x instanceof ExtendedGSSContext) { diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/DynamicKeytab.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/DynamicKeytab.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2011, 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 6894072 + * @run main/othervm DynamicKeytab + * @summary always refresh keytab + */ + +import java.io.File; +import java.io.FileOutputStream; +import java.nio.file.Files; +import java.nio.file.Paths; +import org.ietf.jgss.GSSException; +import sun.security.jgss.GSSUtil; +import sun.security.krb5.KrbException; +import sun.security.krb5.internal.Krb5; + +public class DynamicKeytab { + + Context c, s; + public static void main(String[] args) + throws Exception { + new DynamicKeytab().go(); + } + + void go() throws Exception { + OneKDC k = new OneKDC(null); + k.writeJAASConf(); + + Files.delete(Paths.get(OneKDC.KTAB)); + + // Starts with no keytab + c = Context.fromJAAS("client"); + s = Context.fromJAAS("com.sun.security.jgss.krb5.accept"); + + // Test 1: read new key 1 from keytab + k.addPrincipal(OneKDC.SERVER, "pass1".toCharArray()); + k.writeKtab(OneKDC.KTAB); + connect(); + + // Test 2: service key cached, find 1 in keytab (now contains 1 and 2) + k.addPrincipal(OneKDC.SERVER, "pass2".toCharArray()); + k.appendKtab(OneKDC.KTAB); + connect(); + + // Test 3: re-login. Now find 2 in keytab + c = Context.fromJAAS("client"); + connect(); + + // Test 4: re-login, KDC use 3 this time. + c = Context.fromJAAS("client"); + // Put 3 and 4 into keytab but keep the real key back to 3. + k.addPrincipal(OneKDC.SERVER, "pass3".toCharArray()); + k.appendKtab(OneKDC.KTAB); + k.addPrincipal(OneKDC.SERVER, "pass4".toCharArray()); + k.appendKtab(OneKDC.KTAB); + k.addPrincipal(OneKDC.SERVER, "pass3".toCharArray()); + connect(); + + // Test 5: invalid keytab file, should ignore + try (FileOutputStream fos = new FileOutputStream(OneKDC.KTAB)) { + fos.write("BADBADBAD".getBytes()); + } + connect(); + + // Test 6: delete keytab file, identical to revoke all + Files.delete(Paths.get(OneKDC.KTAB)); + try { + connect(); + throw new Exception("Should not success"); + } catch (GSSException gsse) { + System.out.println(gsse); + KrbException ke = (KrbException)gsse.getCause(); + // KrbApReq.authenticate(*) if (dkey == null)... + // This should have been Krb5.KRB_AP_ERR_NOKEY + if (ke.returnCode() != Krb5.API_INVALID_ARG) { + throw new Exception("Not expected failure code: " + + ke.returnCode()); + } + } + + // Test 7: 3 revoked, should fail (now contains only 5) + k.addPrincipal(OneKDC.SERVER, "pass5".toCharArray()); + k.writeKtab(OneKDC.KTAB); // overwrite keytab, which means + // old key is revoked + try { + connect(); + throw new Exception("Should not success"); + } catch (GSSException gsse) { + System.out.println(gsse); + KrbException ke = (KrbException)gsse.getCause(); + if (ke.returnCode() != Krb5.KRB_AP_ERR_BADKEYVER) { + throw new Exception("Not expected failure code: " + + ke.returnCode()); + } + } + + // Test 8: an empty KDC means revoke all + KDC.create("EMPTY.REALM").writeKtab(OneKDC.KTAB); + try { + connect(); + throw new Exception("Should not success"); + } catch (GSSException gsse) { + System.out.println(gsse); + KrbException ke = (KrbException)gsse.getCause(); + // KrbApReq.authenticate(*) if (dkey == null)... + // This should have been Krb5.KRB_AP_ERR_NOKEY + if (ke.returnCode() != Krb5.API_INVALID_ARG) { + throw new Exception("Not expected failure code: " + + ke.returnCode()); + } + } + } + + void connect() throws Exception { + Thread.sleep(2000); // make sure ktab timestamp is different + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c, s); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/KDC.java --- a/jdk/test/sun/security/krb5/auto/KDC.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/KDC.java Sat May 14 11:52:15 2011 -0700 @@ -228,7 +228,33 @@ } /** - * Write all principals' keys from multiple KDCsinto one keytab file. + * Writes or appends KDC keys into a keytab. See doc for writeMultiKtab. + * @param append true if append, otherwise, overwrite. + */ + private static void writeKtab0(String tab, boolean append, KDC... kdcs) + throws IOException, KrbException { + KeyTab ktab = append ? KeyTab.getInstance(tab) : KeyTab.create(tab); + for (KDC kdc: kdcs) { + for (String name : kdc.passwords.keySet()) { + char[] pass = kdc.passwords.get(name); + int kvno = 0; + if (Character.isDigit(pass[pass.length-1])) { + kvno = pass[pass.length-1] - '0'; + } + ktab.addEntry(new PrincipalName(name, + name.indexOf('/') < 0 ? + PrincipalName.KRB_NT_UNKNOWN : + PrincipalName.KRB_NT_SRV_HST), + pass, + kvno, + true); + } + } + ktab.save(); + } + + /** + * Writes all principals' keys from multiple KDCs into one keytab file. * Note that the keys for the krbtgt principals will not be written. * * Attention: This method references krb5.conf settings. If you need to @@ -252,17 +278,16 @@ */ public static void writeMultiKtab(String tab, KDC... kdcs) throws IOException, KrbException { - KeyTab ktab = KeyTab.create(tab); - for (KDC kdc: kdcs) { - for (String name : kdc.passwords.keySet()) { - ktab.addEntry(new PrincipalName(name, - name.indexOf('/') < 0 ? - PrincipalName.KRB_NT_UNKNOWN : - PrincipalName.KRB_NT_SRV_HST), - kdc.passwords.get(name), -1, true); - } - } - ktab.save(); + writeKtab0(tab, false, kdcs); + } + + /** + * Appends all principals' keys from multiple KDCs to one keytab file. + * See writeMultiKtab for details. + */ + public static void appendMultiKtab(String tab, KDC... kdcs) + throws IOException, KrbException { + writeKtab0(tab, true, kdcs); } /** @@ -273,6 +298,13 @@ } /** + * Appends keys in this KDC to a ktab. + */ + public void appendKtab(String tab) throws IOException, KrbException { + KDC.appendMultiKtab(tab, this); + } + + /** * Adds a new principal to this realm with a given password. * @param user the principal's name. For a service principal, use the * form of host/f.q.d.n diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/KeyTabCompat.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/KeyTabCompat.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2011, 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 6894072 + * @compile -XDignore.symbol.file KeyTabCompat.java + * @run main/othervm KeyTabCompat + * @summary always refresh keytab + */ + +import javax.security.auth.kerberos.KerberosKey; +import sun.security.jgss.GSSUtil; + +/* + * There are 2 compat issues to check: + * + * 1. If there is only KerberosKeys in private credential set and no + * KerberosPrincipal. JAAS login should go on. + * 2. Even if KeyTab is used, user can still get KerberosKeys from + * private credentials set. + */ +public class KeyTabCompat { + + public static void main(String[] args) + throws Exception { + OneKDC kdc = new OneKDC("aes128-cts"); + kdc.writeJAASConf(); + kdc.addPrincipal(OneKDC.SERVER, "pass1".toCharArray()); + kdc.writeKtab(OneKDC.KTAB); + + Context c, s; + + // Part 1 + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + s = Context.fromUserPass(OneKDC.USER2, OneKDC.PASS2, true); + + s.s().getPrincipals().clear(); + + c.startAsClient(OneKDC.USER2, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + + Context.handshake(c, s); + + // Part 2 + c = Context.fromJAAS("client"); + s = Context.fromJAAS("server"); + + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + s.status(); + + if (s.s().getPrivateCredentials(KerberosKey.class).size() != 1) { + throw new Exception("There should be one KerberosKey"); + } + + Thread.sleep(2000); // make sure ktab timestamp is different + + kdc.addPrincipal(OneKDC.SERVER, "pass2".toCharArray()); + kdc.writeKtab(OneKDC.KTAB); + + Context.handshake(c, s); + s.status(); + + if (s.s().getPrivateCredentials(KerberosKey.class).size() != 1) { + throw new Exception("There should be only one KerberosKey"); + } + + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/LoginModuleOptions.java --- a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java Sat May 14 11:52:15 2011 -0700 @@ -28,7 +28,6 @@ * @summary Krb5LoginModule a little too restrictive, and the doc is not clear. */ import com.sun.security.auth.module.Krb5LoginModule; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; @@ -36,7 +35,6 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; public class LoginModuleOptions { @@ -61,10 +59,12 @@ // 1. ccache -> keytab login(null, "useTicketCache", "true", "ticketCache", "krbcc_non_exists", "useKeyTab", "true", "principal", "dummy"); + // 2. keytab -> shared login(null, "useKeyTab", "true", "principal", "dummy", "keyTab", "ktab_non_exist", "tryFirstPass", "true", NAME, OneKDC.USER, PWD, OneKDC.PASS); + // 3. shared -> callback // 3.1. useFirstPass, no callback boolean failed = false; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/SPNEGO.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/SPNEGO.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2011, 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 7040151 + * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478 + * @compile -XDignore.symbol.file SPNEGO.java + * @run main/othervm SPNEGO + */ + +import sun.security.jgss.GSSUtil; + +// The basic krb5 test skeleton you can copy from +public class SPNEGO { + + public static void main(String[] args) throws Exception { + + new OneKDC(null).writeJAASConf(); + + Context c, s; + c = Context.fromJAAS("client"); + s = Context.fromJAAS("server"); + + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_SPNEGO_MECH_OID); + s.startAsServer(GSSUtil.GSS_SPNEGO_MECH_OID); + + Context.handshake(c, s); + + Context.transmit("i say high --", c, s); + Context.transmit(" you say low", s, c); + + s.dispose(); + c.dispose(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/SSL.java --- a/jdk/test/sun/security/krb5/auto/SSL.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/auto/SSL.java Sat May 14 11:52:15 2011 -0700 @@ -48,7 +48,7 @@ public class SSL { private static String krb5Cipher; - private static final int LOOP_LIMIT = 1; + private static final int LOOP_LIMIT = 3; private static int loopCount = 0; private static volatile String server; private static volatile int port; @@ -98,13 +98,13 @@ fos.close(); f.deleteOnExit(); - final Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + Context c; final Context s = Context.fromJAAS("ssl"); - c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); + // There's no keytab file when server starts. s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); - new Thread(new Runnable() { + Thread server = new Thread(new Runnable() { public void run() { try { s.doAs(new JsseServerAction(), null); @@ -112,12 +112,57 @@ e.printStackTrace(); } } - }).start(); + }); + server.setDaemon(true); + server.start(); // Warm the server Thread.sleep(2000); + // Now create the keytab + + /* + // Add 3 versions of keys into keytab + KeyTab ktab = KeyTab.create(OneKDC.KTAB); + PrincipalName service = new PrincipalName( + "host/" + server, PrincipalName.KRB_NT_SRV_HST); + ktab.addEntry(service, "pass1".toCharArray(), 1); + ktab.addEntry(service, "pass2".toCharArray(), 2); + ktab.addEntry(service, "pass3".toCharArray(), 3); + ktab.save(); + + // and use the middle one as the real key + kdc.addPrincipal("host/" + server, "pass2".toCharArray()); + */ + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); c.doAs(new JsseClientAction(), null); + + // Add another version of key, make sure it can be loaded + Thread.sleep(2000); + ktab = KeyTab.getInstance(OneKDC.KTAB); + ktab.addEntry(service, "pass4".toCharArray(), 4, true); + ktab.save(); + kdc.addPrincipal("host/" + server, "pass4".toCharArray()); + + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); + c.doAs(new JsseClientAction(), null); + + // Revoke the old key + /*Thread.sleep(2000); + ktab = KeyTab.create(OneKDC.KTAB); + ktab.addEntry(service, "pass5".toCharArray(), 5, false); + ktab.save(); + + c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID); + try { + c.doAs(new JsseClientAction(), null); + throw new Exception("Should fail this time."); + } catch (SSLException e) { + // Correct behavior. + }*/ } // Following codes copied from @@ -126,6 +171,7 @@ public byte[] run(Context s, byte[] input) throws Exception { SSLSocketFactory sslsf = (SSLSocketFactory) SSLSocketFactory.getDefault(); + System.out.println("Connecting " + server + ":" + port); SSLSocket sslSocket = (SSLSocket) sslsf.createSocket(server, port); // Enable only a KRB5 cipher suite. @@ -154,6 +200,9 @@ System.out.println("Server is: " + peer.toString()); sslSocket.close(); + // This line should not be needed. It's the server's duty to + // forget the old key + //sslSocket.getSession().invalidate(); return null; } } @@ -165,6 +214,7 @@ SSLServerSocket sslServerSocket = (SSLServerSocket) sslssf.createServerSocket(0); // any port port = sslServerSocket.getLocalPort(); + System.out.println("Listening on " + port); // Enable only a KRB5 cipher suite. String enabledSuites[] = {krb5Cipher}; diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/auto/TwoPrinces.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/TwoPrinces.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2011, 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 6894072 + * @compile -XDignore.symbol.file TwoPrinces.java + * @run main/othervm TwoPrinces + * @summary always refresh keytab + */ + +import java.io.File; +import java.io.FileOutputStream; +import sun.security.jgss.GSSUtil; +import sun.security.krb5.Config; + +public class TwoPrinces { + + public static void main(String[] args) + throws Exception { + + KDC k1 = KDC.create("R1"); + k1.addPrincipal("u1", "hello".toCharArray()); + k1.addPrincipalRandKey("krbtgt/R1"); + k1.addPrincipalRandKey("host/same.host"); + + KDC k2 = KDC.create("R2"); + k2.addPrincipal("u2", "hello".toCharArray()); + k2.addPrincipalRandKey("krbtgt/R2"); + k2.addPrincipalRandKey("host/same.host"); + + System.setProperty("java.security.krb5.conf", "krb5.conf"); + + // R1 is the default realm now + KDC.saveConfig("krb5.conf", k1, k2); + Config.refresh(); + + k1.writeKtab("ktab1"); + k2.writeKtab("ktab2"); + + // A JAAS config file with 2 Krb5LoginModules, after commit, the + // subject with have principals and keytabs from both sides + System.setProperty("java.security.auth.login.config", "jaas.conf"); + File f = new File("jaas.conf"); + FileOutputStream fos = new FileOutputStream(f); + fos.write(( + "me {\n" + + " com.sun.security.auth.module.Krb5LoginModule required" + + " isInitiator=true principal=\"host/same.host@R1\"" + + " useKeyTab=true keyTab=ktab1 storeKey=true;\n" + + " com.sun.security.auth.module.Krb5LoginModule required" + + " isInitiator=true principal=\"host/same.host@R2\"" + + " useKeyTab=true keyTab=ktab2 storeKey=true;\n" + + "};\n" + ).getBytes()); + fos.close(); + + /* + * This server side context will be able to act as services in both + * realms. Please note that we still don't support a single instance + * of server to accept connections from two realms at the same time. + * Therefore, we must call startAsServer in a given realm to start + * working there. The same Subject never changes anyway. + */ + Context s = Context.fromJAAS("me"); + + // Default realm still R1 + s.startAsServer("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context c1 = Context.fromUserPass("u1", "hello".toCharArray(), false); + c1.startAsClient("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c1, s); + + KDC.saveConfig("krb5.conf", k2, k1); + Config.refresh(); + + // Default realm now R2 + s.startAsServer("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context c2 = Context.fromUserPass("u2", "hello".toCharArray(), false); + c2.startAsClient("host@same.host", GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c2, s); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/krb5/ktab/KeyTabIndex.java --- a/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -44,7 +44,6 @@ KeyTab.getInstance("ktab").getClass(); } }; - KeyTab.refresh(); for (int i=0; i<10; i++) { new Thread(t).start(); } diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/AccessKeyStore.sh --- a/jdk/test/sun/security/mscapi/AccessKeyStore.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/AccessKeyStore.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6324295 +# @bug 6324295 6931562 # @run shell AccessKeyStore.sh # @summary Confirm that permission must be granted to access keystores. -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh --- a/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6318171 +# @bug 6318171 6931562 # @run shell IsSunMSCAPIAvailable.sh # @summary Basic test of the Microsoft CryptoAPI provider. -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh --- a/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,12 +25,10 @@ # @test -# @bug 6324294 +# @bug 6324294 6931562 # @run shell KeyStoreCompatibilityMode.sh # @summary Confirm that a null stream or password is not permitted when # compatibility mode is enabled (and vice versa). -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh --- a/jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/KeytoolChangeAlias.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6415696 +# @bug 6415696 6931562 # @run shell KeytoolChangeAlias.sh # @summary Test "keytool -changealias" using the Microsoft CryptoAPI provider. -# -# Run only on non-64-bit Windows platform. # set a few environment variables so that the shell-script can run stand-alone # in the source directory diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/PublicKeyInterop.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/PublicKeyInterop.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * @see PublicKeyInterop.sh + */ + +import java.security.*; +import java.util.*; +import javax.crypto.*; + +import sun.misc.HexDumpEncoder; + +/* + * Confirm interoperability of RSA public keys between SunMSCAPI and SunJCE + * security providers. + */ +public class PublicKeyInterop { + + public static void main(String[] arg) throws Exception { + PrivateKey privKey = null; + Certificate cert = null; + KeyStore ks = KeyStore.getInstance("Windows-MY"); + ks.load(null, null); + System.out.println("Loaded keystore: Windows-MY"); + + PublicKey myPuKey = + (PublicKey) ks.getCertificate("6888925").getPublicKey(); + System.out.println("Public key is a " + myPuKey.getClass().getName()); + PrivateKey myPrKey = (PrivateKey) ks.getKey("6888925", null); + System.out.println("Private key is a " + myPrKey.getClass().getName()); + System.out.println(); + + byte[] plain = new byte[] {0x01, 0x02, 0x03, 0x04, 0x05}; + HexDumpEncoder hde = new HexDumpEncoder(); + System.out.println("Plaintext:\n" + hde.encode(plain) + "\n"); + + Cipher rsa = Cipher.getInstance("RSA/ECB/PKCS1Padding"); + rsa.init(Cipher.ENCRYPT_MODE, myPuKey); + byte[] encrypted = rsa.doFinal(plain); + System.out.println("Encrypted plaintext using RSA Cipher from " + + rsa.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(encrypted) + "\n"); + + Cipher rsa2 = Cipher.getInstance("RSA/ECB/PKCS1Padding", "SunMSCAPI"); + rsa2.init(Cipher.ENCRYPT_MODE, myPuKey); + byte[] encrypted2 = rsa2.doFinal(plain); + System.out.println("Encrypted plaintext using RSA Cipher from " + + rsa2.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(encrypted2) + "\n"); + + Cipher rsa3 = Cipher.getInstance("RSA/ECB/PKCS1Padding", "SunMSCAPI"); + rsa3.init(Cipher.DECRYPT_MODE, myPrKey); + byte[] decrypted = rsa3.doFinal(encrypted); + System.out.println("Decrypted first ciphertext using RSA Cipher from " + + rsa3.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(decrypted) + "\n"); + if (! Arrays.equals(plain, decrypted)) { + throw new Exception("First decrypted ciphertext does not match " + + "original plaintext"); + } + + decrypted = rsa3.doFinal(encrypted2); + System.out.println("Decrypted second ciphertext using RSA Cipher from " + + rsa3.getProvider().getName() + " JCE provider\n"); + System.out.println(hde.encode(decrypted) + "\n"); + if (! Arrays.equals(plain, decrypted)) { + throw new Exception("Second decrypted ciphertext does not match " + + "original plaintext"); + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/PublicKeyInterop.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/PublicKeyInterop.sh Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,84 @@ +#!/bin/sh + +# +# Copyright (c) 2011, 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 6888925 +# @run shell PublicKeyInterop.sh +# @summary SunMSCAPI's Cipher can't use RSA public keys obtained from other +# sources. +# + +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi + +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi + +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +OS=`uname -s` +case "$OS" in + Windows* | CYGWIN* ) + + echo "Creating a temporary RSA keypair in the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -genkeypair \ + -storetype Windows-My \ + -keyalg RSA \ + -alias 6888925 \ + -dname "cn=6888925,c=US" \ + -noprompt + + echo + echo "Running the test..." + ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\PublicKeyInterop.java + ${TESTJAVA}/bin/java PublicKeyInterop + + rc=$? + + echo + echo "Removing the temporary RSA keypair from the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -delete \ + -storetype Windows-My \ + -alias 6888925 + + echo done. + exit $rc + ;; + + * ) + echo "This test is not intended for '$OS' - passing test" + exit 0 + ;; +esac diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh --- a/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh Wed May 11 16:12:01 2011 -0700 +++ b/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh Sat May 14 11:52:15 2011 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,13 +24,11 @@ # # @test -# @bug 6457422 +# @bug 6457422 6931562 # @run shell RSAEncryptDecrypt.sh # @summary Confirm that plaintext can be encrypted and then decrypted using the # RSA cipher in the SunMSCAPI crypto provider. NOTE: The RSA cipher is # absent from the SunMSCAPI provider in OpenJDK builds. -# -# Run only on non-64-bit Windows platform. # set a few environment variables so that the shell-script can run stand-alone # in the source directory diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,225 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * @see SignUsingNONEwithRSA.sh + */ + +import java.security.*; +import java.util.*; + +public class SignUsingNONEwithRSA { + + private static final List<byte[]> precomputedHashes = Arrays.asList( + // A MD5 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 + }, + // A SHA-1 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20 + }, + // A concatenation of SHA-1 and MD5 hashes (used during SSL handshake) + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 + }, + // A SHA-256 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32 + }, + // A SHA-384 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x40, + 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48 + }, + // A SHA-512 hash + new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x40, + 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x50, + 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x60, + 0x61, 0x62, 0x63, 0x64 + }); + + private static List<byte[]> generatedSignatures = new ArrayList<>(); + + public static void main(String[] args) throws Exception { + + Provider[] providers = Security.getProviders("Signature.NONEwithRSA"); + if (providers == null) { + System.out.println("No JCE providers support the " + + "'Signature.NONEwithRSA' algorithm"); + System.out.println("Skipping this test..."); + return; + + } else { + System.out.println("The following JCE providers support the " + + "'Signature.NONEwithRSA' algorithm: "); + for (Provider provider : providers) { + System.out.println(" " + provider.getName()); + } + } + System.out.println("-------------------------------------------------"); + + KeyPair keys = getKeysFromKeyStore(); + signAllUsing("SunMSCAPI", keys.getPrivate()); + System.out.println("-------------------------------------------------"); + + verifyAllUsing("SunMSCAPI", keys.getPublic()); + System.out.println("-------------------------------------------------"); + + verifyAllUsing("SunJCE", keys.getPublic()); + System.out.println("-------------------------------------------------"); + + keys = generateKeys(); + signAllUsing("SunJCE", keys.getPrivate()); + System.out.println("-------------------------------------------------"); + + verifyAllUsing("SunMSCAPI", keys.getPublic()); + System.out.println("-------------------------------------------------"); + + } + + private static KeyPair getKeysFromKeyStore() throws Exception { + KeyStore ks = KeyStore.getInstance("Windows-MY", "SunMSCAPI"); + ks.load(null, null); + System.out.println("Loaded keystore: Windows-MY"); + + Enumeration e = ks.aliases(); + PrivateKey privateKey = null; + PublicKey publicKey = null; + + while (e.hasMoreElements()) { + String alias = (String) e.nextElement(); + if (alias.equals("6578658")) { + System.out.println("Loaded entry: " + alias); + privateKey = (PrivateKey) ks.getKey(alias, null); + publicKey = (PublicKey) ks.getCertificate(alias).getPublicKey(); + } + } + if (privateKey == null || publicKey == null) { + throw new Exception("Cannot load the keys need to run this test"); + } + + return new KeyPair(publicKey, privateKey); + } + + + private static KeyPair generateKeys() throws Exception { + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); + keyGen.initialize(1024, null); + KeyPair pair = keyGen.generateKeyPair(); + PrivateKey privateKey = pair.getPrivate(); + PublicKey publicKey = pair.getPublic(); + + if (privateKey == null || publicKey == null) { + throw new Exception("Cannot load the keys need to run this test"); + } + + return new KeyPair(publicKey, privateKey); + } + + private static void signAllUsing(String providerName, PrivateKey privateKey) + throws Exception { + Signature sig1 = Signature.getInstance("NONEwithRSA", providerName); + if (sig1 == null) { + throw new Exception("'NONEwithRSA' is not supported"); + } + if (sig1.getProvider() != null) { + System.out.println("Using NONEwithRSA signer from the " + + sig1.getProvider().getName() + " JCE provider"); + } else { + System.out.println( + "Using NONEwithRSA signer from the internal JCE provider"); + } + + System.out.println("Using key: " + privateKey); + generatedSignatures.clear(); + for (byte[] hash : precomputedHashes) { + sig1.initSign(privateKey); + sig1.update(hash); + + try { + + byte [] sigBytes = sig1.sign(); + System.out.println("\nGenerated RSA signature over a " + + hash.length + "-byte hash (signature length: " + + sigBytes.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + + (sigBytes.length * 2) + "x", + new java.math.BigInteger(1, sigBytes))); + generatedSignatures.add(sigBytes); + + } catch (SignatureException se) { + System.out.println("Error generating RSA signature: " + se); + } + } + } + + private static void verifyAllUsing(String providerName, PublicKey publicKey) + throws Exception { + Signature sig1 = Signature.getInstance("NONEwithRSA", providerName); + if (sig1.getProvider() != null) { + System.out.println("\nUsing NONEwithRSA verifier from the " + + sig1.getProvider().getName() + " JCE provider"); + } else { + System.out.println( + "\nUsing NONEwithRSA verifier from the internal JCE provider"); + } + + System.out.println("Using key: " + publicKey); + + int i = 0; + for (byte[] hash : precomputedHashes) { + + byte[] sigBytes = generatedSignatures.get(i++); + System.out.println("\nVerifying RSA Signature over a " + + hash.length + "-byte hash (signature length: " + + sigBytes.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + + (sigBytes.length * 2) + "x", + new java.math.BigInteger(1, sigBytes))); + + sig1.initVerify(publicKey); + sig1.update(hash); + if (sig1.verify(sigBytes)) { + System.out.println("Verify PASSED"); + } else { + throw new Exception("Verify FAILED"); + } + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,83 @@ +#!/bin/sh + +# +# Copyright (c) 2011, 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 6578658 +# @run shell SignUsingNONEwithRSA.sh +# @summary Sign using the NONEwithRSA signature algorithm from SunMSCAPI + +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi + +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi + +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +OS=`uname -s` +case "$OS" in + Windows* | CYGWIN* ) + + echo "Creating a temporary RSA keypair in the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -genkeypair \ + -storetype Windows-My \ + -keyalg RSA \ + -alias 6578658 \ + -dname "cn=6578658,c=US" \ + -noprompt + + echo + echo "Running the test..." + ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingNONEwithRSA.java + ${TESTJAVA}/bin/java SignUsingNONEwithRSA + + rc=$? + + echo + echo "Removing the temporary RSA keypair from the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -delete \ + -storetype Windows-My \ + -alias 6578658 + + echo done. + exit $rc + ;; + + * ) + echo "This test is not intended for '$OS' - passing test" + exit 0 + ;; +esac diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * @see SignUsingSHA2withRSA.sh + */ + +import java.security.*; +import java.util.*; + +public class SignUsingSHA2withRSA { + + private static final byte[] toBeSigned = new byte[] { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10 + }; + + private static List<byte[]> generatedSignatures = new ArrayList<>(); + + public static void main(String[] args) throws Exception { + + Provider[] providers = Security.getProviders("Signature.SHA256withRSA"); + if (providers == null) { + System.out.println("No JCE providers support the " + + "'Signature.SHA256withRSA' algorithm"); + System.out.println("Skipping this test..."); + return; + + } else { + System.out.println("The following JCE providers support the " + + "'Signature.SHA256withRSA' algorithm: "); + for (Provider provider : providers) { + System.out.println(" " + provider.getName()); + } + } + System.out.println("-------------------------------------------------"); + + KeyStore ks = KeyStore.getInstance("Windows-MY", "SunMSCAPI"); + ks.load(null, null); + System.out.println("Loaded keystore: Windows-MY"); + + Enumeration e = ks.aliases(); + PrivateKey privateKey = null; + PublicKey publicKey = null; + + while (e.hasMoreElements()) { + String alias = (String) e.nextElement(); + if (alias.equals("6753664")) { + System.out.println("Loaded entry: " + alias); + privateKey = (PrivateKey) ks.getKey(alias, null); + publicKey = (PublicKey) ks.getCertificate(alias).getPublicKey(); + } + } + if (privateKey == null || publicKey == null) { + throw new Exception("Cannot load the keys need to run this test"); + } + System.out.println("-------------------------------------------------"); + + generatedSignatures.add(signUsing("SHA256withRSA", privateKey)); + generatedSignatures.add(signUsing("SHA384withRSA", privateKey)); + generatedSignatures.add(signUsing("SHA512withRSA", privateKey)); + + System.out.println("-------------------------------------------------"); + + verifyUsing("SHA256withRSA", publicKey, generatedSignatures.get(0)); + verifyUsing("SHA384withRSA", publicKey, generatedSignatures.get(1)); + verifyUsing("SHA512withRSA", publicKey, generatedSignatures.get(2)); + + System.out.println("-------------------------------------------------"); + } + + private static byte[] signUsing(String signAlgorithm, + PrivateKey privateKey) throws Exception { + + // Must explicitly specify the SunMSCAPI JCE provider + // (otherwise SunJCE is chosen because it appears earlier in the list) + Signature sig1 = Signature.getInstance(signAlgorithm, "SunMSCAPI"); + if (sig1 == null) { + throw new Exception("'" + signAlgorithm + "' is not supported"); + } + System.out.println("Using " + signAlgorithm + " signer from the " + + sig1.getProvider().getName() + " JCE provider"); + + System.out.println("Using key: " + privateKey); + sig1.initSign(privateKey); + sig1.update(toBeSigned); + byte [] sigBytes = null; + + try { + sigBytes = sig1.sign(); + System.out.println("Generated RSA signature over a " + + toBeSigned.length + "-byte data (signature length: " + + sigBytes.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + + (sigBytes.length * 2) + "x", + new java.math.BigInteger(1, sigBytes))); + + } catch (SignatureException se) { + System.out.println("Error generating RSA signature: " + se); + } + + return sigBytes; + } + + private static void verifyUsing(String signAlgorithm, PublicKey publicKey, + byte[] signature) throws Exception { + + // Must explicitly specify the SunMSCAPI JCE provider + // (otherwise SunJCE is chosen because it appears earlier in the list) + Signature sig1 = Signature.getInstance(signAlgorithm, "SunMSCAPI"); + if (sig1 == null) { + throw new Exception("'" + signAlgorithm + "' is not supported"); + } + System.out.println("Using " + signAlgorithm + " verifier from the " + + sig1.getProvider().getName() + " JCE provider"); + + System.out.println("Using key: " + publicKey); + + System.out.println("\nVerifying RSA Signature over a " + + toBeSigned.length + "-byte data (signature length: " + + signature.length * 8 + " bits)"); + System.out.println(String.format("0x%0" + (signature.length * 2) + + "x", new java.math.BigInteger(1, signature))); + + sig1.initVerify(publicKey); + sig1.update(toBeSigned); + + if (sig1.verify(signature)) { + System.out.println("Verify PASSED\n"); + } else { + throw new Exception("Verify FAILED"); + } + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,83 @@ +#!/bin/sh + +# +# Copyright (c) 2011, 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 6753664 +# @run shell SignUsingSHA2withRSA.sh +# @summary Support SHA256 (and higher) in SunMSCAPI + +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi + +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi + +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +OS=`uname -s` +case "$OS" in + Windows* | CYGWIN* ) + + echo "Creating a temporary RSA keypair in the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -genkeypair \ + -storetype Windows-My \ + -keyalg RSA \ + -alias 6753664 \ + -dname "cn=6753664,c=US" \ + -noprompt + + echo + echo "Running the test..." + ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java + ${TESTJAVA}/bin/java SignUsingSHA2withRSA + + rc=$? + + echo + echo "Removing the temporary RSA keypair from the Windows-My store..." + ${TESTJAVA}/bin/keytool \ + -delete \ + -storetype Windows-My \ + -alias 6753664 + + echo done. + exit $rc + ;; + + * ) + echo "This test is not intended for '$OS' - passing test" + exit 0 + ;; +esac diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/.hgignore --- a/langtools/.hgignore Wed May 11 16:12:01 2011 -0700 +++ b/langtools/.hgignore Sat May 14 11:52:15 2011 -0700 @@ -1,3 +1,4 @@ ^build/ ^dist/ /nbproject/private/ +^.hgtip diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/.hgtags --- a/langtools/.hgtags Wed May 11 16:12:01 2011 -0700 +++ b/langtools/.hgtags Sat May 14 11:52:15 2011 -0700 @@ -114,3 +114,5 @@ a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 +258e6654aba25aab91c9ba3b4c53d05bc895a86c jdk7-b140 +90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/source/util/Trees.java --- a/langtools/src/share/classes/com/sun/source/util/Trees.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -38,6 +38,7 @@ import javax.tools.Diagnostic; import javax.tools.JavaCompiler.CompilationTask; +import com.sun.source.tree.CatchTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.MethodTree; @@ -207,4 +208,11 @@ public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg, com.sun.source.tree.Tree t, com.sun.source.tree.CompilationUnitTree root); + + /** + * Gets the lub of an exception parameter declared in a catch clause. + * @param tree the tree for the catch clause + * @return The lub of the exception parameter + */ + public abstract TypeMirror getLub(CatchTree tree); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Sat May 14 11:52:15 2011 -0700 @@ -149,11 +149,20 @@ ClassUseMapper mapper = new ClassUseMapper(configuration.root, classtree); ClassDoc[] classes = configuration.root.classes(); for (int i = 0; i < classes.length; i++) { - ClassUseWriter.generate(configuration, mapper, classes[i]); + // If -nodeprecated option is set and the containing package is marked + // as deprecated, do not generate the class-use page. We will still generate + // the class-use page if the class is marked as deprecated but the containing + // package is not since it could still be linked from that package-use page. + if (!(configuration.nodeprecated && + Util.isDeprecated(classes[i].containingPackage()))) + ClassUseWriter.generate(configuration, mapper, classes[i]); } PackageDoc[] pkgs = configuration.packages; for (int i = 0; i < pkgs.length; i++) { - PackageUseWriter.generate(configuration, mapper, pkgs[i]); + // If -nodeprecated option is set and the package is marked + // as deprecated, do not generate the package-use page. + if (!(configuration.nodeprecated && Util.isDeprecated(pkgs[i]))) + PackageUseWriter.generate(configuration, mapper, pkgs[i]); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -31,6 +31,7 @@ import com.sun.javadoc.*; import java.util.*; import java.io.*; +import java.net.*; /** * Configure the output based on the command line options. @@ -48,6 +49,7 @@ * @author Robert Field. * @author Atul Dambalkar. * @author Jamie Ho + * @author Bhavesh Patel (Modified) */ public class ConfigurationImpl extends Configuration { @@ -110,6 +112,11 @@ public String stylesheetfile = ""; /** + * Argument for command line option "-Xdocrootparent". + */ + public String docrootparent = ""; + + /** * True if command line option "-nohelp" is used. Default value is false. */ public boolean nohelp = false; @@ -239,6 +246,8 @@ stylesheetfile = os[1]; } else if (opt.equals("-charset")) { charset = os[1]; + } else if (opt.equals("-xdocrootparent")) { + docrootparent = os[1]; } else if (opt.equals("-nohelp")) { nohelp = true; } else if (opt.equals("-splitindex")) { @@ -322,7 +331,8 @@ option.equals("-helpfile") || option.equals("-stylesheetfile") || option.equals("-charset") || - option.equals("-overview")) { + option.equals("-overview") || + option.equals("-xdocrootparent")) { return 2; } else { return 0; @@ -372,6 +382,13 @@ return false; } nohelp = true; + } else if (opt.equals("-xdocrootparent")) { + try { + new URL(os[1]); + } catch (MalformedURLException e) { + reporter.printError(getText("doclet.MalformedURL", os[1])); + return false; + } } else if (opt.equals("-overview")) { if (nooverview == true) { reporter.printError(getText("doclet.Option_conflict", diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -42,15 +42,15 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private static final String[] ANCHORS = new String[] { - "interface", "class", "enum", "exception", "error", "annotation_type", - "field", "method", "constructor", "enum_constant", + "package", "interface", "class", "enum", "exception", "error", + "annotation_type", "field", "method", "constructor", "enum_constant", "annotation_type_member" }; private static final String[] HEADING_KEYS = new String[] { - "doclet.Deprecated_Interfaces", "doclet.Deprecated_Classes", - "doclet.Deprecated_Enums", "doclet.Deprecated_Exceptions", - "doclet.Deprecated_Errors", + "doclet.Deprecated_Packages", "doclet.Deprecated_Interfaces", + "doclet.Deprecated_Classes", "doclet.Deprecated_Enums", + "doclet.Deprecated_Exceptions", "doclet.Deprecated_Errors", "doclet.Deprecated_Annotation_Types", "doclet.Deprecated_Fields", "doclet.Deprecated_Methods", "doclet.Deprecated_Constructors", @@ -59,9 +59,9 @@ }; private static final String[] SUMMARY_KEYS = new String[] { - "doclet.deprecated_interfaces", "doclet.deprecated_classes", - "doclet.deprecated_enums", "doclet.deprecated_exceptions", - "doclet.deprecated_errors", + "doclet.deprecated_packages", "doclet.deprecated_interfaces", + "doclet.deprecated_classes", "doclet.deprecated_enums", + "doclet.deprecated_exceptions", "doclet.deprecated_errors", "doclet.deprecated_annotation_types", "doclet.deprecated_fields", "doclet.deprecated_methods", "doclet.deprecated_constructors", @@ -70,7 +70,7 @@ }; private static final String[] HEADER_KEYS = new String[] { - "doclet.Interface", "doclet.Class", + "doclet.Package", "doclet.Interface", "doclet.Class", "doclet.Enum", "doclet.Exceptions", "doclet.Errors", "doclet.AnnotationType", @@ -116,7 +116,7 @@ DeprecatedListWriter depr = new DeprecatedListWriter(configuration, filename); depr.generateDeprecatedListFile( - new DeprecatedAPIListBuilder(configuration.root)); + new DeprecatedAPIListBuilder(configuration)); depr.close(); } catch (IOException exc) { configuration.standardmessage.error( @@ -149,8 +149,14 @@ memberTableHeader[0] = configuration.getText("doclet.0_and_1", configuration.getText(HEADER_KEYS[i]), configuration.getText("doclet.Description")); - writers[i].addDeprecatedAPI(deprapi.getList(i), - HEADING_KEYS[i], memberTableSummary, memberTableHeader, div); + // DeprecatedAPIListBuilder.PACKAGE == 0, so if i == 0, it is + // a PackageDoc. + if (i == DeprecatedAPIListBuilder.PACKAGE) + addPackageDeprecatedAPI(deprapi.getList(i), + HEADING_KEYS[i], memberTableSummary, memberTableHeader, div); + else + writers[i - 1].addDeprecatedAPI(deprapi.getList(i), + HEADING_KEYS[i], memberTableSummary, memberTableHeader, div); } } body.addContent(div); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -198,23 +198,27 @@ PackageIndexFrameWriter.generate(configuration); } PackageDoc prev = null, next; - for(int i = 0; i < packages.length; i++) { - PackageFrameWriter.generate(configuration, packages[i]); - next = (i + 1 < packages.length && packages[i+1].name().length() > 0) ? - packages[i+1] : null; - //If the next package is unnamed package, skip 2 ahead if possible - next = (i + 2 < packages.length && next == null) ? - packages[i+2]: next; - AbstractBuilder packageSummaryBuilder = configuration. - getBuilderFactory().getPackageSummaryBuilder( - packages[i], prev, next); - packageSummaryBuilder.build(); - if (configuration.createtree) { - PackageTreeWriter.generate(configuration, - packages[i], prev, next, - configuration.nodeprecated); + for (int i = 0; i < packages.length; i++) { + // if -nodeprecated option is set and the package is marked as + // deprecated, do not generate the package-summary.html, package-frame.html + // and package-tree.html pages for that package. + if (!(configuration.nodeprecated && Util.isDeprecated(packages[i]))) { + PackageFrameWriter.generate(configuration, packages[i]); + next = (i + 1 < packages.length && + packages[i + 1].name().length() > 0) ? packages[i + 1] : null; + //If the next package is unnamed package, skip 2 ahead if possible + next = (i + 2 < packages.length && next == null) ? packages[i + 2] : next; + AbstractBuilder packageSummaryBuilder = + configuration.getBuilderFactory().getPackageSummaryBuilder( + packages[i], prev, next); + packageSummaryBuilder.build(); + if (configuration.createtree) { + PackageTreeWriter.generate(configuration, + packages[i], prev, next, + configuration.nodeprecated); + } + prev = packages[i]; } - prev = packages[i]; } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat May 14 11:52:15 2011 -0700 @@ -159,22 +159,42 @@ StringBuilder buf = new StringBuilder(); int previndex = 0; while (true) { - // Search for lowercase version of {@docRoot} - index = lowerHtml.indexOf("{@docroot}", previndex); - // If next {@docRoot} tag not found, append rest of htmlstr and exit loop - if (index < 0) { - buf.append(htmlstr.substring(previndex)); - break; - } - // If next {@docroot} tag found, append htmlstr up to start of tag - buf.append(htmlstr.substring(previndex, index)); - previndex = index + 10; // length for {@docroot} string - // Insert relative path where {@docRoot} was located - buf.append(relativepathNoSlash); - // Append slash if next character is not a slash - if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() - && htmlstr.charAt(previndex) != '/') { - buf.append(DirectoryManager.URL_FILE_SEPARATOR); + if (configuration.docrootparent.length() > 0) { + // Search for lowercase version of {@docRoot}/.. + index = lowerHtml.indexOf("{@docroot}/..", previndex); + // If next {@docRoot}/.. pattern not found, append rest of htmlstr and exit loop + if (index < 0) { + buf.append(htmlstr.substring(previndex)); + break; + } + // If next {@docroot}/.. pattern found, append htmlstr up to start of tag + buf.append(htmlstr.substring(previndex, index)); + previndex = index + 13; // length for {@docroot}/.. string + // Insert docrootparent absolute path where {@docRoot}/.. was located + + buf.append(configuration.docrootparent); + // Append slash if next character is not a slash + if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') { + buf.append(DirectoryManager.URL_FILE_SEPARATOR); + } + } else { + // Search for lowercase version of {@docRoot} + index = lowerHtml.indexOf("{@docroot}", previndex); + // If next {@docRoot} tag not found, append rest of htmlstr and exit loop + if (index < 0) { + buf.append(htmlstr.substring(previndex)); + break; + } + // If next {@docroot} tag found, append htmlstr up to start of tag + buf.append(htmlstr.substring(previndex, index)); + previndex = index + 10; // length for {@docroot} string + // Insert relative path where {@docRoot} was located + buf.append(relativepathNoSlash); + // Append slash if next character is not a slash + if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() && + htmlstr.charAt(previndex) != '/') { + buf.append(DirectoryManager.URL_FILE_SEPARATOR); + } } } return buf.toString(); @@ -1395,6 +1415,44 @@ } /** + * Add package deprecation information to the documentation tree + * + * @param deprPkgs list of deprecated packages + * @param headingKey the caption for the deprecated package table + * @param tableSummary the summary for the deprecated package table + * @param tableHeader table headers for the deprecated package table + * @param contentTree the content tree to which the deprecated package table will be added + */ + protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey, + String tableSummary, String[] tableHeader, Content contentTree) { + if (deprPkgs.size() > 0) { + Content table = HtmlTree.TABLE(0, 3, 0, tableSummary, + getTableCaption(configuration().getText(headingKey))); + table.addContent(getSummaryTableHeader(tableHeader, "col")); + Content tbody = new HtmlTree(HtmlTag.TBODY); + for (int i = 0; i < deprPkgs.size(); i++) { + PackageDoc pkg = (PackageDoc) deprPkgs.get(i); + HtmlTree td = HtmlTree.TD(HtmlStyle.colOne, + getPackageLink(pkg, getPackageName(pkg))); + if (pkg.tags("deprecated").length > 0) { + addInlineDeprecatedComment(pkg, pkg.tags("deprecated")[0], td); + } + HtmlTree tr = HtmlTree.TR(td); + if (i % 2 == 0) { + tr.addStyle(HtmlStyle.altColor); + } else { + tr.addStyle(HtmlStyle.rowColor); + } + tbody.addContent(tr); + } + table.addContent(tbody); + Content li = HtmlTree.LI(HtmlStyle.blockList, table); + Content ul = HtmlTree.UL(HtmlStyle.blockList, li); + contentTree.addContent(ul); + } + } + + /** * Prine table header information about color, column span and the font. * * @param color Background color. @@ -2120,7 +2178,7 @@ } } text = (isplaintext) ? - refMemName : getCode() + refMemName + getCodeEnd(); + refMemName : getCode() + Util.escapeHtmlChars(refMemName) + getCodeEnd(); result.append(getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing, refMem, (label.length() == 0)? text: label, false)); @@ -2280,6 +2338,7 @@ public String commentTagsToString(Tag holderTag, Doc doc, Tag[] tags, boolean isFirstSentence) { StringBuilder result = new StringBuilder(); + boolean textTagChange = false; // Array of all possible inline tags for this javadoc run configuration.tagletManager.checkTags(doc, tags, true); for (int i = 0; i < tags.length; i++) { @@ -2295,13 +2354,26 @@ result.append(output == null ? "" : output.toString()); if (originalLength == 0 && isFirstSentence && tagelem.name().equals("@inheritDoc") && result.length() > 0) { break; + } else if (configuration.docrootparent.length() > 0 && + tagelem.name().equals("@docRoot") && + ((tags[i + 1]).text()).startsWith("/..")) { + //If Xdocrootparent switch ON, set the flag to remove the /.. occurance after + //{@docRoot} tag in the very next Text tag. + textTagChange = true; + continue; } else { - continue; + continue; } } else { + String text = tagelem.text(); + //If Xdocrootparent switch ON, remove the /.. occurance after {@docRoot} tag. + if (textTagChange) { + text = text.replaceFirst("/..", ""); + textTagChange = false; + } //This is just a regular text tag. The text may contain html links (<a>) //or inline tag {@docRoot}, which will be handled as special cases. - String text = redirectRelativeLinks(tagelem.holder(), tagelem.text()); + text = redirectRelativeLinks(tagelem.holder(), text); // Replace @docRoot only if not represented by an instance of DocRootTaglet, // that is, only if it was not present in a source file doc comment. diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -93,7 +93,7 @@ packgen = new PackageFrameWriter(configuration, packageDoc); String pkgName = Util.getPackageName(packageDoc); Content body = packgen.getBody(false, packgen.getWindowTitle(pkgName)); - Content pkgNameContent = new StringContent(pkgName); + Content pkgNameContent = new RawHtml(pkgName); Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar, packgen.getTargetPackageLink(packageDoc, "classFrame", pkgNameContent)); body.addContent(heading); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -80,7 +80,10 @@ HtmlTree ul = new HtmlTree(HtmlTag.UL); ul.addAttr(HtmlAttr.TITLE, packagesLabel.toString()); for(int i = 0; i < packages.length; i++) { - if (packages[i] != null) { + // Do not list the package if -nodeprecated option is set and the + // package is marked as deprecated. + if (packages[i] != null && + (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))) { ul.addContent(getPackage(packages[i])); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Sat May 14 11:52:15 2011 -0700 @@ -137,6 +137,8 @@ protected void addPackagesList(PackageDoc[] packages, Content tbody) { for (int i = 0; i < packages.length; i++) { if (packages[i] != null && packages[i].name().length() > 0) { + if (configuration.nodeprecated && Util.isDeprecated(packages[i])) + continue; Content packageLinkContent = getPackageLink(packages[i], getPackageName(packages[i])); Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, packageLinkContent); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Sat May 14 11:52:15 2011 -0700 @@ -242,11 +242,16 @@ */ protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException { Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, - getHyperLink("", pkg.name(), new StringContent(Util.getPackageName(pkg)))); + getHyperLink("", Util.getPackageName(pkg), + new RawHtml(Util.getPackageName(pkg)))); contentTree.addContent(tdFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); tdLast.addStyle(HtmlStyle.colLast); - addSummaryComment(pkg, tdLast); + if (pkg != null && pkg.name().length() != 0) { + addSummaryComment(pkg, tdLast); + } else { + tdLast.addContent(getSpace()); + } contentTree.addContent(tdLast); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Sat May 14 11:52:15 2011 -0700 @@ -114,11 +114,12 @@ Content packageHead = new RawHtml(heading); tHeading.addContent(packageHead); div.addContent(tHeading); + addDeprecationInfo(div); if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) { - HtmlTree subTitleDiv = new HtmlTree(HtmlTag.DIV); - subTitleDiv.addStyle(HtmlStyle.subTitle); - addSummaryComment(packageDoc, subTitleDiv); - div.addContent(subTitleDiv); + HtmlTree docSummaryDiv = new HtmlTree(HtmlTag.DIV); + docSummaryDiv.addStyle(HtmlStyle.docSummary); + addSummaryComment(packageDoc, docSummaryDiv); + div.addContent(docSummaryDiv); Content space = getSpace(); Content descLink = getHyperLink("", "package_description", descriptionLabel, "", ""); @@ -139,6 +140,28 @@ } /** + * Add the package deprecation information to the documentation tree. + * + * @param div the content tree to which the deprecation information will be added + */ + public void addDeprecationInfo(Content div) { + Tag[] deprs = packageDoc.tags("deprecated"); + if (Util.isDeprecated(packageDoc)) { + HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); + deprDiv.addStyle(HtmlStyle.deprecatedContent); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase); + deprDiv.addContent(deprPhrase); + if (deprs.length > 0) { + Tag[] commentTags = deprs[0].inlineTags(); + if (commentTags.length > 0) { + addInlineDeprecatedComment(packageDoc, deprs[0], deprDiv); + } + } + div.addContent(deprDiv); + } + } + + /** * {@inheritDoc} */ public Content getSummaryHeader() { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Sat May 14 11:52:15 2011 -0700 @@ -82,12 +82,20 @@ } PackageDoc[] pds = rd.specifiedPackages(); for (int i = 0; i < pds.length; i++) { - convertPackage(configuration, pds[i], outputdir); + // If -nodeprecated option is set and the package is marked as deprecated, + // do not convert the package files to HTML. + if (!(configuration.nodeprecated && Util.isDeprecated(pds[i]))) + convertPackage(configuration, pds[i], outputdir); } ClassDoc[] cds = rd.specifiedClasses(); for (int i = 0; i < cds.length; i++) { - convertClass(configuration, cds[i], - getPackageOutputDir(outputdir, cds[i].containingPackage())); + // If -nodeprecated option is set and the class is marked as deprecated + // or the containing package is deprecated, do not convert the + // package files to HTML. + if (!(configuration.nodeprecated && + (Util.isDeprecated(cds[i]) || Util.isDeprecated(cds[i].containingPackage())))) + convertClass(configuration, cds[i], + getPackageOutputDir(outputdir, cds[i].containingPackage())); } } @@ -106,7 +114,12 @@ String classOutputdir = getPackageOutputDir(outputdir, pd); ClassDoc[] cds = pd.allClasses(); for (int i = 0; i < cds.length; i++) { - convertClass(configuration, cds[i], classOutputdir); + // If -nodeprecated option is set and the class is marked as deprecated, + // do not convert the package files to HTML. We do not check for + // containing package deprecation since it is already check in + // the calling method above. + if (!(configuration.nodeprecated && Util.isDeprecated(cds[i]))) + convertClass(configuration, cds[i], classOutputdir); } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,7 +59,10 @@ * {@inheritDoc} */ public TagletOutput getDocRootOutput() { - return new TagletOutputImpl(htmlWriter.relativepathNoSlash); + if (htmlWriter.configuration.docrootparent.length() > 0) + return new TagletOutputImpl(htmlWriter.configuration.docrootparent); + else + return new TagletOutputImpl(htmlWriter.relativepathNoSlash); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,7 +132,11 @@ HtmlTree ul = new HtmlTree(HtmlTag.UL); ul.addStyle(HtmlStyle.horizontal); for (int i = 0; i < packages.length; i++) { - if (packages[i].name().length() == 0) { + // If the package name length is 0 or if -nodeprecated option + // is set and the package is marked as deprecated, do not include + // the page in the list of package hierarchies. + if (packages[i].name().length() == 0 || + (configuration.nodeprecated && Util.isDeprecated(packages[i]))) { continue; } String link = pathString(packages[i], "package-tree.html"); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, 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 @@ -46,6 +46,7 @@ contentContainer, description, details, + docSummary, header, horizontal, footer, @@ -67,6 +68,7 @@ subNavList, subTitle, summary, + deprecatedContent, tabEnd, title, topNav; diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Sat May 14 11:52:15 2011 -0700 @@ -68,6 +68,7 @@ doclet.see.malformed_tag=Tag {0}: Malformed: {1} doclet.Inherited_API_Summary=Inherited API Summary doclet.Deprecated_API=Deprecated API +doclet.Deprecated_Packages=Deprecated Packages doclet.Deprecated_Classes=Deprecated Classes doclet.Deprecated_Enums=Deprecated Enums doclet.Deprecated_Interfaces=Deprecated Interfaces @@ -79,6 +80,7 @@ doclet.Deprecated_Methods=Deprecated Methods doclet.Deprecated_Enum_Constants=Deprecated Enum Constants doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements +doclet.deprecated_packages=deprecated packages doclet.deprecated_classes=deprecated classes doclet.deprecated_enums=deprecated enums doclet.deprecated_interfaces=deprecated interfaces @@ -245,6 +247,7 @@ -tag <name>:<locations>:<header> Specify single argument custom tags\n\ -taglet The fully qualified name of Taglet to register\n\ -tagletpath The path to Taglets\n\ + -Xdocrootparent <url> Replaces all appearances of @docRoot followed by /.. in doc comments with <url>\n\ -charset <charset> Charset for cross-platform viewing of generated documentation.\n\ -helpfile <file> Include file that help link links to\n\ -linksource Generate source in HTML\n\ diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -11,54 +11,30 @@ doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64 doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64 doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64 -# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc. doclet.Prev=\u524D -# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc. doclet.Next=\u6B21 -# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc. -doclet.Prev_Class=PREV CLASS -# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc. -doclet.Next_Class=NEXT CLASS -# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc. -doclet.Prev_Package=PREV PACKAGE -# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc. -doclet.Next_Package=NEXT PACKAGE -# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index. -doclet.Prev_Letter=PREV LETTER -# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index. -doclet.Next_Letter=NEXT LETTER -# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc. -doclet.Show_Lists=SHOW LISTS -# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc. -doclet.Hide_Lists=HIDE LISTS +doclet.Prev_Class=\u524D\u306E\u30AF\u30E9\u30B9 +doclet.Next_Class=\u6B21\u306E\u30AF\u30E9\u30B9 +doclet.Prev_Package=\u524D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.Next_Package=\u6B21\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 +doclet.Prev_Letter=\u524D\u306E\u6587\u5B57 +doclet.Next_Letter=\u6B21\u306E\u6587\u5B57 doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9 doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8 doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary. -doclet.Summary=SUMMARY: -# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail. -doclet.Detail=DETAIL: -# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc. -doclet.navNested=NESTED -# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc. -doclet.navAnnotationTypeOptionalMember=OPTIONAL -# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeRequiredMember=REQUIRED -# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeMember=ELEMENT -# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc. -doclet.navField=FIELD -# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc. -doclet.navEnum=ENUM CONSTANTS -# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc. -doclet.navConstructor=CONSTR -# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc. -doclet.navMethod=METHOD -# The following resource does not seem to be used anymore. -doclet.navFactoryMethod=FACTORY +doclet.Summary=\u6982\u8981: +doclet.Detail=\u8A73\u7D30: +doclet.navNested=\u30CD\u30B9\u30C8 +doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3 +doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808 +doclet.navAnnotationTypeMember=\u8981\u7D20 +doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9 +doclet.navEnum=\u5217\u6319\u5B9A\u6570 +doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF +doclet.navMethod=\u30E1\u30BD\u30C3\u30C9 doclet.Index=\u7D22\u5F15 doclet.Window_Single_Index=\u7D22\u5F15 doclet.Window_Split_Index={0}\u306E\u7D22\u5F15 @@ -66,12 +42,6 @@ doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7 doclet.New_Page=NewPage doclet.None=\u306A\u3057 -# The following resource does not seem to be used anymore -doclet.CLASSES=CLASSES -# The following resource does not seem to be used anymore -doclet.MEMBERS=MEMBERS -# The following resource does not seem to be used anymore -doclet.NONE=\u306A\u3057 doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30 doclet.navDeprecated=\u975E\u63A8\u5968 doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8 @@ -136,10 +106,7 @@ doclet.Option=\u30AA\u30D7\u30B7\u30E7\u30F3 doclet.Or=\u307E\u305F\u306F doclet.Frames=\u30D5\u30EC\u30FC\u30E0 -# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames. -doclet.FRAMES=FRAMES -# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames. -doclet.NO_FRAMES=NO FRAMES +doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057 doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64: doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64 doclet.Source_Code=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9: @@ -147,11 +114,10 @@ doclet.Cannot_handle_no_packages=\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002 doclet.Frame_Alert=\u30D5\u30EC\u30FC\u30E0\u95A2\u9023\u306E\u30A2\u30E9\u30FC\u30C8 doclet.Overview-Member-Frame=\u6982\u8981\u30E1\u30F3\u30D0\u30FC\u30FB\u30D5\u30EC\u30FC\u30E0 -doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 +doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002{0}\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059\u3002 doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002 -doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3002 +doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30F3 doclet.Frame_Version=\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3 -doclet.Link_To=\u30EA\u30F3\u30AF\u5148 doclet.Following_From_Class=\u30AF\u30E9\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0: doclet.Following_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0: doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E: @@ -167,7 +133,7 @@ doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210 doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002 -doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F4\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A @@ -190,16 +156,16 @@ doclet.Help_line_24=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306B\u3088\u308A\u3001\u524D\u307E\u305F\u306F\u6B21\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u95A2\u9023\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\u3067\u304D\u307E\u3059\u3002 doclet.Help_line_25=\u30D5\u30EC\u30FC\u30E0/\u30D5\u30EC\u30FC\u30E0\u306A\u3057 doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002 -doclet.Help_line_27=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002 -doclet.Help_line_28=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002 -doclet.Help_line_29=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002 +doclet.Help_line_29=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002 +doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059: doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00 doclet.Help_enum_line_3=\u5217\u6319\u578B\u306E\u8AAC\u660E doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059: doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00 doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E -doclet.The=The doclet.Style_line_1=javadoc\u30B9\u30BF\u30A4\u30EB\u30FB\u30B7\u30FC\u30C8 doclet.Style_line_2=\u8272\u3084\u30D5\u30A9\u30F3\u30C8\u306A\u3069\u306E\u30B9\u30BF\u30A4\u30EB\u5C5E\u6027\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306F\u3001\u3053\u3053\u3067\u5B9A\u7FA9\u3057\u307E\u3059 doclet.Style_line_3=\u30DA\u30FC\u30B8\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u8272 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -11,54 +11,30 @@ doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784 doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784 doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784 -# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc. doclet.Prev=\u4E0A\u4E00\u4E2A -# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc. doclet.Next=\u4E0B\u4E00\u4E2A -# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc. -doclet.Prev_Class=PREV CLASS -# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc. -doclet.Next_Class=NEXT CLASS -# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc. -doclet.Prev_Package=PREV PACKAGE -# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc. -doclet.Next_Package=NEXT PACKAGE -# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index. -doclet.Prev_Letter=PREV LETTER -# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index. -doclet.Next_Letter=NEXT LETTER -# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc. -doclet.Show_Lists=SHOW LISTS -# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc. -doclet.Hide_Lists=HIDE LISTS +doclet.Prev_Class=\u4E0A\u4E00\u4E2A\u7C7B +doclet.Next_Class=\u4E0B\u4E00\u4E2A\u7C7B +doclet.Prev_Package=\u4E0A\u4E00\u4E2A\u7A0B\u5E8F\u5305 +doclet.Next_Package=\u4E0B\u4E00\u4E2A\u7A0B\u5E8F\u5305 +doclet.Prev_Letter=\u4E0A\u4E00\u4E2A\u5B57\u6BCD +doclet.Next_Letter=\u4E0B\u4E00\u4E2A\u5B57\u6BCD doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3 doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570 doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3 -# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary. -doclet.Summary=SUMMARY: -# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail. -doclet.Detail=DETAIL: -# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc. -doclet.navNested=NESTED -# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc. -doclet.navAnnotationTypeOptionalMember=OPTIONAL -# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeRequiredMember=REQUIRED -# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc. -doclet.navAnnotationTypeMember=ELEMENT -# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc. -doclet.navField=FIELD -# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc. -doclet.navEnum=ENUM CONSTANTS -# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc. -doclet.navConstructor=CONSTR -# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc. -doclet.navMethod=METHOD -# The following resource does not seem to be used anymore. -doclet.navFactoryMethod=FACTORY +doclet.Summary=\u6982\u8981: +doclet.Detail=\u8BE6\u7EC6\u8D44\u6599: +doclet.navNested=\u5D4C\u5957 +doclet.navAnnotationTypeOptionalMember=\u53EF\u9009 +doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700 +doclet.navAnnotationTypeMember=\u5143\u7D20 +doclet.navField=\u5B57\u6BB5 +doclet.navEnum=\u679A\u4E3E\u5E38\u91CF +doclet.navConstructor=\u6784\u9020\u5668 +doclet.navMethod=\u65B9\u6CD5 doclet.Index=\u7D22\u5F15 doclet.Window_Single_Index=\u7D22\u5F15 doclet.Window_Split_Index={0} - \u7D22\u5F15 @@ -66,12 +42,6 @@ doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5 doclet.New_Page=NewPage doclet.None=\u65E0 -# The following resource does not seem to be used anymore -doclet.CLASSES=CLASSES -# The following resource does not seem to be used anymore -doclet.MEMBERS=MEMBERS -# The following resource does not seem to be used anymore -doclet.NONE=\u65E0 doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599 doclet.navDeprecated=\u5DF2\u8FC7\u65F6 doclet.Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868 @@ -136,10 +106,7 @@ doclet.Option=\u9009\u9879 doclet.Or=\u6216 doclet.Frames=\u6846\u67B6 -# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames. -doclet.FRAMES=FRAMES -# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames. -doclet.NO_FRAMES=NO FRAMES +doclet.No_Frames=\u65E0\u6846\u67B6 doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784: doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784 doclet.Source_Code=\u6E90\u4EE3\u7801: @@ -147,11 +114,10 @@ doclet.Cannot_handle_no_packages=\u65E0\u6CD5\u5904\u7406\u6CA1\u6709\u7A0B\u5E8F\u5305\u7684\u60C5\u51B5\u3002 doclet.Frame_Alert=\u6846\u67B6\u9884\u8B66 doclet.Overview-Member-Frame=\u6210\u5458\u6846\u67B6\u6982\u89C8 -doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002 +doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002\u94FE\u63A5\u5230{0}\u3002 doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002 -doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C\u3002 +doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C doclet.Frame_Version=\u6846\u67B6\u7248\u672C -doclet.Link_To=\u94FE\u63A5\u5230 doclet.Following_From_Class=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u7C7B{0}\u590D\u5236\u7684 doclet.Following_From_Interface=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u63A5\u53E3{0}\u590D\u5236\u7684 doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E: @@ -167,7 +133,7 @@ doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002 doclet.Help_line_3={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002 -doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u56DB\u4E2A\u7C7B\u522B: +doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B: doclet.Help_line_5=\u7C7B/\u63A5\u53E3 doclet.Help_line_6=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210: doclet.Help_line_7=\u7C7B\u7EE7\u627F\u56FE @@ -190,16 +156,16 @@ doclet.Help_line_24=\u8FD9\u4E9B\u94FE\u63A5\u4F7F\u60A8\u53EF\u4EE5\u8F6C\u81F3\u4E0B\u4E00\u4E2A\u6216\u4E0A\u4E00\u4E2A\u7C7B, \u63A5\u53E3, \u7A0B\u5E8F\u5305\u6216\u76F8\u5173\u9875\u9762\u3002 doclet.Help_line_25=\u6846\u67B6/\u65E0\u6846\u67B6 doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002 -doclet.Help_line_27=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002 -doclet.Help_line_28=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002 -doclet.Help_line_29=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002 +doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002 +doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002 +doclet.Help_line_29=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002 +doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002 doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206: doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E doclet.Help_enum_line_3=\u679A\u4E3E\u8BF4\u660E doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206: doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E -doclet.The=\u8BE5 doclet.Style_line_1=Javadoc \u6837\u5F0F\u8868 doclet.Style_line_2=\u5728\u6B64\u5904\u5B9A\u4E49\u989C\u8272, \u5B57\u4F53\u548C\u5176\u4ED6\u6837\u5F0F\u5C5E\u6027\u4EE5\u8986\u76D6\u9ED8\u8BA4\u503C doclet.Style_line_3=\u9875\u9762\u80CC\u666F\u989C\u8272 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, 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 @@ -419,7 +419,7 @@ docencoding = encoding; } - classDocCatalog = new ClassDocCatalog(root.specifiedClasses()); + classDocCatalog = new ClassDocCatalog(root.specifiedClasses(), this); initTagletManager(customTagStrs); } @@ -677,15 +677,18 @@ } /** - * Return true if the doc element is getting documented, depending upon - * -nodeprecated option and @deprecated tag used. Return true if - * -nodeprecated is not used or @deprecated tag is not used. + * Return true if the ClassDoc element is getting documented, depending upon + * -nodeprecated option and the deprecation information. Return true if + * -nodeprecated is not used. Return false if -nodeprecated is used and if + * either ClassDoc element is deprecated or the containing package is deprecated. + * + * @param cd the ClassDoc for which the page generation is checked */ - public boolean isGeneratedDoc(Doc doc) { + public boolean isGeneratedDoc(ClassDoc cd) { if (!nodeprecated) { return true; } - return (doc.tags("deprecated")).length == 0; + return !(Util.isDeprecated(cd) || Util.isDeprecated(cd.containingPackage())); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Sat May 14 11:52:15 2011 -0700 @@ -2,17 +2,10 @@ /* Overall document style */ -* { - margin:0; - padding:0; -} body { font-family:Helvetica, Arial, sans-serif; color:#000000; } -p { - margin:20px 0; -} pre { font-size:1.0em; } @@ -30,35 +23,18 @@ } ul { margin:10px 0 10px 20px; -} -li { - list-style:disc; -} -dl dt { - font-size:0.95em; - font-weight:bold; - margin:10px 0 0 0; -} -dl dd { - margin:10px 0 10px 20px; -} -dl dd ul { - margin-left:0; -} -dl dd ul li { - list-style:none; - margin:10px 0 10px 0; + list-style-type:disc; } caption { background: #CCCCFF; color:#000000; - text-align: left; - font-size: 150%; - font-weight: bold; - border-left: 2px ridge; - border-right: 2px ridge; - border-top: 2px ridge; - padding-left: 5px; + text-align:left; + font-size:150%; + font-weight:bold; + border-left:2px ridge; + border-right:2px ridge; + border-top:2px ridge; + padding-left:5px; width:auto; } /* @@ -70,11 +46,11 @@ color:#000000; } .legalCopy { - margin:7px; + margin:7px 0; } .bar { font-size:1em; - margin:10px 0 0 10px; + margin:10px 0 0 2px; } .bar a { font-weight:normal; @@ -84,24 +60,21 @@ */ .topNav { border-top:2px solid #C0C0C0; - margin:7px; padding:7px 0; height:2.8em; - width:99%; + width:100%; min-width:600px; } .bottomNav { border-top:2px solid #C0C0C0; - margin:7px; padding:7px 0; height:2.8em; - width:99%; + width:100%; } .subNav { border-bottom:2px solid #C0C0C0; float:left; - width:99%; - margin:7px; + width:100%; min-width:600px; } .subNav div { @@ -120,7 +93,7 @@ /* Navigation bar list styles */ .topNav ul.navList, .bottomNav ul.navList { background-color:#EEEEFF; - padding:7px 5px; + padding:4px 4px; margin:0; float:left; width:80%; @@ -128,7 +101,7 @@ ul.navList li{ list-style:none; float:left; - padding:3px 4px; + padding:0 4px; color:#000000; font-size:0.98em; } @@ -142,14 +115,16 @@ .subNav ul.navList { float:left; margin:0; + padding:0; font-size:0.8em; width:350px; } ul.subNavList { float:left; - margin:0; font-size:0.8em; width:350px; + margin:0; + padding:0; } ul.subNavList li{ list-style:none; @@ -161,16 +136,16 @@ */ .header, .footer { clear:both; - margin:0 7px; + padding:10px 0; } .indexHeader { font-size:0.9em; - margin:10px 0 7px 10px; + margin:10px 0 0 2px; } .header ul { padding-left:20px; } -/* Header and footer title styles */ +/* Header and footer title styles */ .header h1.title { font-size:1.4em; text-align:center; @@ -181,7 +156,16 @@ margin:0; } .subTitle { + padding-top:10px; +} +/* +Content styles +*/ +.deprecatedContent { margin:0; + padding:10px 0; +} +.docSummary { padding-top:10px; } /* @@ -190,11 +174,11 @@ .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { clear:both; - padding:10px 10px; position:relative; + padding-bottom:20px; } .indexContainer { - padding:0 0 10px 10px; + padding:0 0 0 2px; font-size:0.9em; } /* @@ -221,7 +205,8 @@ .indexContainer h2 { font-weight:normal; font-size:1.0em; - padding:10px 0 0 0; + padding:5px 0 0 0; + margin:10px 0 0 0; } .contentContainer h2 { margin:10px 0; @@ -263,7 +248,7 @@ background:#CCCCFF; border:0; border:2px ridge; - padding-left:5px; + margin:0; } div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 { background:#EEEEFF; @@ -274,23 +259,22 @@ div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { font-size:1.15em; font-weight:bold; - padding:0 0 10px 0; + padding:0 0 5px 0; + margin:0; } /* Table styles */ .contentContainer table { - border-collapse: collapse ; + border-collapse:collapse ; width:100%; } .contentContainer table td, .contentContainer table th { border:2px ridge; - padding:3px; } /* Constant values page table styles */ .constantValuesContainer table { - border-collapse: collapse ; - margin:0 0 10px 0; + border-collapse:collapse; } .constantValuesContainer table caption{ font-size:0.95em; @@ -303,12 +287,9 @@ } /* Class-use/Package-use page table styles */ .classUseContainer table { - border-collapse: collapse ; + border-collapse:collapse ; width:100%; - margin:0 0 15px 0; -} -.classUseContainer ul li ul li table { - margin-bottom:30px; + margin:0 0 10px 0; } .classUseContainer ul li ul li table caption{ font-size:0.95em; @@ -365,6 +346,7 @@ /* Container specific list styles */ .indexContainer ul { margin:0; + padding:0; } .indexContainer ul li { list-style:none; @@ -376,6 +358,7 @@ list-style:none; border:0; border-bottom:2px ridge; + height:1%; } .serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast { list-style:none; @@ -395,6 +378,7 @@ div.details ul.blockList ul.blockList ul.blockList li.blockList { border:0; border-bottom:2px ridge; + height:1%; } /* Definition list styles */ ul.blockList li.blockList dl{ @@ -413,9 +397,17 @@ ul.blockList li.blockList pre{ margin:0 0 15px 0; } +.description dl dt { + font-size:0.95em; + font-weight:bold; + margin:5px 0 0 0; +} +.description dl dd { + margin:10px 0 10px 20px; +} /* List content styles */ ul.blockList li.blockList ul.blockList li.blockList pre{ - margin:10px 0 15px 0; + margin:10px 0 10px 0; } ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre, ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{ diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,13 +47,6 @@ /** * {@inheritDoc} */ - public boolean inPackage() { - return false; - } - - /** - * {@inheritDoc} - */ public TagletOutput getTagletOutput(Doc holder, TagletWriter writer) { return writer.deprecatedTagOutput(holder); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2011, 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 @@ -25,8 +25,9 @@ package com.sun.tools.doclets.internal.toolkit.util; +import java.util.*; import com.sun.javadoc.*; -import java.util.*; +import com.sun.tools.doclets.internal.toolkit.Configuration; /** * This class acts as an artificial PackageDoc for classes specified @@ -88,13 +89,16 @@ */ private Map<String,Set<ClassDoc>> interfaces; + private Configuration configuration; + /** * Construct a new ClassDocCatalog. * * @param classdocs the array of ClassDocs to catalog */ - public ClassDocCatalog (ClassDoc[] classdocs) { + public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) { init(); + this.configuration = config; for (int i = 0; i < classdocs.length; i++) { addClassDoc(classdocs[i]); } @@ -151,9 +155,10 @@ private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) { PackageDoc pkg = classdoc.containingPackage(); - if (pkg.isIncluded()) { - //No need to catalog this class since it's package is - //included on the command line + if (pkg.isIncluded() || (configuration.nodeprecated && Util.isDeprecated(pkg))) { + //No need to catalog this class if it's package is + //included on the command line or if -nodeprecated option is set + // and the containing package is marked as deprecated. return; } String key = Util.getPackageName(pkg); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -122,8 +122,12 @@ */ private void buildTree(ClassDoc[] classes, Configuration configuration) { for (int i = 0; i < classes.length; i++) { + // In the tree page (e.g overview-tree.html) do not include + // information of classes which are deprecated or are a part of a + // deprecated package. if (configuration.nodeprecated && - classes[i].tags("deprecated").length > 0) { + (Util.isDeprecated(classes[i]) || + Util.isDeprecated(classes[i].containingPackage()))) { continue; } if (classes[i].isEnum()) { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,27 +27,29 @@ import com.sun.javadoc.*; import java.util.*; +import com.sun.tools.doclets.internal.toolkit.Configuration; /** - * Build list of all the deprecated classes, constructors, fields and methods. + * Build list of all the deprecated packages, classes, constructors, fields and methods. * * @author Atul M Dambalkar */ public class DeprecatedAPIListBuilder { - public static final int NUM_TYPES = 11; + public static final int NUM_TYPES = 12; - public static final int INTERFACE = 0; - public static final int CLASS = 1; - public static final int ENUM = 2; - public static final int EXCEPTION = 3; - public static final int ERROR = 4; - public static final int ANNOTATION_TYPE = 5; - public static final int FIELD = 6; - public static final int METHOD = 7; - public static final int CONSTRUCTOR = 8; - public static final int ENUM_CONSTANT = 9; - public static final int ANNOTATION_TYPE_MEMBER = 10; + public static final int PACKAGE = 0; + public static final int INTERFACE = 1; + public static final int CLASS = 2; + public static final int ENUM = 3; + public static final int EXCEPTION = 4; + public static final int ERROR = 5; + public static final int ANNOTATION_TYPE = 6; + public static final int FIELD = 7; + public static final int METHOD = 8; + public static final int CONSTRUCTOR = 9; + public static final int ENUM_CONSTANT = 10; + public static final int ANNOTATION_TYPE_MEMBER = 11; /** * List of deprecated type Lists. @@ -58,25 +60,33 @@ /** * Constructor. * - * @param root Root of the tree. + * @param configuration the current configuration of the doclet */ - public DeprecatedAPIListBuilder(RootDoc root) { + public DeprecatedAPIListBuilder(Configuration configuration) { deprecatedLists = new ArrayList<List<Doc>>(); for (int i = 0; i < NUM_TYPES; i++) { deprecatedLists.add(i, new ArrayList<Doc>()); } - buildDeprecatedAPIInfo(root); + buildDeprecatedAPIInfo(configuration); } /** * Build the sorted list of all the deprecated APIs in this run. - * Build separate lists for deprecated classes, constructors, methods and - * fields. + * Build separate lists for deprecated packages, classes, constructors, + * methods and fields. * - * @param root Root of the tree. + * @param configuration the current configuration of the doclet. */ - private void buildDeprecatedAPIInfo(RootDoc root) { - ClassDoc[] classes = root.classes(); + private void buildDeprecatedAPIInfo(Configuration configuration) { + PackageDoc[] packages = configuration.packages; + PackageDoc pkg; + for (int c = 0; c < packages.length; c++) { + pkg = packages[c]; + if (Util.isDeprecated(pkg)) { + getList(PACKAGE).add(pkg); + } + } + ClassDoc[] classes = configuration.root.classes(); for (int i = 0; i < classes.length; i++) { ClassDoc cd = classes[i]; if (Util.isDeprecated(cd)) { @@ -90,7 +100,7 @@ getList(ENUM).add(cd); } else if (cd.isError()) { getList(ERROR).add(cd); - }else if (cd.isAnnotationType()) { + } else if (cd.isAnnotationType()) { getList(ANNOTATION_TYPE).add(cd); } } @@ -102,7 +112,7 @@ } if (cd.isAnnotationType()) { composeDeprecatedList(getList(ANNOTATION_TYPE_MEMBER), - ((AnnotationTypeDoc) cd).elements()); + ((AnnotationTypeDoc) cd).elements()); } } sortDeprecatedLists(); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -207,7 +207,17 @@ * Should this doc element be added to the index map? */ protected boolean shouldAddToIndexMap(Doc element) { - return !(noDeprecated && element.tags("deprecated").length > 0); + if (element instanceof PackageDoc) + // Do not add to index map if -nodeprecated option is set and the + // package is marked as deprecated. + return !(noDeprecated && Util.isDeprecated(element)); + else + // Do not add to index map if -nodeprecated option is set and if the + // Doc is marked as deprecated or the containing package is marked as + // deprecated. + return !(noDeprecated && + (Util.isDeprecated(element) || + Util.isDeprecated(((ProgramElementDoc)element).containingPackage()))); } /** diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 @@ -76,13 +76,16 @@ protected void generatePackageListFile(RootDoc root) { PackageDoc[] packages = configuration.packages; - String[] names = new String[packages.length]; + ArrayList<String> names = new ArrayList<String>(); for (int i = 0; i < packages.length; i++) { - names[i] = packages[i].name(); + // if the -nodeprecated option is set and the package is marked as + // deprecated, do not include it in the packages list. + if (!(configuration.nodeprecated && Util.isDeprecated(packages[i]))) + names.add(packages[i].name()); } - Arrays.sort(names); - for (int i = 0; i < packages.length; i++) { - println(names[i]); + Collections.sort(names); + for (int i = 0; i < names.size(); i++) { + println(names.get(i)); } } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Sat May 14 11:52:15 2011 -0700 @@ -861,11 +861,15 @@ * @param doc the Doc to check. * @return true if the given Doc is deprecated. */ - public static boolean isDeprecated(ProgramElementDoc doc) { + public static boolean isDeprecated(Doc doc) { if (doc.tags("deprecated").length > 0) { return true; } - AnnotationDesc[] annotationDescList = doc.annotations(); + AnnotationDesc[] annotationDescList; + if (doc instanceof PackageDoc) + annotationDescList = ((PackageDoc)doc).annotations(); + else + annotationDescList = ((ProgramElementDoc)doc).annotations(); for (int i = 0; i < annotationDescList.length; i++) { if (annotationDescList[i].annotationType().qualifiedName().equals( java.lang.Deprecated.class.getName())){ diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java --- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, 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 @@ -34,11 +34,13 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; +import com.sun.source.tree.CatchTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Scope; import com.sun.source.tree.Tree; @@ -49,7 +51,7 @@ import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Symbol.TypeSymbol; import com.sun.tools.javac.code.Symbol; -import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Type.UnionClassType; import com.sun.tools.javac.comp.Attr; import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.Enter; @@ -430,4 +432,16 @@ log.useSource(oldSource); } } + + @Override + public TypeMirror getLub(CatchTree tree) { + JCCatch ct = (JCCatch) tree; + JCVariableDecl v = ct.param; + if (v.type != null && v.type.getKind() == TypeKind.UNION) { + UnionClassType ut = (UnionClassType) v.type; + return ut.getLub(); + } else { + return v.type; + } + } } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Scope.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Sat May 14 11:52:15 2011 -0700 @@ -649,7 +649,7 @@ public Iterator<Symbol> iterator() { return new CompoundScopeIterator(subScopes) { Iterator<Symbol> nextIterator(Scope s) { - return s.getElements().iterator(); + return s.getElements(sf).iterator(); } }; } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Source.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Sat May 14 11:52:15 2011 -0700 @@ -186,6 +186,9 @@ public boolean allowSimplifiedVarargs() { return compareTo(JDK1_7) >= 0; } + public boolean allowObjectToPrimitiveCast() { + return compareTo(JDK1_7) >= 0; + } public static SourceVersion toSourceVersion(Source source) { switch(source) { case JDK1_2: diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Type.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Sat May 14 11:52:15 2011 -0700 @@ -25,6 +25,8 @@ package com.sun.tools.javac.code; +import java.util.Collections; + import com.sun.tools.javac.util.*; import com.sun.tools.javac.code.Symbol.*; @@ -741,6 +743,38 @@ } } + // a clone of a ClassType that knows about the alternatives of a union type. + public static class UnionClassType extends ClassType implements UnionType { + final List<? extends Type> alternatives_field; + + public UnionClassType(ClassType ct, List<? extends Type> alternatives) { + super(ct.outer_field, ct.typarams_field, ct.tsym); + allparams_field = ct.allparams_field; + supertype_field = ct.supertype_field; + interfaces_field = ct.interfaces_field; + all_interfaces_field = ct.interfaces_field; + alternatives_field = alternatives; + } + + public Type getLub() { + return tsym.type; + } + + public java.util.List<? extends TypeMirror> getAlternatives() { + return Collections.unmodifiableList(alternatives_field); + } + + @Override + public TypeKind getKind() { + return TypeKind.UNION; + } + + @Override + public <R, P> R accept(TypeVisitor<R, P> v, P p) { + return v.visitUnion(this, p); + } + } + public static class ArrayType extends Type implements javax.lang.model.type.ArrayType { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/code/Types.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Sat May 14 11:52:15 2011 -0700 @@ -74,8 +74,9 @@ final JavacMessages messages; final Names names; final boolean allowBoxing; + final boolean allowCovariantReturns; + final boolean allowObjectToPrimitiveCast; final ClassReader reader; - final Source source; final Check chk; List<Warner> warnStack = List.nil(); final Name capturedName; @@ -92,9 +93,11 @@ context.put(typesKey, this); syms = Symtab.instance(context); names = Names.instance(context); - allowBoxing = Source.instance(context).allowBoxing(); + Source source = Source.instance(context); + allowBoxing = source.allowBoxing(); + allowCovariantReturns = source.allowCovariantReturns(); + allowObjectToPrimitiveCast = source.allowObjectToPrimitiveCast(); reader = ClassReader.instance(context); - source = Source.instance(context); chk = Check.instance(context); capturedName = names.fromString("<captured wildcard>"); messages = JavacMessages.instance(context); @@ -409,6 +412,7 @@ return s.tag == BOT || s.tag == CLASS || s.tag == ARRAY || s.tag == TYPEVAR; + case WILDCARD: //we shouldn't be here - avoids crash (see 7034495) case NONE: return false; default: @@ -949,8 +953,9 @@ return true; if (t.isPrimitive() != s.isPrimitive()) - return allowBoxing && (isConvertible(t, s, warn) || isConvertible(s, t, warn)); - + return allowBoxing && ( + isConvertible(t, s, warn) + || (allowObjectToPrimitiveCast && isConvertible(s, t, warn))); if (warn != warnStack.head) { try { warnStack = warnStack.prepend(warn); @@ -2309,7 +2314,7 @@ if (elemtype == t.elemtype) return t; else - return new ArrayType(elemtype, t.tsym); + return new ArrayType(upperBound(elemtype), t.tsym); } @Override @@ -3070,7 +3075,7 @@ if (hasSameArgs(r1, r2)) return covariantReturnType(r1.getReturnType(), r2res, warner); - if (!source.allowCovariantReturns()) + if (!allowCovariantReturns) return false; if (isSubtypeUnchecked(r1.getReturnType(), r2res, warner)) return true; @@ -3087,7 +3092,7 @@ public boolean covariantReturnType(Type t, Type s, Warner warner) { return isSameType(t, s) || - source.allowCovariantReturns() && + allowCovariantReturns && !t.isPrimitive() && !s.isPrimitive() && isAssignable(t, s, warner); @@ -3293,7 +3298,7 @@ } if (giveWarning && !isReifiable(reverse ? from : to)) warn.warn(LintCategory.UNCHECKED); - if (!source.allowCovariantReturns()) + if (!allowCovariantReturns) // reject if there is a common method signature with // incompatible return types. chk.checkCompatibleAbstracts(warn.pos(), from, to); @@ -3320,7 +3325,7 @@ Type t2 = to; if (disjointTypes(t1.getTypeArguments(), t2.getTypeArguments())) return false; - if (!source.allowCovariantReturns()) + if (!allowCovariantReturns) // reject if there is a common method signature with // incompatible return types. chk.checkCompatibleAbstracts(warn.pos(), from, to); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Sat May 14 11:52:15 2011 -0700 @@ -168,11 +168,11 @@ } JCIdent left = (JCIdent)assign.lhs; Symbol method = rs.resolveQualifiedMethod(left.pos(), - env, - a.type, - left.name, - List.<Type>nil(), - null); + env, + a.type, + left.name, + List.<Type>nil(), + null); left.sym = method; left.type = method.type; if (method.owner != a.type.tsym) @@ -190,6 +190,15 @@ Attribute enterAttributeValue(Type expected, JCExpression tree, Env<AttrContext> env) { + //first, try completing the attribution value sym - if a completion + //error is thrown, we should recover gracefully, and display an + //ordinary resolution diagnostic. + try { + expected.tsym.complete(); + } catch(CompletionFailure e) { + log.error(tree.pos(), "cant.resolve", Kinds.kindName(e.sym), e.sym); + return new Attribute.Error(expected); + } if (expected.isPrimitive() || types.isSameType(expected, syms.stringType)) { Type result = attr.attribExpr(tree, env, expected); if (result.isErroneous()) diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Sat May 14 11:52:15 2011 -0700 @@ -2910,6 +2910,7 @@ public void visitTypeUnion(JCTypeUnion tree) { ListBuffer<Type> multicatchTypes = ListBuffer.lb(); + ListBuffer<Type> all_multicatchTypes = null; // lazy, only if needed for (JCExpression typeTree : tree.alternatives) { Type ctype = attribType(typeTree, env); ctype = chk.checkType(typeTree.pos(), @@ -2931,9 +2932,23 @@ } } multicatchTypes.append(ctype); + if (all_multicatchTypes != null) + all_multicatchTypes.append(ctype); + } else { + if (all_multicatchTypes == null) { + all_multicatchTypes = ListBuffer.lb(); + all_multicatchTypes.appendList(multicatchTypes); + } + all_multicatchTypes.append(ctype); } } - tree.type = result = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt); + Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt); + if (t.tag == CLASS) { + List<Type> alternatives = + ((all_multicatchTypes == null) ? multicatchTypes : all_multicatchTypes).toList(); + t = new UnionClassType((ClassType) t, alternatives); + } + tree.type = result = t; } public void visitTypeParameter(JCTypeParameter tree) { diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Check.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Sat May 14 11:52:15 2011 -0700 @@ -681,6 +681,12 @@ "cant.apply.diamond.1", t, diags.fragment("diamond.non.generic", t)); return types.createErrorType(t); + } else if (tree.typeargs != null && + tree.typeargs.nonEmpty()) { + log.error(tree.clazz.pos(), + "cant.apply.diamond.1", + t, diags.fragment("diamond.and.explicit.params", t)); + return types.createErrorType(t); } else { return t; } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Sat May 14 11:52:15 2011 -0700 @@ -1153,8 +1153,7 @@ if (chk.subset(exc, caughtInTry)) { log.error(pos, "except.already.caught", exc); } else if (!chk.isUnchecked(pos, exc) && - exc.tsym != syms.throwableType.tsym && - exc.tsym != syms.exceptionType.tsym && + !isExceptionOrThrowable(exc) && !chk.intersects(exc, thrownInTry)) { log.error(pos, "except.never.thrown.in.try", exc); } else if (allowImprovedCatchAnalysis) { @@ -1163,7 +1162,8 @@ // unchecked exception, the result list would not be empty, as the augmented // thrown set includes { RuntimeException, Error }; if 'exc' was a checked // exception, that would have been covered in the branch above - if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty()) { + if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty() && + !isExceptionOrThrowable(exc)) { String key = catchableThrownTypes.length() == 1 ? "unreachable.catch" : "unreachable.catch.1"; @@ -1171,6 +1171,12 @@ } } } + //where + private boolean isExceptionOrThrowable(Type exc) { + return exc.tsym == syms.throwableType.tsym || + exc.tsym == syms.exceptionType.tsym; + } + public void visitConditional(JCConditional tree) { scanCond(tree.cond); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Sat May 14 11:52:15 2011 -0700 @@ -1609,18 +1609,31 @@ // type.tsym.flatName() should == proxy.enumFlatName TypeSymbol enumTypeSym = proxy.enumType.tsym; VarSymbol enumerator = null; - for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator); - e.scope != null; - e = e.next()) { - if (e.sym.kind == VAR) { - enumerator = (VarSymbol)e.sym; - break; + CompletionFailure failure = null; + try { + for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator); + e.scope != null; + e = e.next()) { + if (e.sym.kind == VAR) { + enumerator = (VarSymbol)e.sym; + break; + } } } + catch (CompletionFailure ex) { + failure = ex; + } if (enumerator == null) { - log.error("unknown.enum.constant", - currentClassFile, enumTypeSym, proxy.enumerator); - result = new Attribute.Error(enumTypeSym.type); + if (failure != null) { + log.warning("unknown.enum.constant.reason", + currentClassFile, enumTypeSym, proxy.enumerator, + failure.getDiagnostic()); + } else { + log.warning("unknown.enum.constant", + currentClassFile, enumTypeSym, proxy.enumerator); + } + result = new Attribute.Enum(enumTypeSym.type, + new VarSymbol(0, proxy.enumerator, syms.botType, enumTypeSym)); } else { result = new Attribute.Enum(enumTypeSym.type, enumerator); } diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java --- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Sat May 14 11:52:15 2011 -0700 @@ -479,7 +479,12 @@ state.pop(1);// index Type a = state.stack[state.stacksize-1]; state.pop(1); - state.push(types.erasure(types.elemtype(a))); } + //sometimes 'null type' is treated as a one-dimensional array type + //see Gen.visitLiteral - we should handle this case accordingly + Type stackType = a.tag == BOT ? + syms.objectType : + types.erasure(types.elemtype(a)); + state.push(stackType); } break; case goto_: markDead(); diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java --- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Sat May 14 11:52:15 2011 -0700 @@ -72,11 +72,11 @@ } public Element asElement(TypeMirror t) { - Type type = cast(Type.class, t); - switch (type.tag) { - case TypeTags.CLASS: - case TypeTags.ERROR: - case TypeTags.TYPEVAR: + switch (t.getKind()) { + case DECLARED: + case ERROR: + case TYPEVAR: + Type type = cast(Type.class, t); return type.asElement(); default: return null; diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sat May 14 11:52:15 2011 -0700 @@ -762,9 +762,6 @@ compiler.err.unclosed.str.lit=\ unclosed string literal -compiler.err.unknown.enum.constant=\ - in class file {0}: unknown enum constant {1}.{2} - # 0: name compiler.err.unsupported.encoding=\ unsupported encoding: {0} @@ -1307,6 +1304,15 @@ compiler.warn.annotation.method.not.found.reason=\ Cannot find annotation method ''{1}()'' in type ''{0}'': {2} +# 0: symbol, 1: name +compiler.warn.unknown.enum.constant=\ + unknown enum constant {1}.{2} + +# 0: symbol, 1: name, 2: message segment +compiler.warn.unknown.enum.constant.reason=\ + unknown enum constant {1}.{2}\n\ + reason: {3} + # 0: type, 1: type compiler.warn.raw.class.use=\ found raw type: {0}\n\ @@ -1618,6 +1624,9 @@ compiler.misc.diamond.non.generic=\ cannot use ''<>'' with non-generic class {0} +compiler.misc.diamond.and.explicit.params=\ + cannot use ''<>'' with explicit type parameters for constructor + # 0: type, 1: list of type compiler.misc.explicit.param.do.not.conform.to.bounds=\ explicit type argument {0} does not conform to declared bound(s) {1} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -228,6 +228,9 @@ # 0: symbol compiler.err.multicatch.parameter.may.not.be.assigned=\u8907\u6570catch\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +# 0: type, 1: type +compiler.err.multicatch.types.must.be.disjoint=\u8907\u6570catch\u6587\u306E\u4EE3\u66FF\u3092\u30B5\u30D6\u30AF\u30E9\u30B9\u5316\u306B\u3088\u3063\u3066\u95A2\u9023\u4ED8\u3051\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n\u4EE3\u66FF{0}\u306F\u4EE3\u66FF{1}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3067\u3059 + compiler.err.finally.without.try=''finally''\u3078\u306E''try''\u304C\u3042\u308A\u307E\u305B\u3093 # 0: type, 1: message segment @@ -436,8 +439,12 @@ # Errors related to annotation processing +# 0: symbol, 1: string, 2: stack-trace compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2} +# 0: symbol, 1: string +compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1} + # 0: string compiler.err.proc.cant.find.class=''{0}''\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002 @@ -535,8 +542,6 @@ compiler.err.unclosed.str.lit=\u6587\u5B57\u5217\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093 -compiler.err.unknown.enum.constant=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u5185: \u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2} - # 0: name compiler.err.unsupported.encoding=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3059: {0} @@ -686,6 +691,7 @@ # 0: file name compiler.note.sunapi.filename={0}\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 + compiler.note.sunapi.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002 # The following string may appear after one of the above sunapi messages. @@ -796,6 +802,12 @@ # 0: type, 1: type compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059 +# 0: list of type +compiler.warn.unreachable.catch=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059 + +# 0: list of type +compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059 + # 0: symbol compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 @@ -888,6 +900,9 @@ # 0: symbol compiler.warn.try.resource.not.referenced=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306F\u5BFE\u5FDC\u3059\u308Btry\u6587\u306E\u672C\u4F53\u3067\u306F\u53C2\u7167\u3055\u308C\u307E\u305B\u3093 +# 0: type +compiler.warn.try.resource.throws.interrupted.exc=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306B\u3001InterruptedException\u3092\u30B9\u30ED\u30FC\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u30E1\u30F3\u30D0\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9close()\u304C\u3042\u308A\u307E\u3059 + compiler.warn.unchecked.assign={0}\u304B\u3089{1}\u3078\u306E\u7121\u691C\u67FB\u4EE3\u5165\u3067\u3059 # 0: symbol, 1: type @@ -924,6 +939,12 @@ compiler.warn.annotation.method.not.found.reason=\u30BF\u30A4\u30D7''{0}''\u5185\u306B\u6CE8\u91C8\u30E1\u30BD\u30C3\u30C9''{1}()''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {2} +# 0: symbol, 1: name +compiler.warn.unknown.enum.constant=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2} + +# 0: symbol, 1: name, 2: message segment +compiler.warn.unknown.enum.constant.reason=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}\n\u7406\u7531: {3} + # 0: type, 1: type compiler.warn.raw.class.use=raw\u578B\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {0}\n\u6C4E\u7528\u30AF\u30E9\u30B9{1}\u306E\u578B\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093 @@ -1011,7 +1032,11 @@ ## above strings. compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059 -compiler.misc.bad.enclosing.method=\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0} +#0: symbol, 1: symbol +compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1} + +# 0: symbol +compiler.misc.bad.enclosing.method=\u30AF\u30E9\u30B9{0}\u306E\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059 compiler.misc.bad.runtime.invisible.param.annotations=RuntimeInvisibleParameterAnnotations\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0} @@ -1140,11 +1165,7 @@ # 0: type compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.arg={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093 - -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.args={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093 +compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 # 0: type, 1: list of type compiler.misc.explicit.param.do.not.conform.to.bounds=\u660E\u793A\u7684\u306A\u578B\u5F15\u6570{0}\u306F\u3001\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093 @@ -1291,7 +1312,7 @@ # 0: symbol, 1: symbol, 2: symbol, 3: symbol compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059 -compiler.misc.non.denotable.type=\u3053\u3053\u3067\u975E\u578B\u6307\u5B9A\u578B{0}\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 +compiler.misc.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment compiler.misc.inapplicable.method={0} {1}.{2}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({3}) diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -228,6 +228,9 @@ # 0: symbol compiler.err.multicatch.parameter.may.not.be.assigned=\u53EF\u80FD\u672A\u5206\u914D multi-catch \u53C2\u6570{0} +# 0: type, 1: type +compiler.err.multicatch.types.must.be.disjoint=multi-catch \u8BED\u53E5\u4E2D\u7684\u66FF\u4EE3\u65E0\u6CD5\u901A\u8FC7\u5B50\u7C7B\u5316\u5173\u8054\n\u66FF\u4EE3{0}\u662F\u66FF\u4EE3{1}\u7684\u5B50\u7C7B + compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''try'' # 0: type, 1: message segment @@ -436,8 +439,12 @@ # Errors related to annotation processing +# 0: symbol, 1: string, 2: stack-trace compiler.err.proc.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n{2} +# 0: symbol, 1: string +compiler.err.proc.cant.access.1=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1} + # 0: string compiler.err.proc.cant.find.class=\u627E\u4E0D\u5230 ''{0}'' \u7684\u7C7B\u6587\u4EF6\u3002 @@ -535,8 +542,6 @@ compiler.err.unclosed.str.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u4E32\u6587\u5B57 -compiler.err.unknown.enum.constant=\u5728\u7C7B\u6587\u4EF6{0}\u4E2D: \u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2} - # 0: name compiler.err.unsupported.encoding=\u4E0D\u652F\u6301\u7684\u7F16\u7801: {0} @@ -686,6 +691,7 @@ # 0: file name compiler.note.sunapi.filename={0}\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002 + compiler.note.sunapi.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002 # The following string may appear after one of the above sunapi messages. @@ -796,6 +802,12 @@ # 0: type, 1: type compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A +# 0: list of type +compiler.warn.unreachable.catch=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0} + +# 0: list of type +compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0} + # 0: symbol compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B @@ -888,6 +900,9 @@ # 0: symbol compiler.warn.try.resource.not.referenced=\u4E0D\u80FD\u5728\u76F8\u5E94\u7684 try \u8BED\u53E5\u7684\u6B63\u6587\u4E2D\u5F15\u7528\u53EF\u81EA\u52A8\u7ED3\u675F\u7684\u8D44\u6E90{0} +# 0: type +compiler.warn.try.resource.throws.interrupted.exc=\u53EF\u81EA\u52A8\u5173\u95ED\u7684\u8D44\u6E90{0}\u5305\u542B\u7684\u6210\u5458\u65B9\u6CD5 close() \u53EF\u80FD\u629B\u51FA InterruptedException + compiler.warn.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u5206\u914D: \u5C06{0}\u5206\u914D\u7ED9{1} # 0: symbol, 1: type @@ -924,6 +939,12 @@ compiler.warn.annotation.method.not.found.reason=\u65E0\u6CD5\u627E\u5230\u7C7B\u578B ''{0}'' \u7684\u6CE8\u91CA\u65B9\u6CD5 ''{1}()'': {2} +# 0: symbol, 1: name +compiler.warn.unknown.enum.constant=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2} + +# 0: symbol, 1: name, 2: message segment +compiler.warn.unknown.enum.constant.reason=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}\n\u539F\u56E0: {3} + # 0: type, 1: type compiler.warn.raw.class.use=\u627E\u5230\u539F\u59CB\u7C7B\u578B: {0}\n\u7F3A\u5C11\u6CDB\u578B\u7C7B{1}\u7684\u7C7B\u578B\u53C2\u6570 @@ -1011,7 +1032,11 @@ ## above strings. compiler.misc.bad.class.signature=\u9519\u8BEF\u7684\u7C7B\u7B7E\u540D: {0} -compiler.misc.bad.enclosing.method=\u9519\u8BEF\u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027: {0} +#0: symbol, 1: symbol +compiler.misc.bad.enclosing.class={0}\u7684\u5C01\u95ED\u7C7B\u9519\u8BEF: {1} + +# 0: symbol +compiler.misc.bad.enclosing.method=\u7C7B {0} \u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027\u9519\u8BEF compiler.misc.bad.runtime.invisible.param.annotations=\u9519\u8BEF\u7684 RuntimeInvisibleParameterAnnotations \u5C5E\u6027: {0} @@ -1140,11 +1165,7 @@ # 0: type compiler.misc.diamond.non.generic=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u975E\u6CDB\u578B\u7C7B{0}\u4E00\u8D77\u4F7F\u7528 -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.arg=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0} - -# 0: list of type, 1: message segment -compiler.misc.diamond.invalid.args=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0} +compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528 # 0: type, 1: list of type compiler.misc.explicit.param.do.not.conform.to.bounds=\u663E\u5F0F\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4{1} @@ -1291,7 +1312,7 @@ # 0: symbol, 1: symbol, 2: symbol, 3: symbol compiler.misc.varargs.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2} -compiler.misc.non.denotable.type=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E0D\u53EF\u6307\u793A\u7684\u7C7B\u578B{0} +compiler.misc.diamond.and.anon.class=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u533F\u540D\u5185\u90E8\u7C7B\u4E00\u8D77\u4F7F\u7528 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment compiler.misc.inapplicable.method={0} {1}.{2}\u4E0D\u9002\u7528\n({3}) diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -87,6 +87,7 @@ javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B javac.opt.prefer=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u3001\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3068\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4E21\u65B9\u304C\u898B\u3064\u304B\u3063\u305F\u969B\u3069\u3061\u3089\u3092\u8AAD\u307F\u8FBC\u3080\u304B\u6307\u5B9A\u3059\u308B +javac.opt.AT=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u540D ## errors @@ -96,6 +97,7 @@ javac.err.invalid.flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059 javac.err.invalid.target={0}\u306F\u7121\u52B9\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059 javac.err.no.source.files=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093 +javac.err.no.source.files.classes=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u540D\u304C\u3042\u308A\u307E\u305B\u3093 javac.err.req.arg={0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059 javac.err.invalid.source={0}\u306F\u7121\u52B9\u306A\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059 javac.err.error.writing.file={0}\u306E\u66F8\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002{1} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -87,6 +87,7 @@ javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F javac.opt.prefer=\u6307\u5B9A\u8BFB\u53D6\u6587\u4EF6, \u5F53\u540C\u65F6\u627E\u5230\u9690\u5F0F\u7F16\u8BD1\u7C7B\u7684\u6E90\u6587\u4EF6\u548C\u7C7B\u6587\u4EF6\u65F6 +javac.opt.AT=\u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C\u6587\u4EF6\u540D ## errors @@ -96,6 +97,7 @@ javac.err.invalid.flag=\u65E0\u6548\u7684\u6807\u8BB0: {0} javac.err.invalid.target=\u65E0\u6548\u7684\u76EE\u6807\u53D1\u884C\u7248: {0} javac.err.no.source.files=\u65E0\u6E90\u6587\u4EF6 +javac.err.no.source.files.classes=\u65E0\u6E90\u6587\u4EF6\u6216\u7C7B\u540D javac.err.req.arg={0}\u9700\u8981\u53C2\u6570 javac.err.invalid.source=\u65E0\u6548\u7684\u6E90\u53D1\u884C\u7248: {0} javac.err.error.writing.file=\u5199\u5165{0}\u65F6\u51FA\u9519; {1} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Sat May 14 11:52:15 2011 -0700 @@ -266,6 +266,8 @@ com.sun.swing.internal.plaf.basic.resources = tiger legacy com.sun.swing.internal.plaf.metal.resources = tiger legacy com.sun.swing.internal.plaf.synth.resources = tiger legacy +com.sun.tracing = tiger legacy +com.sun.tracing.dtrace = tiger legacy java.applet = tiger legacy java.awt = tiger legacy java.awt.color = tiger legacy diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties --- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Sat May 14 11:52:15 2011 -0700 @@ -75,7 +75,7 @@ tag.End_delimiter_missing_for_possible_SeeTag=\u30B3\u30E1\u30F3\u30C8\u6587\u5B57\u5217"{0}"\u3067\u3001\u6709\u52B9\u306Asee\u30BF\u30B0\u306B\u7D42\u7AEF\u30C7\u30EA\u30DF\u30BF}\u304C\u3042\u308A\u307E\u305B\u3093 tag.Improper_Use_Of_Link_Tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0"{0}"\u306B\u7D42\u4E86\u6587\u5B57''}''\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.File_Read_Error=\u30D5\u30A1\u30A4\u30EB{0}\u306E\u8AAD\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F -javadoc.Body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 +javadoc.Body_missing_from_html_file=HTML\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.End_body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u306E\u9589\u3058\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093 javadoc.Multiple_package_comments=\u30D1\u30C3\u30B1\u30FC\u30B8"{0}"\u306B\u8907\u6570\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u30BD\u30FC\u30B9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties --- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Wed May 11 16:12:01 2011 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Sat May 14 11:52:15 2011 -0700 @@ -43,7 +43,7 @@ main.no_source_files_for_package=\u6CA1\u6709\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6 main.fatal.error=\u81F4\u547D\u9519\u8BEF main.fatal.exception=\u81F4\u547D\u5F02\u5E38\u9519\u8BEF -main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216\u70ED\u70B9 VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002 +main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216 HotSpot VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002 main.done_in=[\u5728 {0} \u6BEB\u79D2\u5185\u5B8C\u6210] main.doclet_method_must_be_static=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u4E3A\u9759\u6001\u3002 main.must_return_int=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u8FD4\u56DE\u6574\u578B\u503C\u3002 @@ -75,7 +75,7 @@ tag.End_delimiter_missing_for_possible_SeeTag=\u6CE8\u91CA\u5B57\u7B26\u4E32\u4E2D\u53EF\u80FD\u51FA\u73B0\u7684 See \u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F\u5206\u9694\u7B26 }: "{0}" tag.Improper_Use_Of_Link_Tag=\u5185\u5D4C\u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F ''}'' \u5B57\u7B26: "{0}" javadoc.File_Read_Error=\u8BFB\u53D6\u6587\u4EF6{0}\u65F6\u51FA\u9519 -javadoc.Body_missing_from_html_file=HTML \u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0 +javadoc.Body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0 javadoc.End_body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u7ED3\u675F\u6807\u8BB0 javadoc.Multiple_package_comments=\u627E\u5230\u7A0B\u5E8F\u5305 "{0}" \u7684\u591A\u4E2A\u7A0B\u5E8F\u5305\u6CE8\u91CA\u6E90 javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002 diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2011, 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 6553182 + * @summary This test verifies the -Xdocrootparent option. + * @author Bhavesh Patel + * @library ../lib/ + * @build JavadocTester TestDocRootLink + * @run main TestDocRootLink + */ +public class TestDocRootLink extends JavadocTester { + + private static final String BUG_ID = "6553182"; + private static final String[][] TEST1 = { + {BUG_ID + FS + "pkg1" + FS + "C1.html", + "<a href=\"../../technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + "<a href=\"../../technotes/guides/index.html\">" + } + }; + private static final String[][] NEGATED_TEST1 = { + {BUG_ID + FS + "pkg1" + FS + "C1.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + } + }; + private static final String[][] TEST2 = { + {BUG_ID + FS + "pkg2" + FS + "C2.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + } + }; + private static final String[][] NEGATED_TEST2 = { + {BUG_ID + FS + "pkg2" + FS + "C2.html", + "<a href=\"../../technotes/guides/index.html\">" + }, + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + "<a href=\"../../technotes/guides/index.html\">" + } + }; + private static final String[] ARGS1 = + new String[]{ + "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1" + }; + private static final String[] ARGS2 = + new String[]{ + "-d", BUG_ID, "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg2" + }; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestDocRootLink tester = new TestDocRootLink(); + run(tester, ARGS1, TEST1, NEGATED_TEST1); + run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2011, 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. + */ + +package pkg1; + +/** + * Class 1. This is a test. + * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. Lets see if this works + * or not. + */ +public class C1 {} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,18 @@ +<html> +<head> +<title>javax.management package + + +This is a test. +
+ @see + Test document 1 + in particular the + + + Test document 2. + + @since 1.5 + + + diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2011, 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. + */ + +package pkg2; + +/** + * Class 1. This is a test. + * Refer Here. Lets see if this works + * or not. + */ +public class C2 {} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,18 @@ + + +javax.management package + + +This is a test. +
+ @see + Test document 1 + in particular the + + + Test document 2. + + @since 1.5 + + + diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java --- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Wed May 11 16:12:01 2011 -0700 +++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Sat May 14 11:52:15 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,20 +23,19 @@ /* * @test - * @bug 4934778 4777599 + * @bug 4934778 4777599 6553182 * @summary Make sure that the -help option works properly. Make sure * the help link appears in the documentation. * @author jamieh * @library ../lib/ - * @build JavadocTester - * @build TestHelpOption + * @build JavadocTester TestHelpOption * @run main TestHelpOption */ public class TestHelpOption extends JavadocTester { //Test information. - private static final String BUG_ID = "4934778-4777599"; + private static final String BUG_ID = "4934778-4777599-6553182"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -79,6 +78,7 @@ {STANDARD_OUTPUT, "-tag "}, {STANDARD_OUTPUT, "-taglet "}, {STANDARD_OUTPUT, "-tagletpath "}, + {STANDARD_OUTPUT, "-Xdocrootparent "}, {STANDARD_OUTPUT, "-charset "}, {STANDARD_OUTPUT, "-helpfile "}, {STANDARD_OUTPUT, "-linksource "}, diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2011, 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 6758050 + * @summary Test HTML output for nested generic types. + * @author bpatel + * @library ../lib/ + * @build JavadocTester TestNestedGenerics + * @run main TestNestedGenerics + */ + +public class TestNestedGenerics extends JavadocTester { + + //Test information. + private static final String BUG_ID = "6758050"; + + //Javadoc arguments. + private static final String[] ARGS = new String[]{ + "-d", BUG_ID, "-source", "1.5", "-sourcepath", SRC_DIR, + "pkg" + }; + + //Input for string search tests. + private static final String[][] TEST = { + {BUG_ID + FS + "pkg" + FS + "NestedGenerics.html", + "
Contains foo" + + "(java.util.Map<A, java.util.Map<A, A>>)
" + } + }; + private static final String[][] NEGATED_TEST = NO_TEST; + + /** + * The entry point of the test. + * @param args the array of command line arguments. + */ + public static void main(String[] args) { + TestNestedGenerics tester = new TestNestedGenerics(); + run(tester, ARGS, TEST, NEGATED_TEST); + tester.printSummary(); + } + + /** + * {@inheritDoc} + */ + public String getBugId() { + return BUG_ID; + } + + /** + * {@inheritDoc} + */ + public String getBugName() { + return getClass().getName(); + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2011, 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. + */ + +package pkg; + +import java.util.Map; + +/** Contains {@link #foo} */ +public class NestedGenerics { + public static void foo(Map> map) {} +} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011, 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. + */ + +/** + * Another test class. + * + * @author Bhavesh Patel + */ +public class C2 { + + public static enum ModalExclusionType { + /** + * Test comment. + */ + NO_EXCLUDE, + /** + * Another comment. + */ + APPLICATION_EXCLUDE + }; + + /** + * A string constant. + */ + public static final String CONSTANT1 = "C2"; + + /** + * A sample method. + * + * @param param some parameter. + */ + public void method(String param) { + + } +} diff -r 6a1eff16874d -r 2fc5ecbea1ce langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java Sat May 14 11:52:15 2011 -0700 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2011, 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.util.*; + +/** +* Test Deprecated class +* @deprecated This class is Deprecated. +*/ +public class FooDepr { + + public void method(Vector