Normalize main menu on the website

Use XML Schema to validate XML site templates
apache · Jan 21, 2025 · c684df4 · c684df4
1 parent 500a9f9
commit c684df4
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 64 deletions.
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -15,59 +15,66 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project name="BeanUtils">
-    <bannerRight>
-        <name>Commons BeanUtils</name>
-        <src>/images/logo.png</src>
-        <href>/index.html</href>
-    </bannerRight>
-
-    <body>
-        <menu name="BeanUtils">
-            <item name="Overview"             href="/index.html"/>
-            <item name="Download"             href="https://commons.apache.org/beanutils/download_beanutils.cgi"/>
-            <item name="Dependencies"         href="/dependencies.html"/>
-            <item name="Mailing Lists"        href="/mail-lists.html"/>
-            <item name="Issue Tracking"       href="/issue-tracking.html"/>
-            <item name="Source Repository"    href="/scm.html"/>
-            <item name="License"              href="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-        </menu>
-
-        <menu name="Documentation">
-            <item name="Building"                 href="/building.html"/>
-            <item name="Release History"          href="/changes.html"/>
-            <item name="2.0.0-M2-SNAPSHOT" collapse="true" href="/index.html">
-                <item name="Release Notes"        href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt"/>
-                <item name="User Guide"           href="https://commons.apache.org/proper/commons-beanutils/apidocs/org/apache/commons/beanutils2/package-summary.html"/>
-                <item name="API"                  href="https://commons.apache.org/proper/commons-beanutils/apidocs/index.html"/>
-            </item>
-            <item name="2.0.0-M1" collapse="true" href="/index.html">
-                <item name="Release Notes"        href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt"/>
-                <item name="User Guide"           href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/org/apache/commons/beanutils2/package-summary.html"/>
-                <item name="API"                  href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/index.html"/>
-            </item>
-            <item name="1.10.0" collapse="true"   href="/index.html">
-                <item name="Release Notes"        href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt"/>
-                <item name="User Guide"           href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/org/apache/commons/beanutils/package-summary.html"/>
-                <item name="API"                  href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/index.html"/>
-            </item>
-            <item name="1.9.3" collapse="true"    href="/index.html">
-                <item name="Release Notes"        href="https://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt"/>
-                <item name="User Guide"           href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"                  href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html"/>
-            </item>
-            <item name="1.9.2" collapse="true"    href="/index.html">
-                <item name="Release Notes"        href="https://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt"/>
-                <item name="User Guide"           href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"                  href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html"/>
-            </item>
-            <item name="1.8.3" collapse="true"    href="/index.html">
-                <item name="Release Notes"        href="https://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt"/>
-                <item name="User Guide"           href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"                  href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html"/>
-            </item>
-        </menu>
-
-    </body>
-
-</project>
+<site xmlns="http://maven.apache.org/SITE/2.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 http://maven.apache.org/xsd/site-2.0.0.xsd"
+  name="Apache Commons BeanUtils">
+  <bannerRight name="Commons BeanUtils" href="/index.html">
+    <image src="/images/logo.png"/>
+  </bannerRight>
+  <body>
+    <menu name="Commons BeanUtils">
+      <!-- Start: For all components. -->
+      <item name="About" href="index.html" />
+      <item name="Asking Questions" href="/mail-lists.html" />
+      <item name="Release History" href="/changes.html" />
+      <item name="Issue Tracking" href="/issue-management.html" />
+      <item name="Dependency Management" href="/dependency-info.html" />
+      <item name="Javadoc" href="apidocs/index.html" />
+      <item name="Javadoc Archive" href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2" />
+      <item name="Sources" href="/scm.html" />
+      <item name="Security" href="security.html" />
+      <item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
+      <item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
+      <item name="Download" href="https://commons.apache.org/beanutils/download_beanutils.cgi" />
+      <!-- End: For all components. -->
+    </menu>
+    <menu name="Documentation">
+      <item name="Building" href="/building.html" />
+      <item name="2.0.0-M2-SNAPSHOT" collapse="true" href="/index.html">
+        <item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt" />
+        <item name="User Guide" href="https://commons.apache.org/proper/commons-beanutils/apidocs/org/apache/commons/beanutils2/package-summary.html" />
+        <item name="API" href="https://commons.apache.org/proper/commons-beanutils/apidocs/index.html" />
+      </item>
+      <item name="2.0.0-M1" collapse="true" href="/index.html">
+        <item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt" />
+        <item name="User Guide"
+          href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/org/apache/commons/beanutils2/package-summary.html" />
+        <item name="API" href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/index.html" />
+      </item>
+      <item name="1.10.0" collapse="true" href="/index.html">
+        <item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt" />
+        <item name="User Guide" href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/org/apache/commons/beanutils/package-summary.html" />
+        <item name="API" href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/index.html" />
+      </item>
+      <item name="1.9.3" collapse="true" href="/index.html">
+        <item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt" />
+        <item name="User Guide"
+          href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
+        <item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html" />
+      </item>
+      <item name="1.9.2" collapse="true" href="/index.html">
+        <item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt" />
+        <item name="User Guide"
+          href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
+        <item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html" />
+      </item>
+      <item name="1.8.3" collapse="true" href="/index.html">
+        <item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt" />
+        <item name="User Guide"
+          href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
+        <item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html" />
+      </item>
+    </menu>
+  </body>
+</site>
diff --git a/src/site/xdoc/bean-collections.xml b/src/site/xdoc/bean-collections.xml
@@ -16,8 +16,9 @@
    limitations under the License.
 -->
 
