(jena) branch main updated: GH-2448: Disable automatic Shiro initialization

[andy]

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

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new dbc69767e6 GH-2448: Disable automatic Shiro initialization
dbc69767e6 is described below

commit dbc69767e6d4570710c4207fe64d096b7d4818b0
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Sun May 5 16:56:59 2024 +0100

    GH-2448: Disable automatic Shiro initialization
---
 jena-fuseki2/jena-fuseki-core/pom.xml                         |  2 +-
 .../jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml        | 11 +++++++++--
 pom.xml                                                       |  4 +---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml 
b/jena-fuseki2/jena-fuseki-core/pom.xml
index 525a37424e..b2cb3166c3 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -80,7 +80,7 @@
     <!--
         jena-fuseki-core is independent of Jetty.
         This needs to be in-step with Jetty.
-        The version ismanaged in the top Jena POM.
+        The version is managed in the top Jena POM.
     -->
     <dependency>
       <groupId>jakarta.servlet</groupId>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml 
b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
index 8d12477fa3..2a097f3508 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
@@ -35,9 +35,16 @@
      -->
     
<listener-class>org.apache.jena.fuseki.webapp.ShiroEnvironmentLoader</listener-class>
   </listener>
-
+  
+  <!-- 
+       Disable Shiro automatic initialization. This allows us to order the 
listeners. 
+  -->
+  <context-param>
+    <param-name>org.apache.shiro.ee.disabled</param-name>
+    <param-value>true</param-value>
+  </context-param>
+  
   <!-- Apache Jena Fuseki setup -->
-
   <listener>
     
<listener-class>org.apache.jena.fuseki.webapp.FusekiServerListener</listener-class>
   </listener>
diff --git a/pom.xml b/pom.xml
index 581a07dd24..5704448c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -603,9 +603,7 @@
         </exclusions>
       </dependency>
 
-      <!-- And intercept any uses of Jakarta Commons Logging 
-           e.g. Apache Common HTTP client. 
-      -->
+      <!-- Commons Logging intercept -->
 
       <dependency>
         <groupId>org.slf4j</groupId>