--- a/jdk/src/solaris/doc/sun/man/man1/xjc.1 Thu Apr 30 15:04:39 2009 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/xjc.1 Mon May 04 18:28:26 2009 -0700
@@ -1,5 +1,4 @@
-.'" t
-." Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+." Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
." 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,52 +18,38 @@
." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
." CA 95054 USA or visit www.sun.com if you need additional information or
." have any questions.
-." `
-.TH xjc 1 "07 Aug 2006"
-." Generated by html2man
+."
+.TH xjc 1 "04 May 2009"
+." Generated from HTML by html2man (author: Eric Armstrong)
.LP
.ad c
-.SH NAME
+.SH "Name"
xjc \- Java(TM) Architecture for XML Binding
.br
-Binding Compiler \f3Specification Version:\fP 2.0
+Binding Compiler
+.LP
+\f3Specification Version:\fP 2.1
.br
-\f3Reference Implementation (RI) Version:\fP 2.0 ea3
-.br
-.ad l
+\f3Reference Implementation (RI) Version:\fP 2.1.3 .ad l
.LP
.SH "Launching xjc"
.LP
.LP
-The binding compiler can be launched using the appropriate \f2xjc\fP shell script in the \f2bin\fP directory for your platform. We also provide an Ant task to run the binding complier \- see the instructions for using xjc with Ant.
-.LP
-.RS 3
-
-.LP
-\f3For Solaris/Linux\fP
+The binding compiler can be launched using the appropriate \f2xjc\fP shell script in the \f2bin\fP directory for your platform. We also provide an Ant task to run the binding complier \- see the instructions for
+.na
+\f2using the XJC Ant task\fP @
+.fi
+https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html.
.LP
.RS 3
.LP
.LP
-\f2% /path/to/jaxb/bin/xjc.sh \-help\fP
+\f2% xjc \-help\fP
.LP
.RE
-\f3For WindowsNT/2000/XP\fP
-.LP
-.RS 3
-
-.LP
-.LP
-\f2> c:\\path\\to\\jaxb\\bin\\xjc.bat \-help\fP
-.LP
-.RE
-.RE
-.RS 3
-
-.LP
\f3Output\fP
.LP
.RS 3
@@ -83,7 +68,9 @@
.fl
Compatibility Rules and App E.2 from the JAXB Spec
.fl
- \-b <file> : specify external bindings files (each <file> must have its own \-b)
+ \-b <file/dir> : specify external bindings files (each <file> must have its own \-b)
+.fl
+ If a directory is given, **/*.xjb is searched
.fl
\-d <dir> : generated files will go into this directory
.fl
@@ -103,6 +90,10 @@
.fl
\-npa : suppress generation of package level annotations (**/package\-info.java)
.fl
+ \-no\-header : suppress generation of a file header with timestamp
+.fl
+ \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features.
+.fl
\-xmlschema : treat input as W3C XML Schema (default)
.fl
\-relaxng : treat input as RELAX NG (experimental,unsupported)
@@ -126,37 +117,6 @@
.RE
.LP
-.RE
-.RS 3
-
-.LP
-\f3Execute the jaxb\-xjc.jar JAR File\fP
-.LP
-.RS 3
-
-.LP
-.LP
-If all else fails, you should be able to execute the \f2jaxb\-xjc.jar\fP file:
-.LP
-.RS 3
-
-.LP
-.RS 3
-.TP 3
-For Solaris/Linux:
-\f2% java \-jar $JAXB_HOME/lib/jaxb\-xjc.jar \-help\fP
-.TP 3
-For Windows:
-\f2> java \-jar %JAXB_HOME%\\lib\\jaxb\-xjc.jar \-help\fP
-.RE
-
-.LP
-.RE
-.LP
-This is equivalent of running "xjc.sh" or "xjc.bat", and it allows you to set the JVM parameters.
-.LP
-.RE
-.RE
.SH "OPTIONS"
.LP
@@ -167,10 +127,10 @@
By default, the XJC binding compiler performs strict validation of the source schema before processing it. Use this option to disable strict schema validation. This does not mean that the binding compiler will not perform any validation, it simply means that it will perform less\-strict validation.
.TP 3
\-extension
-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.
+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 it's 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:
+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
@@ -204,8 +164,14 @@
\-npa
Supress the generation of package level annotations into **/package\-info.java. Using this switch causes the generated code to internalize those annotations into the other generated classes.
.TP 3
+\-no\-header
+Supress the generation of a file header comment that includes some note and timestamp. Using this makes the generated code more diff\-friendly.
+.TP 3
+\-target 2.0
+Avoid generating code that relies on any JAXB 2.1 features. This will allow the generated code to run with JAXB 2.0 runtime (such as JavaSE 6.)
+.TP 3
\-xmlschema
-treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema.
+Treat input schemas as W3C XML Schema (default). If you do not specify this switch, your input schemas will be treated as W3C XML Schema.
.TP 3
\-relaxng
Treat input schemas as RELAX NG (experimental, unsupported). Support for RELAX NG schemas is provided as a JAXB Vendor Extension.
@@ -220,10 +186,10 @@
Treat input as WSDL and compile schemas inside it (experimental,unsupported).
.TP 3
\-quiet
-Suppress compiler output, such as progress information and warnings..
+Suppress compiler output, such as progress information and warnings.
.TP 3
\-verbose
-Be extra verbose, such as printing informational messages or displaying stack traces upon some errors..
+Be extra verbose, such as printing informational messages or displaying stack traces upon some errors.
.TP 3
\-help
Display a brief summary of the compiler switches.
@@ -301,138 +267,24 @@
.RS 3
.TP 2
o
-JAXB 2.0:
-.RS 3
-.TP 2
-*
-.na
-\f2Release Notes\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/ReleaseNotes.html
-.TP 2
-*
+Running the binding compiler (XJC): [
.na
-\f2XJC\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/xjc.html
-.TP 2
-*
-.na
-\f2XJCTask\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/xjcTask.html
-.TP 2
-*
-.na
-\f2SchemaGen\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/schemagen.html
-.TP 2
-*
-.na
-\f2schemagenTask\fP @
+\f2command\-line instructions\fP @
.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/schemagenTask.html
-.TP 2
-*
+https://jaxb.dev.java.net/nonav/2.1.3/docs/xjc.html,
.na
-\f2Sample Apps\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/samples.html
-.TP 2
-*
-.na
-\f2Changelog\fP @
+\f2using the XJC Ant task\fP @
.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/changelog2.html
-.RE
-.TP 2
-o
-JAXB 1.0.x:
-.RS 3
-.TP 2
-*
-.na
-\f2Release Notes\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/jaxb\-1_0.html
-.TP 2
-*
-.na
-\f2Changelog\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/changelog.html
-.RE
+https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html]
.TP 2
o
-JAXB RI Extensions:
-.RS 3
-.TP 2
-*
.na
-\f2Runtime Properties\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/vendorProperties.html
-.TP 2
-*
-.na
-\f2XJC Customizations\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/vendorCustomizations.html
-.TP 2
-*
-.na
-\f2Develop Plugins\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/developPlugins.html
-.RE
-.TP 2
-o
-JAXB RI Schema Languages:
-.RS 3
-.TP 2
-*
-.na
-\f2W3C XML Schema\fP @
+\f2Java Architecture for XML Binding (JAXB)\fP @
.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/vendorSchemaLangs.html#xschema
-.TP 2
-*
-.na
-\f2RELAX NG\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/vendorSchemaLangs.html#relaxng
-.TP 2
-*
-.na
-\f2DTD\fP @
-.fi
-http://java.sun.com/webservices/docs/2.0/jaxb/vendorSchemaLangs.html#dtd
-.RE
-.TP 2
-o
-JAXB Community:
-.RS 3
-.TP 2
-*
-.na
-\f2Java.net Homepage\fP @
-.fi
-http://jaxb.dev.java.net
-.TP 2
-*
-.na
-\f2Developer interest list\fP @
-.fi
-https://jaxb.dev.java.net/servlets/ProjectMailingListList
-.TP 2
-*
-.na
-\f2FAQ\fP @
-.fi
-https://jaxb.dev.java.net/faq/index.html
-.RE
+http://java.sun.com/javase/6/docs/technotes/guides/xml/jaxb/index.html
.RE
.LP
+
+.LP