Skip to content

Commit c684df4

Browse files
garydgregorygarydgregory
committed
Normalize main menu on the website
Use XML Schema to validate XML site templates
1 parent 500a9f9 commit c684df4

File tree

5 files changed

+79
-64
lines changed

5 files changed

+79
-64
lines changed

‎src/site/site.xml‎

Lines changed: 63 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -15,59 +15,66 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<project name="BeanUtils">
19-
<bannerRight>
20-
<name>Commons BeanUtils</name>
21-
<src>/images/logo.png</src>
22-
<href>/index.html</href>
23-
</bannerRight>
24-
25-
<body>
26-
<menu name="BeanUtils">
27-
<item name="Overview" href="/index.html"/>
28-
<item name="Download" href="https://commons.apache.org/beanutils/download_beanutils.cgi"/>
29-
<item name="Dependencies" href="/dependencies.html"/>
30-
<item name="Mailing Lists" href="/mail-lists.html"/>
31-
<item name="Issue Tracking" href="/issue-tracking.html"/>
32-
<item name="Source Repository" href="/scm.html"/>
33-
<item name="License" href="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
34-
</menu>
35-
36-
<menu name="Documentation">
37-
<item name="Building" href="/building.html"/>
38-
<item name="Release History" href="/changes.html"/>
39-
<item name="2.0.0-M2-SNAPSHOT" collapse="true" href="/index.html">
40-
<item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt"/>
41-
<item name="User Guide" href="https://commons.apache.org/proper/commons-beanutils/apidocs/org/apache/commons/beanutils2/package-summary.html"/>
42-
<item name="API" href="https://commons.apache.org/proper/commons-beanutils/apidocs/index.html"/>
43-
</item>
44-
<item name="2.0.0-M1" collapse="true" href="/index.html">
45-
<item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt"/>
46-
<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"/>
47-
<item name="API" href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/index.html"/>
48-
</item>
49-
<item name="1.10.0" collapse="true" href="/index.html">
50-
<item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt"/>
51-
<item name="User Guide" href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/org/apache/commons/beanutils/package-summary.html"/>
52-
<item name="API" href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/index.html"/>
53-
</item>
54-
<item name="1.9.3" collapse="true" href="/index.html">
55-
<item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt"/>
56-
<item name="User Guide" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
57-
<item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html"/>
58-
</item>
59-
<item name="1.9.2" collapse="true" href="/index.html">
60-
<item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt"/>
61-
<item name="User Guide" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
62-
<item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html"/>
63-
</item>
64-
<item name="1.8.3" collapse="true" href="/index.html">
65-
<item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt"/>
66-
<item name="User Guide" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
67-
<item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html"/>
68-
</item>
69-
</menu>
70-
71-
</body>
72-
73-
</project>
18+
<site xmlns="http://maven.apache.org/SITE/2.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 http://maven.apache.org/xsd/site-2.0.0.xsd"
21+
name="Apache Commons BeanUtils">
22+
<bannerRight name="Commons BeanUtils" href="/index.html">
23+
<image src="/images/logo.png"/>
24+
</bannerRight>
25+
<body>
26+
<menu name="Commons BeanUtils">
27+
<!-- Start: For all components. -->
28+
<item name="About" href="index.html" />
29+
<item name="Asking Questions" href="/mail-lists.html" />
30+
<item name="Release History" href="/changes.html" />
31+
<item name="Issue Tracking" href="/issue-management.html" />
32+
<item name="Dependency Management" href="/dependency-info.html" />
33+
<item name="Javadoc" href="apidocs/index.html" />
34+
<item name="Javadoc Archive" href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2" />
35+
<item name="Sources" href="/scm.html" />
36+
<item name="Security" href="security.html" />
37+
<item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
38+
<item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
39+
<item name="Download" href="https://commons.apache.org/beanutils/download_beanutils.cgi" />
40+
<!-- End: For all components. -->
41+
</menu>
42+
<menu name="Documentation">
43+
<item name="Building" href="/building.html" />
44+
<item name="2.0.0-M2-SNAPSHOT" collapse="true" href="/index.html">
45+
<item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt" />
46+
<item name="User Guide" href="https://commons.apache.org/proper/commons-beanutils/apidocs/org/apache/commons/beanutils2/package-summary.html" />
47+
<item name="API" href="https://commons.apache.org/proper/commons-beanutils/apidocs/index.html" />
48+
</item>
49+
<item name="2.0.0-M1" collapse="true" href="/index.html">
50+
<item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt" />
51+
<item name="User Guide"
52+
href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/org/apache/commons/beanutils2/package-summary.html" />
53+
<item name="API" href="https://javadoc.io/doc/org.apache.commons/commons-beanutils2/2.0.0-M1/index.html" />
54+
</item>
55+
<item name="1.10.0" collapse="true" href="/index.html">
56+
<item name="Release Notes" href="https://dlcdn.apache.org//commons/beanutils/RELEASE-NOTES.txt" />
57+
<item name="User Guide" href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/org/apache/commons/beanutils/package-summary.html" />
58+
<item name="API" href="https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0/index.html" />
59+
</item>
60+
<item name="1.9.3" collapse="true" href="/index.html">
61+
<item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt" />
62+
<item name="User Guide"
63+
href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
64+
<item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html" />
65+
</item>
66+
<item name="1.9.2" collapse="true" href="/index.html">
67+
<item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt" />
68+
<item name="User Guide"
69+
href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
70+
<item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html" />
71+
</item>
72+
<item name="1.8.3" collapse="true" href="/index.html">
73+
<item name="Release Notes" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt" />
74+
<item name="User Guide"
75+
href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
76+
<item name="API" href="https://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html" />
77+
</item>
78+
</menu>
79+
</body>
80+
</site>

