Skip to content

Commit 123d9a8

Browse files
committed
Update site to common menu and oak leaf logo
1 parent cabaed9 commit 123d9a8

File tree

11 files changed

+134
-85
lines changed

11 files changed

+134
-85
lines changed
25.5 KB
Binary file not shown.
151 KB
Binary file not shown.

src/media/dbcp-logo-white.xcf

-23.7 KB
Binary file not shown.

src/media/logo.png

9.71 KB
Loading
-5.37 KB
Binary file not shown.
-12 KB
Binary file not shown.

src/site/resources/images/logo.png

9.71 KB
Loading

src/site/site.xml

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,43 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<project name="Apache Commons DBCP"
19-
xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
21-
<bannerRight>
22-
<name>Commons DBCP</name>
23-
<src>/images/dbcp-logo-white.png</src>
24-
<href>/index.html</href>
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 DBCP">
22+
<bannerRight name="Commons DBCP" href="/index.html">
23+
<image src="/images/logo.png"/>
2524
</bannerRight>
26-
<body>
27-
<menu name="Commons&#xA0;DBCP">
28-
<item name="Overview" href="/index.html" />
29-
<item name="Configuration" href="/configuration.html" />
30-
<item name="Javadoc" href="/apidocs/index.html"/>
31-
<item name="Javadoc 2.x Archive" href="https://javadoc.io/doc/org.apache.commons/commons-dbcp2/latest/index.html"/>
32-
<item name="Javadoc 1.x Archive" href="https://javadoc.io/doc/commons-dbcp/commons-dbcp/latest/index.html"/>
33-
<item name="Developers&#xA0;Guide" href="/guide/index.html" collapse="true">
25+
<body>
26+
<menu name="Commons DBCP">
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="Sources" href="/scm.html" />
34+
<item name="Security" href="/security.html" />
35+
<item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
36+
<item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
37+
<item name="Download" href="/download_dbcp.cgi" />
38+
<item name="Javadoc">
39+
<item name="Javadoc Current" href="/apidocs/index.html" />
40+
<item name="Javadoc 2.x Archive" href="https://javadoc.io/doc/org.apache.commons/commons-dbcp2/latest/index.html" />
41+
<!-- Specify 1.4 otherwise 20030821.193421 is used -->
42+
<item name="Javadoc 1.x Archive" href="https://javadoc.io/doc/commons-dbcp/commons-dbcp/1.4/index.html" />
43+
</item>
44+
<!-- End: For all components. -->
45+
<item name="Configuration" href="/configuration.html" />
46+
<item name="Developers&#xA0;Guide" href="/guide/index.html" collapse="true">
3447
<item name="JNDI&#xA0;Howto" href="/guide/jndi-howto.html"/>
3548
<item name="Class&#xA0;Diagrams" href="/guide/classdiagrams.html"/>
3649
<item name="Sequence&#xA0;Diagrams" href="/guide/sequencediagrams.html"/>
37-
</item>
38-
<item name="Examples" href="https://gitbox.apache.org/repos/asf?p=commons-dbcp.git;a=tree;f=doc;hb=HEAD"/>
39-
<item name="Downloads" href="/download_dbcp.cgi"/>
40-
<item name="Wiki" href="https://wiki.apache.org/commons/DBCP"/>
41-
</menu>
42-
43-
<menu name="Development">
44-
<item name="History" href="/changes.html"/>
4550
<item name="Building" href="/building.html"/>
46-
<item name="Mailing&#xA0;Lists" href="/mail-lists.html"/>
47-
<item name="Issue&#xA0;Tracking" href="/issue-tracking.html"/>
48-
<item name="Team" href="/team.html"/>
49-
<item name="Source&#xA0;Repository" href="/scm.html"/>
50-
</menu>
51-
52-
</body>
53-
</project>
51+
</item>
52+
<item name="Examples" href="https://gitbox.apache.org/repos/asf?p=commons-dbcp.git;a=tree;f=doc;hb=HEAD"/>
53+
<item name="Downloads" href="/download_dbcp.cgi"/>
54+
<item name="Wiki" href="https://wiki.apache.org/commons/DBCP"/>
55+
</menu>
56+
</body>
57+
</site>

src/site/xdoc/building.xml

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,52 @@
11
<?xml version="1.0"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
10-
https://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
18-
<document xmlns="http://maven.apache.org/XDOC/2.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional
3+
information regarding copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except
4+
in compliance with the License. You may obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
5+
in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
6+
the License for the specific language governing permissions and limitations under the License. -->
7+
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
208
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
21-
<properties>
22-
<title>Building</title>
23-
<author email="[email protected]">Apache Commons Team</author>
24-
</properties>
25-
<body>
26-
<!-- ================================================== -->
27-
<section name="Overview">
28-
<p>
29-
Commons DBCP uses <a href="https://maven.apache.org">Maven</a> or
30-
<a href="https://ant.apache.org">Ant</a> as a build system.
31-
The maven build requires maven 2 and JDK 1.6. The Ant build works with
32-
JDK 1.4, 1.5 or 1.6.
33-
</p>
34-
</section>
35-
<!-- ================================================== -->
36-
<section name="Maven Goals">
37-
<p>
38-
To build a jar file, change into DBCP's root directory and run
39-
<strong><code>mvn package</code></strong>.
40-
The result will be in the "target" subdirectory.
41-
</p>
42-
<p>
43-
To build the Javadocs, run <strong><code>mvn javadoc:javadoc</code></strong>.
44-
The result will be in "target/site/apidocs/".
45-
</p>
46-
<p>
47-
To build the full website, run <strong><code>mvn site</code></strong>.
48-
The result will be in "target/site".
49-
</p>
50-
</section>
9+
<properties>
10+
<title>Building</title>
11+
<author email="[email protected]">Apache Commons Team</author>
12+
</properties>
13+
<body>
14+
<section name="Overview">
15+
<p>
16+
Commons DBCP uses
17+
<a href="https://maven.apache.org">Maven</a>
18+
or
19+
<a href="https://ant.apache.org">Ant</a>
20+
as a build system.
21+
The maven build requires maven 3 and JDK 8.
22+
</p>
23+
</section>
24+
<section name="Maven Goals">
25+
<p>
26+
To build a jar file, change into DBCP's root directory and run
27+
<strong>
28+
<code>mvn clean package</code>
29+
</strong>
30+
.
31+
The result will be in the "target" subdirectory.
32+
</p>
33+
<p>
34+
To build the Javadocs, run
35+
<strong>
36+
<code>mvn clean javadoc:javadoc</code>
37+
</strong>
38+
.
39+
The result will be in "target/site/apidocs/".
40+
</p>
41+
<p>
42+
To build the full website, run
43+
<strong>
44+
<code>mvn clean verify site</code>
45+
</strong>
46+
.
47+
The result will be in "target/site".
48+
</p>
49+
</section>
5150

52-
<!-- ================================================== -->
53-
</body>
51+
</body>
5452
</document>

src/site/xdoc/guide/index.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@
2626
<body>
2727

2828
<section name="BasicDataSource">
29-
<center>
3029
<img src="../images/uml/BasicDataSource.gif" alt="Basic data source"/>
31-
</center>
3230
</section>
3331

3432
<section name="ConnectionFactory">
35-
<center>
3633
<img src="../images/uml/ConnectionFactory.gif" alt="Connection factory" />
37-
</center>
3834
</section>
3935

4036
</body>

0 commit comments

Comments
 (0)