Skip to content

Commit 42fb063

Browse files
committed
XWIKI-23438: XJetty allow accessing any application file through URL
XWIKI-22840: XML schema warnings on Jetty EE10
1 parent 8b68d8a commit 42fb063

File tree

1 file changed

+4
-3
lines changed
  • xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources

1 file changed

+4
-3
lines changed

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/start_xwiki.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,13 @@ mkdir -p $XWIKI_DATA_DIR 2>/dev/null
194194
mkdir -p $XWIKI_DATA_DIR/logs 2>/dev/null
195195

196196
# Set up the Jetty Base directory (used for custom Jetty configuration) to be the current directory where this file is.
197+
# Jetty does not work well with a relative directory, so we resolve the absolute one
198+
JETTY_BASE=`pwd`
197199
# Also make sure the log directory exists since Jetty won't create it.
198-
JETTY_BASE=.
199200
mkdir -p $JETTY_BASE/logs 2>/dev/null
200201

201-
# Specify Jetty's home directory to be the directory named jetty inside the jetty base directory.
202-
JETTY_HOME=jetty
202+
# Specify Jetty's home directory to be the directory named "jetty" inside the Jetty base directory.
203+
JETTY_HOME="$JETTY_BASE/jetty"
203204
XWIKI_OPTS="$XWIKI_OPTS -Djetty.home=$JETTY_HOME -Djetty.base=$JETTY_BASE"
204205

205206
# Specify the encoding to use

0 commit comments

Comments
 (0)