‎src/site/xdoc/bean-collections.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
limitations under the License.
1717
-->
1818

19-
<document>
20-
19+
<document xmlns="http://maven.apache.org/XDOC/2.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
2122
<properties>
2223
<title>Commons</title>
2324
<author email="[email protected]">Commons Documentation Team</author>

‎src/site/xdoc/building.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<document>
18+
<document xmlns="http://maven.apache.org/XDOC/2.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
1921
<properties>
2022
<title>Building</title>
2123
<author email="[email protected]">Commons Documentation Team</author>

‎src/site/xdoc/index.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
limitations under the License.
1717
-->
1818

19-
<document>
20-
19+
<document xmlns="http://maven.apache.org/XDOC/2.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
2122
<properties>
2223
<title>Commons</title>
2324
<author email="[email protected]">Commons Documentation Team</author>
@@ -58,11 +59,13 @@ easy-to-use wrappers around these capabilities.
5859
<subsection name='BeanUtils Core And Modules'>
5960
<p>
6061
The 1.7.x and 1.8.x releases of BeanUtils distributed three jars:
62+
</p>
6163
<ul>
6264
<li><code>commons-beanutils.jar</code> - contains everything</li>
6365
<li><code>commons-beanutils-core.jar</code> - excludes <i>Bean Collections</i> classes</li>
6466
<li><code>commons-beanutils-bean-collections.jar</code> - only <i>Bean Collections</i> classes</li>
6567
</ul>
68+
<p>
6669
The main <code>commons-beanutils.jar</code> has an <b><i>optional</i></b> dependency on
6770
<a href='https://commons.apache.org/collections'>Commons Collections</a>
6871
</p>
@@ -119,10 +122,12 @@ Bean Collections has an additional dependency on
119122
The latest BeanUtils release is available to download
120123
<a href="http://commons.apache.org/beanutils/download_beanutils.cgi">here</a>.<br/>
121124
<em><strong>1.9.4</strong></em><br/><br/>
125+
</p>
122126
<ul>
123127
<li><a href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt">Release Notes</a></li>
124128
<li><a href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html">JavaDoc</a></li>
125129
</ul>
130+
<p>
126131
<strong>CVE-2019-10086.</strong> Apache Commons Beanutils does not suppresses
127132
the class property in bean introspection by default.<br/><br/>
128133
<strong>Severity.</strong> Medium<br/><br/>
@@ -255,7 +260,6 @@ commons collections 3.
255260
</p>
256261
</subsection>
257262
<subsection name='Older Releases (Not Mirrored)'>
258-
<p>
259263
<ul>
260264
<li>Version 1.6.1 - 18 Feb 2003
261265
<a href="https://archive.apache.org/dist/commons/beanutils/binaries/">binary</a> and
@@ -271,7 +275,6 @@ commons collections 3.
271275
<li><a href="https://archive.apache.org/dist/commons/beanutils/old/v1.1/">Version 1.1</a> - 22 Sep 2001</li>
272276
<li><a href="https://archive.apache.org/dist/commons/beanutils/old/v1.0/">Version 1.0</a> - 14 July 2001</li>
273277
</ul>
274-
</p>
275278
</subsection>
276279
</section>
277280

‎src/site/xdoc/proposal.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<document>
17+
<document xmlns="http://maven.apache.org/XDOC/2.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
1820
<properties>
1921
<title>Proposal for BeanUtils Package</title>
2022
</properties>

0 commit comments

Comments
 (0)