This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch ms12_conversion_of_md_files
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/ms12_conversion_of_md_files by 
this push:
     new 41610e4b63 added more links for components etc
41610e4b63 is described below

commit 41610e4b636aebf4704d989d4e1681d2180832d3
Author: Christian Grobmeier <[email protected]>
AuthorDate: Thu Mar 7 17:02:25 2024 +0100

    added more links for components etc
---
 src/asciidoc/templates/document.html.erb |  5 +--
 src/site/asciidoc/components.adoc        | 43 ++++++++++++++++++++++++++
 src/site/asciidoc/index.adoc             |  2 ++
 src/site/site.xml                        | 52 ++++++++++++++++----------------
 4 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/src/asciidoc/templates/document.html.erb 
b/src/asciidoc/templates/document.html.erb
index 720d8976ec..cb22867249 100644
--- a/src/asciidoc/templates/document.html.erb
+++ b/src/asciidoc/templates/document.html.erb
@@ -76,15 +76,16 @@
         </li>
         <li><a href="/release-notes.html">Release Notes</a></li>
         <li><a href="/support.html">Support</a></li>
-        <li><a href="/security.html">Security</a></li>
         <li><a href="#">Contribute <i class="fa fa-chevron-circle-down" 
aria-hidden="true"></i></a>
           <ul class="menu-drop-down">
             <li><a href="/guidelines.html">Guidelines</a></li>
+            <li><a href="/components.html">Components</a></li>
             <li><a href="/javastyle.html">Style Guide</a></li>
             <li><a 
href="https://analysis.apache.org/dashboard/index/org.apache.logging.log4j:log4j";>Sonar</a></li>
             <li><a 
href="https://github.com/apache/logging-log4j2";>GitHub</a></li>
           </ul>
         </li>
+        <li><a href="/security.html">Security</a></li>
       </ul>
     </nav>
 
@@ -145,8 +146,8 @@
             <li><a href="/download.html">Downloads</a></li>
             <li><a href="#">Release Notes</a></li>
             <li><a href="#">Support</a></li>
-            <li><a href="#">Security</a></li>
             <li><a href="#">Contribute</a></li>
+            <li><a href="#">Security</a></li>
           </ul>
         </div>
         <div>
diff --git a/src/site/asciidoc/components.adoc 
b/src/site/asciidoc/components.adoc
new file mode 100644
index 0000000000..abd6b09d62
--- /dev/null
+++ b/src/site/asciidoc/components.adoc
@@ -0,0 +1,43 @@
+////
+    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
+
+         http://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.
+////
+= Components of Apache Log4j
+
+== Internal Components
+
+* link:/log4j-api.html[API]
+* link:/log4j-core.html[Implementation]
+* link:/log4j-1.2-api.html[Log4j 1.2 API]
+* link:/log4j-slf4j-impl.html[SLF4J Binding]
+* link:/log4j-jul.html[JUL Adapter]
+* link:/log4j-jpl.html[JDK Platform Logger]
+* link:/log4j-to-slf4j.html[Log4j 2 to SLF4J Adapter]
+* link:/log4j-jdbc-dbcp2.html[JDBC Appender]
+* link:/log4j-flume-ng.html[Apache Flume Appender]
+* link:/log4j-mongodb4.html[MongoDB 4 appender]
+* link:/log4j-iostreams.html[IO Streams]
+* link:/log4j-docker.html[Docker Support]
+* link:/log4j-kubernetes.html[Kubernetes Support]
+* link:/log4j-spring-cloud-config-client.html[Spring Cloud Config Client]
+* link:/log4j-transform[Log4j Transformation Tools]
+
+== External Components
+
+* link:/log4j/jakarta[Log4j Jakarta EE]
+* link:/log4j/jmx-gui[Log4j JMX GUI]
+* link:/log4j/tools[Log4j Tools]
+* link:/log4j/transform[Log4j Transformation Tools]
+
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 97f33baf74..be1d8f4d69 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -21,6 +21,8 @@ Apache Log4j is a versatile, industrial-grade Java logging 
framework composed of
 Log4j is 
https://security.googleblog.com/2021/12/apache-log4j-vulnerability.html[used by 
8% of the Maven ecosystem] and listed as one of 
https://docs.google.com/spreadsheets/d/1ONZ4qeMq8xmeCHX03lIgIYE4MEXVfVL6oj05lbuXTDM/edit#gid=1024997528[the
 top 100 critical open source software projects].
 The project is actively maintained by a link:team.html[team] of several 
volunteers and xref:support.adoc[support]ed by a big community.
 
