XWIKI-22416: Reuse the standard jetty context file from the WAR in th…

…e XJetty Debian package
xwiki · Aug 13, 2024 · 2db1a08 · 2db1a08
1 parent 03e8901
commit 2db1a08
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 98 deletions.
diff --git a/...tion/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml b/...tion/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
@@ -300,6 +300,18 @@
               <linkName>/usr/lib/xwiki/WEB-INF/sun-web.xml</linkName>
               <linkTarget>/etc/xwiki/sun-web.xml</linkTarget>
             </data>
+            <data>
+              <type>link</type>
+              <symlink>true</symlink>
+              <linkName>/usr/lib/xwiki/WEB-INF/jetty-web.xml</linkName>
+              <linkTarget>/etc/xwiki/jetty-web.xml</linkTarget>
+            </data>
+            <data>
+              <type>link</type>
+              <symlink>true</symlink>
+              <linkName>/usr/lib/xwiki/WEB-INF/jetty-ee8-web.xml</linkName>
+              <linkTarget>/etc/xwiki/jetty-ee8-web.xml</linkTarget>
+            </data>
             <data>
               <type>link</type>
               <symlink>true</symlink>

diff --git a/...tform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml b/...tform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
@@ -192,17 +192,11 @@
               <linkTarget>/var/lib/xwiki/tmp</linkTarget>
             </data>
 
-            <!-- Custom Jetty context configuration -->
+            <!-- Be more explicit about which configuration file is used by XJetty -->
             <data>
               <type>link</type>
               <symlink>true</symlink>
-              <linkName>/usr/lib/xwiki/WEB-INF/jetty-web.xml</linkName>
-              <linkTarget>/etc/xwiki/jetty-web.xml</linkTarget>
-            </data>
-            <data>
-              <type>link</type>
-              <symlink>true</symlink>
-              <linkName>/usr/lib/xwiki/WEB-INF/jetty-ee8-web.xml</linkName>
+              <linkName>/usr/lib/xwiki/WEB-INF/xjetty-web.xml</linkName>
               <linkTarget>/etc/xwiki/jetty-ee8-web.xml</linkTarget>
             </data>
           </dataSet>

diff --git a/...-platform-distribution-debian-xjetty-common/src/deb/resources/etc/xwiki/jetty-ee8-web.xml b/...-platform-distribution-debian-xjetty-common/src/deb/resources/etc/xwiki/jetty-ee8-web.xml
diff --git a/...wiki-platform-distribution-debian-xjetty-common/src/deb/resources/etc/xwiki/jetty-web.xml b/...wiki-platform-distribution-debian-xjetty-common/src/deb/resources/etc/xwiki/jetty-web.xml