-<document>
-
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
  <properties>
   <title>Commons</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>

diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
@@ -15,7 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
   <properties>
     <title>Building</title>
     <author email="dev@commons.apache.org">Commons Documentation Team</author>

diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
@@ -16,8 +16,9 @@
    limitations under the License.
 -->
 
-<document>
-
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
  <properties>
   <title>Commons</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
@@ -58,11 +59,13 @@ easy-to-use wrappers around these capabilities.
 <subsection name='BeanUtils Core And Modules'>
 <p>
 The 1.7.x and 1.8.x releases of BeanUtils distributed three jars:
+</p>
 <ul>
   <li><code>commons-beanutils.jar</code> - contains everything</li>
   <li><code>commons-beanutils-core.jar</code> - excludes <i>Bean Collections</i> classes</li>
   <li><code>commons-beanutils-bean-collections.jar</code> - only <i>Bean Collections</i> classes</li>
 </ul>
+<p>
 The main <code>commons-beanutils.jar</code> has an <b><i>optional</i></b> dependency on
 <a href='https://commons.apache.org/collections'>Commons Collections</a>
 </p>
@@ -119,10 +122,12 @@ Bean Collections has an additional dependency on
     The latest BeanUtils release is available to download
     <a href="http://commons.apache.org/beanutils/download_beanutils.cgi">here</a>.<br/>
     <em><strong>1.9.4</strong></em><br/><br/>
+    </p>
     <ul>
       <li><a href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt">Release Notes</a></li>
       <li><a href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html">JavaDoc</a></li>
     </ul>
+    <p>
     <strong>CVE-2019-10086.</strong> Apache Commons Beanutils does not suppresses
     the class property in bean introspection by default.<br/><br/>
     <strong>Severity.</strong> Medium<br/><br/>
@@ -255,7 +260,6 @@ commons collections 3.
 </p>
 </subsection>
     <subsection name='Older Releases (Not Mirrored)'>
-    <p>
     <ul>
     <li>Version 1.6.1 - 18 Feb 2003 
         <a href="https://archive.apache.org/dist/commons/beanutils/binaries/">binary</a> and
@@ -271,7 +275,6 @@ commons collections 3.
     <li><a href="https://archive.apache.org/dist/commons/beanutils/old/v1.1/">Version 1.1</a> - 22 Sep 2001</li>
     <li><a href="https://archive.apache.org/dist/commons/beanutils/old/v1.0/">Version 1.0</a> - 14 July 2001</li>
     </ul>
-    </p>
     </subsection>
 </section>
 

diff --git a/src/site/xdoc/proposal.xml b/src/site/xdoc/proposal.xml
@@ -14,7 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 <properties>
 <title>Proposal for BeanUtils Package</title>
 </properties>