Skip to content

Commit 14054b7

Browse files
garydgregorygarydgregory
committed
Validate site XML template files with XML Schema
- Normalize logo graphic file name
1 parent eb32816 commit 14054b7

File tree

6 files changed

+41
-32
lines changed

6 files changed

+41
-32
lines changed

src/site/resources/images/pool-logo-white.png renamed to src/site/resources/images/logo.png

File renamed without changes.

‎src/site/site.xml‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<project name="Pool">
19-
<bannerRight>
20-
<name>Commons Pool</name>
21-
<src>/images/pool-logo-white.png</src>
22-
<href>/index.html</href>
23-
</bannerRight>
24-
25-
<body>
26-
<menu name="Pool">
27-
<item name="Overview" href="/index.html"/>
28-
<item name="Javadoc" href="/apidocs/index.html"/>
29-
<item name="Javadoc 3.x Archive" href="https://javadoc.io/doc/org.apache.commons/commons-pool3/latest/index.html"/>
30-
<item name="Javadoc 2.x Archive" href="https://javadoc.io/doc/org.apache.commons/commons-pool2/latest/index.html"/>
31-
<item name="Javadoc 1.x Archive" href="https://javadoc.io/doc/commons-pool/commons-pool/latest/index.html"/>
32-
<item name="Examples" href="/examples.html"/>
33-
<item name="Releases" href="/releases.html"/>
34-
<item name="Wiki" href="https://cwiki.apache.org/confluence/display/commons/Pool"/>
35-
</menu>
36-
37-
<menu name="Development">
38-
<item name="Mailing Lists" href="/mail-lists.html"/>
39-
<item name="Issue Tracking" href="/issue-tracking.html"/>
40-
<item name="Source Repository" href="/scm.html"/>
41-
</menu>
42-
</body>
43-
44-
</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 https://maven.apache.org/xsd/site-2.0.0.xsd"
21+
name="Apache Commons Pool">
22+
<bannerRight name="Commons Pool" href="/index.html">
23+
<image src="/images/logo.png"/>
24+
</bannerRight>
25+
<body>
26+
<menu name="Commons Pool">
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 3.x" href="https://javadoc.io/doc/org.apache.commons/commons-pool3/" />
35+
<item name="Javadoc Archive 2.x" href="https://javadoc.io/doc/org.apache.commons/commons-pool2/" />
36+
<item name="Javadoc Archive 1.x" href="https://javadoc.io/doc/commons-pool/commons-pool/" />
37+
<item name="Sources" href="scm.html" />
38+
<item name="Security" href="security.html" />
39+
<item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
40+
<item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
41+
<item name="Download" href="https://commons.apache.org/proper/commons-pool/download_bcel.cgi" />
42+
<!-- End: For all components. -->
43+
<item name="Examples" href="examples.html" />
44+
</menu>
45+
</body>
46+
</site>

‎src/site/xdoc/examples.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
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>Examples</title>
2123
<author email="[email protected]">Apache Commons Documentation Team</author>

‎src/site/xdoc/guide/index.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>Developers Guide</title>
2324
<author email="[email protected]">Apache Commons Documentation Team</author>

‎src/site/xdoc/index.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
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>Overview</title>
2123
<author email="[email protected]">Apache Commons Documentation Team</author>

‎src/site/xdoc/releases.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
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>Downloads</title>
2123
<author email="[email protected]">Apache Commons Documentation Team</author>

0 commit comments

Comments
 (0)