(logging-log4j2) 02/02: Fix `.htaccess` after removal of pages

[pk...@apache.org]

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

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

commit ef64024fd37654eafd5efb3d817ab4dd77faa4d0
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu May 30 12:34:49 2024 +0200

    Fix `.htaccess` after removal of pages
    
    When we remove a page like `log4j-api.html`, the strange
    redirect from `log4j-api.html/index.html` must be converted back to the
    "normal" redirect from `log4j-api/index.html`.
---
 src/site/resources/.htaccess | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index 75d84b1dd7..b3d3352d02 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -33,9 +33,19 @@ RewriteRule "^(.+)$" "$1.html"
 
 # The content moved between pages
 RewriteRule "^articles\.html$" "manual/index.html" [R=permanent]
+RewriteRule "^log4j-api/apidocs(.*)$" "javadoc/log4j-api$1" [R=permanent]
+RewriteRule "^log4j-api/index\.html$" "manual/api.html" [R=permanent]
 RewriteRule "^log4j-core/apidocs(.*)$" "javadoc/log4j-core$1" [R=permanent]
+RewriteRule "^log4j-jcl/index\.html$" "manual/installation.html#impl-core-bridge-jcl" [R=permanent]
+RewriteRule "^log4j-jmx-gui/index\.html$" "/log4j/jmx-gui/latest/index.html" [R=permanent]
+RewriteRule "^log4j-jpl/index\.html$" "manual/installation.html#impl-core-bridge-jpl" [R=permanent]
+RewriteRule "^log4j-jul/index\.html$" "manual/installation.html#impl-core-bridge-jul" [R=permanent]
 RewriteRule "^log4j-mongodb3\.html$" "manual/appenders.html#NoSQLAppenderMongoDB" [R=permanent]
+RewriteRule "^log4j-mongodb3/index\.html$" "manual/appenders.html#NoSQLAppenderMongoDB" [R=permanent]
 RewriteRule "^log4j-mongodb4\.html$" "manual/appenders.html#log4j-mongodb4" [R=permanent]
+RewriteRule "^log4j-mongodb4/index\.html$" "manual/appenders.html#log4j-mongodb4" [R=permanent]
+RewriteRule "^log4j-slf4j-impl/index\.html$" "manual/installation.html#impl-core-bridge-slf4j" [R=permanent]
+RewriteRule "^log4j-slf4j2-impl/index\.html$" "manual/installation.html#impl-core-bridge-slf4j" [R=permanent]
 RewriteRule "^manual/api-separation\.html$" "manual/api.html" [R=permanent]
 RewriteRule "^manual/scala-api\.html$" "/log4j/scala/latest/index.html" [R=permanent]
 RewriteRule "^manual/usage\.html$" "manual/api.html" [R=permanent]
@@ -50,8 +60,6 @@ RewriteRule "^thanks\.html$" "/support.html#sponsors" [R=permanent]
 #
 # if the URI path is `/log4j/2.x/log4j-api/foo` we must match `log4j-api.html/foo`.
 RewriteRule "^log4j-1\.2-api\.html/index\.html$" "log4j-1.2-api.html" [R=permanent]
-RewriteRule "^log4j-api\.html/apidocs(.*)$" "javadoc/log4j-api$1" [R=permanent]
-RewriteRule "^log4j-api\.html/index\.html" "manual/api.html" [R=permanent]
 RewriteRule "^log4j-appserver\.html/index\.html$" "log4j-appserver.html" [R=permanent]
 RewriteRule "^log4j-cassandra\.html/index\.html$" "log4j-cassandra.html" [R=permanent]
 RewriteRule "^log4j-couchdb\.html/index\.html$" "log4j-couchdb.html" [R=permanent]
@@ -59,14 +67,6 @@ RewriteRule "^log4j-docker\.html/index\.html$" "log4j-docker.html" [R=permanent]
 RewriteRule "^log4j-flume-ng\.html/index\.html$" "log4j-flume-ng.html" [R=permanent]
 RewriteRule "^log4j-iostreams\.html/index\.html$" "log4j-iostreams.html" [R=permanent]
 RewriteRule "^log4j-jakarta-web\.html/index\.html$" "log4j-jakarta-web.html" [R=permanent]
-RewriteRule "^log4j-jcl\.html/index\.html$" "manual/installation.html#impl-core-bridge-jcl" [R=permanent]
-RewriteRule "^log4j-jmx-gui\.html/index\.html$" "/log4j/jmx-gui/latest/index.html" [R=permanent]
-RewriteRule "^log4j-jpl\.html/index\.html$" "manual/installation.html#impl-core-bridge-jpl" [R=permanent]
-RewriteRule "^log4j-jul\.html/index\.html$" "manual/installation.html#impl-core-bridge-jul" [R=permanent]
-RewriteRule "^log4j-mongodb3\.html/index\.html$" "manual/appenders.html#NoSQLAppenderMongoDB" [R=permanent]
-RewriteRule "^log4j-mongodb4\.html/index\.html$" "manual/appenders.html#log4j-mongodb4" [R=permanent]
-RewriteRule "^log4j-slf4j-impl\.html/index\.html$" "manual/installation.html#impl-core-bridge-slf4j" [R=permanent]
-RewriteRule "^log4j-slf4j2-impl\.html/index\.html$" "manual/installation.html#impl-core-bridge-slf4j" [R=permanent]
 RewriteRule "^log4j-spring-boot\.html/index\.html$" "log4j-spring-boot.html" [R=permanent]
 RewriteRule "^log4j-spring-cloud-config\.html/index\.html$" "log4j-spring-cloud-config.html" [R=permanent]
 RewriteRule "^log4j-spring-cloud-config-client\.html/index\.html$" "log4j-spring-cloud-config-client.html" [R=permanent]