+As all software maintained at the Apache Software Foundation, Apache Log4j is 
released under the link:https://www.apache.org/licenses/LICENSE-2.0[Apache 
License, Version 2.0].
+
 [#links]
 == Quick links
 - link:maven-artifacts.html[How can I add Log4j artifacts to my 
Maven/Ivy/Gradle project?]
diff --git a/src/site/site.xml b/src/site/site.xml
index c0834bf067..bb40d21658 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -277,30 +277,30 @@
 <!--      <item name="Log4j 2.x - Latest release for Java 8" 
href="http://logging.apache.org/log4j/2.x/"/>-->
 <!--    </menu>-->
 
-    <menu name="Internal Components" inherit="top">
-      <item name="API" href="log4j-api.html"/>
-      <item name="Implementation" href="log4j-core.html"/>
-      <item name="Log4j 1.2 API" href="log4j-1.2-api.html"/>
-      <item name="SLF4J Binding" href="log4j-slf4j-impl.html"/>
-      <item name="JUL Adapter" href="log4j-jul.html"/>
-      <item name="JDK Platform Logger" href="log4j-jpl.html"/>
-      <item name="Log4j 2 to SLF4J Adapter" href="log4j-to-slf4j.html"/>
-      <item name="JDBC Appender" href="log4j-jdbc-dbcp2.html"/>
-      <item name="Apache Flume Appender" href="log4j-flume-ng.html"/>
-      <item name="MongoDB 4 appender" href="log4j-mongodb4.html"/>
-      <item name="IO Streams" href="log4j-iostreams.html"/>
-      <item name="Docker Support" href="log4j-docker.html"/>
-      <item name="Kubernetes Support" href="log4j-kubernetes.html"/>
-      <item name="Spring Cloud Config Client" 
href="log4j-spring-cloud-config-client.html"/>
-      <item name="Log4j Transformation Tools" href="log4j-transform"/>
-    </menu>
+<!--    <menu name="Internal Components" inherit="top">-->
+<!--      <item name="API" href="log4j-api.html"/>-->
+<!--      <item name="Implementation" href="log4j-core.html"/>-->
+<!--      <item name="Log4j 1.2 API" href="log4j-1.2-api.html"/>-->
+<!--      <item name="SLF4J Binding" href="log4j-slf4j-impl.html"/>-->
+<!--      <item name="JUL Adapter" href="log4j-jul.html"/>-->
+<!--      <item name="JDK Platform Logger" href="log4j-jpl.html"/>-->
+<!--      <item name="Log4j 2 to SLF4J Adapter" href="log4j-to-slf4j.html"/>-->
+<!--      <item name="JDBC Appender" href="log4j-jdbc-dbcp2.html"/>-->
+<!--      <item name="Apache Flume Appender" href="log4j-flume-ng.html"/>-->
+<!--      <item name="MongoDB 4 appender" href="log4j-mongodb4.html"/>-->
+<!--      <item name="IO Streams" href="log4j-iostreams.html"/>-->
+<!--      <item name="Docker Support" href="log4j-docker.html"/>-->
+<!--      <item name="Kubernetes Support" href="log4j-kubernetes.html"/>-->
+<!--      <item name="Spring Cloud Config Client" 
href="log4j-spring-cloud-config-client.html"/>-->
+<!--      <item name="Log4j Transformation Tools" href="log4j-transform"/>-->
+<!--    </menu>-->
 
-    <menu name="External Components">
-      <item name="Log4j Jakarta EE" href="/log4j/jakarta"/>
-      <item name="Log4j JMX GUI" href="/log4j/jmx-gui"/>
-      <item name="Log4j Tools" href="/log4j/tools"/>
-      <item name="Log4j Transformation Tools" href="/log4j/transform"/>
-    </menu>
+<!--    <menu name="External Components">-->
+<!--      <item name="Log4j Jakarta EE" href="/log4j/jakarta"/>-->
+<!--      <item name="Log4j JMX GUI" href="/log4j/jmx-gui"/>-->
+<!--      <item name="Log4j Tools" href="/log4j/tools"/>-->
+<!--      <item name="Log4j Transformation Tools" href="/log4j/transform"/>-->
+<!--    </menu>-->
 
     <menu name="Project Information">
       <item name="Project Team" href="/team.html" />
@@ -308,9 +308,9 @@
       <item name="Source Repository" 
href="https://github.com/apache/logging-log4j2/tree/main"; />
     </menu>
 
-    <menu name="Project Reports">
-      <item name="RAT Report" href="/rat-report.html" />
-    </menu>
+<!--    <menu name="Project Reports">-->
+<!--      <item name="RAT Report" href="/rat-report.html" />-->
+<!--    </menu>-->
     <footer><![CDATA[<p align="center">Copyright &copy; 
${project.inceptionYear}-${currentYear} <a class="external" 
href="http://www.apache.org";>The Apache Software Foundation</a>. All Rights 
Reserved.<br>
       Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, 
and the Apache Logging project logo are trademarks of The Apache Software 
Foundation.</p>]]>
     </footer>

Reply via email to