This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 123d9a8369d9fd4ff725ae9314a66e5c3a67e725 Author: Gary Gregory <[email protected]> AuthorDate: Fri Nov 21 14:03:24 2025 +0000 Update site to common menu and oak leaf logo --- src/media/commons-logo-component-100.xcf | Bin 0 -> 26093 bytes src/media/commons-logo-component.xcf | Bin 0 -> 154413 bytes src/media/dbcp-logo-white.xcf | Bin 24281 -> 0 bytes src/media/logo.png | Bin 0 -> 9948 bytes src/site/resources/images/dbcp-logo-blue.jpg | Bin 5495 -> 0 bytes src/site/resources/images/dbcp-logo-white.png | Bin 12322 -> 0 bytes src/site/resources/images/logo.png | Bin 0 -> 9948 bytes src/site/site.xml | 66 +++++++++-------- src/site/xdoc/building.xml | 98 +++++++++++++------------- src/site/xdoc/guide/index.xml | 4 -- src/site/xdoc/security.xml | 51 ++++++++++++++ 11 files changed, 134 insertions(+), 85 deletions(-) diff --git a/src/media/commons-logo-component-100.xcf b/src/media/commons-logo-component-100.xcf new file mode 100644 index 00000000..1470801a Binary files /dev/null and b/src/media/commons-logo-component-100.xcf differ diff --git a/src/media/commons-logo-component.xcf b/src/media/commons-logo-component.xcf new file mode 100644 index 00000000..a3686138 Binary files /dev/null and b/src/media/commons-logo-component.xcf differ diff --git a/src/media/dbcp-logo-white.xcf b/src/media/dbcp-logo-white.xcf deleted file mode 100644 index 298aa9b0..00000000 Binary files a/src/media/dbcp-logo-white.xcf and /dev/null differ diff --git a/src/media/logo.png b/src/media/logo.png new file mode 100644 index 00000000..afc81328 Binary files /dev/null and b/src/media/logo.png differ diff --git a/src/site/resources/images/dbcp-logo-blue.jpg b/src/site/resources/images/dbcp-logo-blue.jpg deleted file mode 100644 index 2b62a80e..00000000 Binary files a/src/site/resources/images/dbcp-logo-blue.jpg and /dev/null differ diff --git a/src/site/resources/images/dbcp-logo-white.png b/src/site/resources/images/dbcp-logo-white.png deleted file mode 100644 index 65d33ff6..00000000 Binary files a/src/site/resources/images/dbcp-logo-white.png and /dev/null differ diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png new file mode 100644 index 00000000..afc81328 Binary files /dev/null and b/src/site/resources/images/logo.png differ diff --git a/src/site/site.xml b/src/site/site.xml index ca05e362..94d35874 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -15,39 +15,43 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project name="Apache Commons DBCP" - xmlns="http://maven.apache.org/DECORATION/1.8.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd";> - <bannerRight> - <name>Commons DBCP</name> - <src>/images/dbcp-logo-white.png</src> - <href>/index.html</href> +<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 DBCP"> + <bannerRight name="Commons DBCP" href="/index.html"> + <image src="/images/logo.png"/> </bannerRight> - <body> - <menu name="Commons DBCP"> - <item name="Overview" href="/index.html" /> - <item name="Configuration" href="/configuration.html" /> - <item name="Javadoc" href="/apidocs/index.html"/> - <item name="Javadoc 2.x Archive" href="https://javadoc.io/doc/org.apache.commons/commons-dbcp2/latest/index.html"/> - <item name="Javadoc 1.x Archive" href="https://javadoc.io/doc/commons-dbcp/commons-dbcp/latest/index.html"/> - <item name="Developers Guide" href="/guide/index.html" collapse="true"> + <body> + <menu name="Commons DBCP"> + <!-- 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="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="/download_dbcp.cgi" /> + <item name="Javadoc"> + <item name="Javadoc Current" href="/apidocs/index.html" /> + <item name="Javadoc 2.x Archive" href="https://javadoc.io/doc/org.apache.commons/commons-dbcp2/latest/index.html"; /> + <!-- Specify 1.4 otherwise 20030821.193421 is used --> + <item name="Javadoc 1.x Archive" href="https://javadoc.io/doc/commons-dbcp/commons-dbcp/1.4/index.html"; /> + </item> + <!-- End: For all components. --> + <item name="Configuration" href="/configuration.html" /> + <item name="Developers Guide" href="/guide/index.html" collapse="true"> <item name="JNDI Howto" href="/guide/jndi-howto.html"/> <item name="Class Diagrams" href="/guide/classdiagrams.html"/> <item name="Sequence Diagrams" href="/guide/sequencediagrams.html"/> - </item> - <item name="Examples" href="https://gitbox.apache.org/repos/asf?p=commons-dbcp.git;a=tree;f=doc;hb=HEAD"/> - <item name="Downloads" href="/download_dbcp.cgi"/> - <item name="Wiki" href="https://wiki.apache.org/commons/DBCP"/> - </menu> - - <menu name="Development"> - <item name="History" href="/changes.html"/> <item name="Building" href="/building.html"/> - <item name="Mailing Lists" href="/mail-lists.html"/> - <item name="Issue Tracking" href="/issue-tracking.html"/> - <item name="Team" href="/team.html"/> - <item name="Source Repository" href="/scm.html"/> - </menu> - - </body> -</project> + </item> + <item name="Examples" href="https://gitbox.apache.org/repos/asf?p=commons-dbcp.git;a=tree;f=doc;hb=HEAD"/> + <item name="Downloads" href="/download_dbcp.cgi"/> + <item name="Wiki" href="https://wiki.apache.org/commons/DBCP"/> + </menu> + </body> +</site> diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml index 7b35e22f..8b562274 100644 --- a/src/site/xdoc/building.xml +++ b/src/site/xdoc/building.xml @@ -1,54 +1,52 @@ <?xml version="1.0"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional 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 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 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 the License for the specific language governing permissions and -limitations under the License. ---> -<document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional + 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 + 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 + 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 + the License for the specific language governing permissions and limitations under the License. --> +<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 https://maven.apache.org/xsd/xdoc-2.0.xsd";> - <properties> - <title>Building</title> - <author email="[email protected]">Apache Commons Team</author> - </properties> -<body> -<!-- ================================================== --> -<section name="Overview"> -<p> - Commons DBCP uses <a href="https://maven.apache.org";>Maven</a> or - <a href="https://ant.apache.org";>Ant</a> as a build system. - The maven build requires maven 2 and JDK 1.6. The Ant build works with - JDK 1.4, 1.5 or 1.6. -</p> -</section> -<!-- ================================================== --> -<section name="Maven Goals"> - <p> - To build a jar file, change into DBCP's root directory and run - <strong><code>mvn package</code></strong>. - The result will be in the "target" subdirectory. - </p> - <p> - To build the Javadocs, run <strong><code>mvn javadoc:javadoc</code></strong>. - The result will be in "target/site/apidocs/". - </p> - <p> - To build the full website, run <strong><code>mvn site</code></strong>. - The result will be in "target/site". - </p> -</section> + <properties> + <title>Building</title> + <author email="[email protected]">Apache Commons Team</author> + </properties> + <body> + <section name="Overview"> + <p> + Commons DBCP uses + <a href="https://maven.apache.org";>Maven</a> + or + <a href="https://ant.apache.org";>Ant</a> + as a build system. + The maven build requires maven 3 and JDK 8. + </p> + </section> + <section name="Maven Goals"> + <p> + To build a jar file, change into DBCP's root directory and run + <strong> + <code>mvn clean package</code> + </strong> + . + The result will be in the "target" subdirectory. + </p> + <p> + To build the Javadocs, run + <strong> + <code>mvn clean javadoc:javadoc</code> + </strong> + . + The result will be in "target/site/apidocs/". + </p> + <p> + To build the full website, run + <strong> + <code>mvn clean verify site</code> + </strong> + . + The result will be in "target/site". + </p> + </section> -<!-- ================================================== --> -</body> + </body> </document> diff --git a/src/site/xdoc/guide/index.xml b/src/site/xdoc/guide/index.xml index afb1ab28..f676881d 100644 --- a/src/site/xdoc/guide/index.xml +++ b/src/site/xdoc/guide/index.xml @@ -26,15 +26,11 @@ <body> <section name="BasicDataSource"> - <center> <img src="../images/uml/BasicDataSource.gif" alt="Basic data source"/> - </center> </section> <section name="ConnectionFactory"> - <center> <img src="../images/uml/ConnectionFactory.gif" alt="Connection factory" /> - </center> </section> </body> diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml new file mode 100644 index 00000000..8f27e464 --- /dev/null +++ b/src/site/xdoc/security.xml @@ -0,0 +1,51 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional 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 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 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 the License for the + specific language governing permissions and limitations + under the License. +--> +<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 https://maven.apache.org/xsd/xdoc-2.0.xsd";> + <properties> + <title>Apache Commons Security Reports</title> + <author email="[email protected]">Apache Commons Team</author> + </properties> + <body> + <section name="About Security"> + <p> + For information about reporting or asking questions about security, please see + <a href="https://commons.apache.org/security.html";>Apache Commons Security</a>. + </p> + <p>This page lists all security vulnerabilities fixed in released versions of this component. + </p> + <p>Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the component version + that you are using. + </p> + <p> + If you need help on building this component or other help on following the instructions to mitigate the known vulnerabilities listed here, please send + your questions to the public + <a href="mail-lists.html">user mailing list</a>. + </p> + <p>If you have encountered an unlisted security vulnerability or other unexpected behavior that has security impact, or if the descriptions here are + incomplete, please report them privately to the Apache Security Team. Thank you. + </p> + </section> + <section name="Security Vulnerabilities"> + <p>None.</p> + </section> + </body> +</document>
