From f9f30f6e1ef356160bc53f2bb5611a7b65e2b272 Mon Sep 17 00:00:00 2001
From: UmaShankar Avagadda <umagmrit@gmail.com>
Date: Mon, 17 Oct 2022 10:16:23 +0000
Subject: [PATCH] ZBUG-2991:use cwd of jetty process path for zimlets-deployed
 directory

---
 conf/jetty/jetty.xml.production | 4 ++--
 conf/jetty/jettyrc              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/jetty/jetty.xml.production b/conf/jetty/jetty.xml.production
index 02ce0ec..2ce0d24 100644
--- a/conf/jetty/jetty.xml.production
+++ b/conf/jetty/jetty.xml.production
@@ -827,8 +827,8 @@
         <New class="org.eclipse.jetty.util.resource.ResourceCollection">
           <Arg>
             <Array type="String">
-              <Item><SystemProperty name="jetty.zimlet.base" default="."/>/webapps/zimlet</Item>
-              <Item><SystemProperty name="jetty.zimlet.base" default="."/>/../zimlets-deployed</Item>
+		    <Item><SystemProperty name="jetty.base" default="."/>/webapps/zimlet</Item>
+		    <Item>./../zimlets-deployed</Item>
             </Array>
           </Arg>
         </New>
diff --git a/conf/jetty/jettyrc b/conf/jetty/jettyrc
index 9edb105..2111360 100644
--- a/conf/jetty/jettyrc
+++ b/conf/jetty/jettyrc
@@ -1,5 +1,5 @@
-JAVA_OPTIONS="-DSTART=${JETTY_BASE}/etc/start.config -DSTOP.PORT=7867 -DSTOP.KEY=stop -Dzimbra.config=/opt/zimbra/conf/localconfig.xml -Djava.library.path=/opt/zimbra/lib -Djava.endorsed.dirs=${JETTY_BASE}/common/endorsed -Djetty.home=${JETTY_HOME} -Djetty.base=${JETTY_BASE} -Djetty.zimlet.base=${JETTY_ZIMLET_BASE}"
+JAVA_OPTIONS="-DSTART=${JETTY_BASE}/etc/start.config -DSTOP.PORT=7867 -DSTOP.KEY=stop -Dzimbra.config=/opt/zimbra/conf/localconfig.xml -Djava.library.path=/opt/zimbra/lib -Djava.endorsed.dirs=${JETTY_BASE}/common/endorsed -Djetty.home=${JETTY_HOME} -Djetty.base=${JETTY_BASE}"
 JETTY_CONSOLE=/opt/zimbra/log/jetty.out
 JETTY_RUN=/opt/zimbra/log
-JETTY_ARGS=" --module=zimbra,server,mail,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,continuation,webapp jetty.home=${JETTY_HOME} jetty.base=${JETTY_BASE} jetty.zimlet.base=${JETTY_ZIMLET_BASE}"
+JETTY_ARGS=" --module=zimbra,server,mail,servlet,servlets,jsp,jstl,jmx,resources,websocket,ext,plus,rewrite,continuation,webapp jetty.home=${JETTY_HOME} jetty.base=${JETTY_BASE}"
 CONFIGS="etc/jetty.xml"