#1654: update xjc section in the userguide

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Jan 25, 2023 · 55d38bd · 55d38bd
1 parent 545af03
commit 55d38bd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 42 deletions.
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
@@ -29,7 +29,9 @@
         <itemizedlist>
             <listitem><para>Bug fixes:
                 <itemizedlist>
-                    <listitem><para>nnn</para></listitem>
+                    <listitem><para>
+                        <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1654">#1654</link>: update xjc section in the userguide
+                    </para></listitem>
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/pull/1669">#1669</link>: [codemodel] Support Object and overridden JAnnotationWriter methods
                     </para></listitem>

diff --git a/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc-ant-task.xml b/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc-ant-task.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -309,10 +309,6 @@
                         <para><option>-dtd</option></para>
                     </listitem>
 
-                    <listitem>
-                        <para><option>-relaxng</option></para>
-                    </listitem>
-
                     <listitem>
                         <para><option>-Xlocator</option></para>
                     </listitem>
@@ -417,7 +413,7 @@
         RELAX NG, DTD, and WSDL. To compile anything other than W3C XML Schema
         from the <command>xjc</command> Ant task, you must use the nested &lt;
         <literal>arg</literal>&gt; element to specify the appropriate command line
-        switch, such as <option>-dtd</option>, <option>-relaxng</option>, or <option>-wsdl</option>. Otherwise, your input schemas will be treated as
+        switch, such as <option>-dtd</option>, or <option>-wsdl</option>. Otherwise, your input schemas will be treated as
         W3C XML Schema and the binding compiler will fail.</para>
     </section>
 

diff --git a/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc.xml b/jaxb-ri/docs/release-documentation/src/docbook/tools-xjc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -109,6 +109,7 @@ Options:
                         If a directory is given, **/*.xjb is searched
   -d <dir>           :  generated files will go into this directory
   -p <pkg>           :  specifies the target package
+  -m <name>          :  generate module-info.java with given Java module name
   -httpproxy <proxy> :  set HTTP/HTTPS proxy. Format is [user[:password]@]proxyHost:proxyPort
   -httpproxyfile <f> :  Works like -httpproxy but takes the argument in a file to protect password 
   -classpath <arg>   :  specify where to find user class files
@@ -117,14 +118,12 @@ Options:
   -readOnly          :  generated files will be in read-only mode
   -npa               :  suppress generation of package level annotations (**/package-info.java)
   -no-header         :  suppress generation of a file header with timestamp
-  -target (2.0|2.1)  :  behave like XJC 2.0 or 2.1 and generate code that doesn't use any 2.2 features.
+  -target 3.0        :  behave like XJC 3.0 and generate code that doesn't use any new features
   -encoding <encoding> :  specify character encoding for generated source files
   -enableIntrospection :  enable correct generation of Boolean getters/setters to enable Bean Introspection apis 
   -disableXmlSecurity  :  disables XML security features when parsing XML documents 
   -contentForWildcard  :  generates content property for types with multiple xs:any derived elements 
   -xmlschema         :  treat input as W3C XML Schema (default)
-  -relaxng           :  treat input as RELAX NG (experimental,unsupported)
-  -relaxng-compact   :  treat input as RELAX NG compact syntax (experimental,unsupported)
   -dtd               :  treat input as XML DTD (experimental,unsupported)
   -wsdl              :  treat input as WSDL and compile schemas inside it (experimental,unsupported)
   -verbose           :  be extra verbose
@@ -134,11 +133,13 @@ Options:
   -fullversion       :  display full version information
 
 Extensions:
-  -Xinject-code      :  inject specified Java code fragments into the generated code
-  -Xlocator          :  enable source location support for generated code
-  -Xsync-methods     :  generate accessor methods with the 'synchronized' keyword
-  -mark-generated    :  mark the generated code as @javax.annotation.Generated
-  -episode           :  generate the episode file for separate compilation
+  -Xinject-code       :  inject specified Java code fragments into the generated code
+  -Xlocator           :  enable source location support for generated code
+  -Xsync-methods      :  generate accessor methods with the 'synchronized' keyword
+  -mark-generated     :  mark the generated code as @jakarta.annotation.Generated
+                      -noDate            : do not add date
+                      -Xann <annotation> : generate <annotation> instead of @jakarta.annotation.Generated
+  -episode            :  generate the episode file for separate compilation
   -Xpropertyaccessors :  Use XmlAccessType PROPERTY instead of FIELD for generated classes]]></programlisting>
         </informalexample>
 
@@ -340,30 +341,6 @@ xjc schema1.xsd schema2.xsd schema3.xsd -b bindings1.xjb -b bindings2.xjb -b bin
                     </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                    <term><emphasis role="bold">-relaxng</emphasis></term>
-
-                    <listitem>
-                        <para>Treat input schemas as RELAX NG (experimental,
-                        unsupported). Support for RELAX NG schemas is provided
-                        as a <xref linkend="jaxb-ri-extensions-overview"
-                        xrefstyle="select:title" />.</para>
-                    </listitem>
-                </varlistentry>
-
-                <varlistentry>
-                    <term><emphasis
-                    role="bold">-relaxng-compact</emphasis></term>
-
-                    <listitem>
-                        <para>Treat input schemas as RELAX NG compact
-                        syntax(experimental, unsupported). Support for RELAX
-                        NG schemas is provided as a <xref
-                        linkend="jaxb-ri-extensions-overview"
-                        xrefstyle="select:title" />.</para>
-                    </listitem>
-                </varlistentry>
-
                 <varlistentry>
                     <term><emphasis role="bold">-dtd</emphasis></term>
 

diff --git a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle.properties b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -53,7 +53,7 @@ Options:\n\
 \ \ -readOnly          :  generated files will be in read-only mode\n\
 \ \ -npa               :  suppress generation of package level annotations (**/package-info.java)\n\
 \ \ -no-header         :  suppress generation of a file header with timestamp\n\
-\ \ -target 3.0        :  behave like XJC 3.0 and generate code that doesn''t use any new features.\n\
+\ \ -target 3.0        :  behave like XJC 3.0 and generate code that doesn''t use any new features\n\
 \ \ -encoding <encoding> :  specify character encoding for generated source files\n\
 \ \ -enableIntrospection :  enable correct generation of Boolean getters/setters to enable Bean Introspection apis \n\
 \ \ -disableXmlSecurity  :  disables XML security features when parsing XML documents \n\