6dd37d8 Update to use new module.
build/build.sh | 9 +-
readme.md | 21 +++--
src/README.TXT | 15 ++--
src/lucee-base/etc/lucee-servlets.xml (gone) | 90 --------------------
src/lucee-base/etc/readme.md (gone) | 13 ---
src/lucee-base/etc/rewrite-rules.xml (gone) | 32 -------
src/lucee-base/lib/ext/readme.md (gone) | 10 ---
src/lucee-base/modules/lucee.mod | 16 +++-
src/lucee-base/modules/lucee/etc/lucee-global-webapp-common.xml (new) | 14 +++
src/lucee-base/modules/lucee/etc/lucee-rewrite-rules.xml (new) | 35 ++++++++
src/lucee-base/modules/lucee/etc/lucee-servlets.xml (new) | 68 +++++++++++++++
src/lucee-base/modules/lucee/etc/lucee-webapp-common.xml (new) | 8 ++
src/lucee-base/modules/lucee/lib/lucee_jar_goes_here (new) | 0
src/lucee-base/modules/readme.md | 3 +-
src/lucee-base/readme.md | 19 +++--
src/lucee-base/start.ini | 7 +-
src/lucee-base/webapps/ROOT.xml | 2 -
src/lucee-base/webapps/readme.md | 6 --
18 files changed, 178 insertions(+), 190 deletions(-)
diff --git a/build/build.sh b/build/build.sh
index 579164a..e7808f3 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -12,7 +12,7 @@ if [ -z $JettyFile ]; then
fi
if [ -z $LuceeFile ]; then
- echo "Specify --lucee=/path/to/lucee-jars.zip"
+ echo "Specify --lucee=/path/to/lucee.jar"
Errors=1
fi
@@ -54,17 +54,18 @@ fi
mv jetty-distribution-* jetty-home
echo "3/5 Extracing $LuceeFile"
-unzip -q $LuceeFile -d lucee-base/lib/ext/
+cp $LuceeFile lucee-base/modules/lucee/lib/
+rm lucee-base/modules/lucee/lib/lucee_jar_goes_here
JettyVersion=`echo $JettyFile | perl -ne 'print $_ =~ /jetty-distribution-([\d.]*)(?:(\.M\d)|\.v\d+)\.(?:zip|tgz|tar\.gz)$/'`
-LuceeVersion=`echo $LuceeFile | perl -ne 'print $_ =~ /lucee-([\d.]*)-jars\.(?:zip|tgz|tar\.gz)$/'`
+LuceeVersion=`echo $LuceeFile | perl -ne 'print $_ =~ /lucee-([\d.]*).jar$/'`
echo "4/5 Setting versions [$JettyVersion] and [$LuceeVersion]"
sed s/{JETTY_VERSION}/$JettyVersion/g < README.TXT > README.TMP
sed s/{LUCEE_VERSION}/$LuceeVersion/g < README.TMP > README.TXT
rm README.TMP
echo "5/5 Creating dist/$WorkingDir.tgz"
-mkdir -p ../../dist
+mkdir -p ../../dist
tar -czf ../../dist/$WorkingDir.tgz *
cd ..
rm -r $WorkingDir
diff --git a/readme.md b/readme.md
index e72c191..9f08c52 100644
--- a/readme.md
+++ b/readme.md
@@ -1,21 +1,24 @@
Lucee on Jetty
+* Version: 0.6
+* License: LGPLv3
+* Homepage: https://www.sorcerersisle.com/software/luje
+* Documentation: https://docs.sorcerersisle.com/luje
+* Repository: https://github.com/boughtonp/lucee-on-jetty.git
+* Issues: https://github.com/boughtonp/lucee-on-jetty/issues
+
Description
-----------
-Lucee on Jetty is a project to provide a Lucee package that is easy to use and
-provides a fully functional & capable web server, with extensive documentation
-on how everything has been done, so it can be understood and adapted as needed.
+Lucee on Jetty is a project offering a Lucee package that is easy to use and
+provides a fully functional & capable web server, whilst also documenting how
+everything has been done so it can be understood and adapted as needed.
This repository contains the template for bundling Lucee with Jetty. It uses
Jetty's home/base functionality to simplify the process and avoid the need to
modify the Jetty files.
-The project's homepage, including links to download the bundles, is at:
-
-> http://sorcerersisle.com/projects:lucee-on-jetty
-
How to build
------------
@@ -24,7 +27,7 @@ The build directory contains a bash build script, but the basic process is:
1. cp src -> {target}
2. unzip jetty-X.zip -> {target}/jetty-home
- 3. unzip lucee-jars.zip -> {target}/lucee-base/lib/ext/
+ 3. cp lucee-X.jar -> {target}/modules/lucee/lib
4. update versions in {target}/README.TXT
5. zip {target} lucee-on-jetty.zip
@@ -37,7 +40,7 @@ Licensing
Lucee on Jetty is a project created and maintained by Peter Boughton, licensed
under the LGPLv3, aside from the documentation and wiki which is CC BY-SA v4.0.
-This repository does not contain Lucee or Jetty themselves; these have their
+This repository does not contain Lucee or Jetty themselves; these have their
own licenses (Lucee: LGPLv2; Jetty: Apache License 2.0 or EPLv2).
diff --git a/src/README.TXT b/src/README.TXT
index f624cf5..6c01768 100644
--- a/src/README.TXT
+++ b/src/README.TXT
@@ -10,7 +10,7 @@ start-server script and you have a server running Lucee.
The file structure uses Jetty's home/base directory split - this means:
* The directory jetty-home is an unmodified copy of the latest Jetty release.
-* The directory lucee-base contains Lucee JARs and configuration.
+* The directory lucee-base contains the Lucee JAR and configuration.
(See readme file in lucee-base for further details.)
This bundle was created from the template at:
@@ -57,7 +57,7 @@ Lucee v{LUCEE_VERSION}
* Website: http://lucee.org
* Source: https://bitbucket.org/lucee/lucee
* License: LGPLv2
-* Files: lucee-base/lib/ext/*
+* Files: lucee-base/modules/lucee/lib/lucee*.jar
@@ -66,7 +66,7 @@ FAQ
> What port does it run on?
-The HTTP server will run on the port specified by the `jetty.port` setting in
+The HTTP server will run on the port specified by the `jetty.http.port` setting in
the lucee-base/start.ini config file, and uses the Jetty default of 8080. It can
be changed to any available port. Note that changes to start.ini require a Jetty
restart to be picked up.
@@ -104,13 +104,14 @@ Download a new Jetty distribution and replace the jetty-home directory with it.
> How is Lucee upgraded?
Use Lucee's own upgrade functionality (i.e. via admin, or an lco patch file).
-For major upgrades, replace lucee-base/lib/ext with a new Lucee JAR download.
+For major upgrades, replace the JAR in lucee-base/modules/lucee/lib/ with a
+new Lucee JAR download.
> I have a question not answered here?
-Check the documentation wiki:
- https://github.com/boughtonp/lucee-on-jetty/wiki
-
+Check the documentation:
+ https://docs.sorcerersisle.com/luje
+
If the answer is not there, raise an issue:
https://github.com/boughtonp/lucee-on-jetty/issues
diff --git a/src/lucee-base/etc/lucee-servlets.xml b/src/lucee-base/etc/lucee-servlets.xml
deleted file mode 100644
index 711d2bb..0000000
--- a/src/lucee-base/etc/lucee-servlets.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- metadata-complete="false"
- version="3.1"
- >
- <!--
- # lucee-servlets.xml
-
- This file is a partial web.xml file which configures the lucee servlets
- for a webapp context. It should be included into a context's XML config
- file using the overrideDescriptor, as described by the readme within the
- lucee-base/webapps directory.
- -->
-
- <!--
- ## Servlets
-
- The first servlet definition tells Jetty that any mapping referring to
- the "CFMLServlet" is referring to the specified Lucee servlet class.
- Additionally, it sets the lucee-server-directory and lucee-web-directory
- parameters to different paths, relative to the lucee-base directory.
-
- The second servlet is for Lucee's built-in REST functionality.
- The load-on-startup value specifies the order the servlets start in;
- Lucee's REST servlet must come after its CFML servlet.
- -->
- <servlet>
- <servlet-name>CFMLServlet</servlet-name>
- <servlet-class>lucee.loader.servlet.CFMLServlet</servlet-class>
- <init-param>
- <param-name>lucee-server-directory</param-name>
- <param-value>.</param-value>
- </init-param>
- <init-param>
- <param-name>lucee-web-directory</param-name>
- <param-value>webinfs/{web-context-label}/</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>RESTServlet</servlet-name>
- <servlet-class>lucee.loader.servlet.RestServlet</servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
-
- <!--
- ## Servlet Mappings
-
- Servlet mappings are what link a request URL to a servlet - any context
- including this configuration which receives a matching URL will send the
- request to the specified servlet.
-
- NOTE: The servlet specification only allows a single wildcard - Jetty's
- rewrite handler is used to enable index.cfm/path_info (see rewrite-rules.xml)
- and can be updated further to provide fully user-friendly URLs.
- -->
- <servlet-mapping>
- <servlet-name>CFMLServlet</servlet-name>
- <url-pattern>*.cfc</url-pattern>
- <url-pattern>*.cfm</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RESTServlet</servlet-name>
- <url-pattern>/rest/*</url-pattern>
- </servlet-mapping>
-
-
- <!--
- ## Welcome Files
-
- If a URL points to a directory rather than a file, the filenames listed
- here will be checked in order and the first one to match will be served
- instead of a directory listing.
-
- This list is checked AFTER the list in the jetty-home/etc/webdefault.xml
- config, thus if both index.html and index.cfm exist in a directory, the
- former is used.
- -->
- <welcome-file-list>
- <welcome-file>index.cfm</welcome-file>
- </welcome-file-list>
-
-
-</web-app>
\ No newline at end of file
diff --git a/src/lucee-base/etc/readme.md b/src/lucee-base/etc/readme.md
deleted file mode 100644
index fdeb5ed..0000000
--- a/src/lucee-base/etc/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Lucee on Jetty etc directory.
-
-The primary Lucee on Jetty readme is README.TXT in the top-level directory.
-
-This directory is where Jetty settings can be overridden.
-
-The **lucee-servlets.xml** file contains the servlet and servlet-mapping
-settings for the Lucee CFML and REST servlets. It is included in web context
-configuration using Jetty's overrideDescriptor functionality.
-
-The **rewrite-rules.xml** file configures Jetty's rewrite handler. It applies
-to all contexts, but rules can be grouped per virtualhost. Jetty's documentation
-is at: http://www.eclipse.org/jetty/documentation/current/rewrite-handler.html
diff --git a/src/lucee-base/etc/rewrite-rules.xml b/src/lucee-base/etc/rewrite-rules.xml
deleted file mode 100644
index 45fd119..0000000
--- a/src/lucee-base/etc/rewrite-rules.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!--
- # rewrite-rules.xml
-
- This file can be used to configure Jetty's Rewrite Handler. There are a
- variety of possible rewrite/redirect methods avaiable, so check the
- Jetty documentation for details:
- http://www.eclipse.org/jetty/documentation/current/rewrite-handler.html
- -->
-
- <Ref refid="Rewrite">
-
- <!--
- Rewrite {anyscript}.cfm/path_info URLs to {anyscript}.cfm so it is
- matched by Lucee's servlet mapping. (Lucee populates cgi.path_info
- from Jetty's requestedPath, which holds the original Request URI.)
- -->
- <Call name="addRule">
- <Arg>
- <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
- <Set name="regex">(.*?\.cfm)/.*</Set>
- <Set name="replacement">$1</Set>
- </New>
- </Arg>
- </Call>
-
- </Ref>
-
-</Configure>
\ No newline at end of file
diff --git a/src/lucee-base/lib/ext/readme.md b/src/lucee-base/lib/ext/readme.md
deleted file mode 100644
index 2b15da3..0000000
--- a/src/lucee-base/lib/ext/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Lucee on Jetty lib/ext directory.
-
-The primary Lucee on Jetty readme is README.TXT in the top-level directory.
-
-This lib/ext directory contains the Lucee JAR files. Jetty's ext module looks in
-this directory (and any subdirectories) for *.jar and automatically adds them to
-the classpath.
-
-Jetty's documentation for this is at:
- http://www.eclipse.org/jetty/documentation/current/startup-classpath.html
diff --git a/src/lucee-base/modules/lucee.mod b/src/lucee-base/modules/lucee.mod
index 1557829..4c44919 100644
--- a/src/lucee-base/modules/lucee.mod
+++ b/src/lucee-base/modules/lucee.mod
@@ -2,10 +2,22 @@
# Lucee Module
#
+[description]
+Enables Lucee CFML engine.
+
[depend]
-ext
http
jsp
+rewrite
[lib]
-lib/ext/lucee.jar
\ No newline at end of file
+modules/lucee/lib/**.jar
+
+[ini]
+modules/lucee/etc/lucee-rewrite-rules.xml
+modules/lucee/etc/lucee-global-webapp-common.xml
+
+[files]
+basehome:modules/lucee/lucee-server/
+basehome:modules/lucee/webapps/
+basehome:modules/lucee/webinfs/
\ No newline at end of file
diff --git a/src/lucee-base/modules/lucee/etc/lucee-global-webapp-common.xml b/src/lucee-base/modules/lucee/etc/lucee-global-webapp-common.xml
new file mode 100644
index 0000000..448d440
--- /dev/null
+++ b/src/lucee-base/modules/lucee/etc/lucee-global-webapp-common.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+ <Ref refid="DeploymentManager">
+ <Call name="addLifeCycleBinding">
+ <Arg>
+ <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding" >
+ <Set name="jettyXml"><Property name="jetty.base"/>/modules/lucee/etc/lucee-webapp-common.xml</Set>
+ </New>
+ </Arg>
+ </Call>
+ </Ref>
+</Configure>
\ No newline at end of file
diff --git a/src/lucee-base/modules/lucee/etc/lucee-rewrite-rules.xml b/src/lucee-base/modules/lucee/etc/lucee-rewrite-rules.xml
new file mode 100644
index 0000000..22d2172
--- /dev/null
+++ b/src/lucee-base/modules/lucee/etc/lucee-rewrite-rules.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+ <Call name="insertHandler">
+ <Arg>
+ <New class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+ <Set name="originalPathAttribute">requestedPath</Set>
+ <Set name="rewriteRequestURI">true</Set>
+ <Set name="rules">
+ <Array type="org.eclipse.jetty.rewrite.handler.Rule">
+ <Item>
+ <New class="org.eclipse.jetty.rewrite.handler.VirtualHostRuleContainer">
+ <!--
+ Rewrite {anyscript}.cfm/path_info URLs to {anyscript}.cfm so it is
+ matched by Lucee's servlet mapping. (Lucee populates cgi.path_info
+ from Jetty's requestedPath, which holds the original Request URI.)
+ -->
+ <Call name="addRule">
+ <Arg>
+ <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
+ <Set name="regex">(.*?\.(?:cfm|lucee))/.*</Set>
+ <Set name="replacement">$1</Set>
+ </New>
+ </Arg>
+ </Call>
+ </New>
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Arg>
+ </Call>
+
+</Configure>
\ No newline at end of file
diff --git a/src/lucee-base/modules/lucee/etc/lucee-servlets.xml b/src/lucee-base/modules/lucee/etc/lucee-servlets.xml
new file mode 100644
index 0000000..957c897
--- /dev/null
+++ b/src/lucee-base/modules/lucee/etc/lucee-servlets.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ metadata-complete="false"
+ version="3.1"
+ >
+
+ <servlet>
+ <servlet-name>CFMLServlet</servlet-name>
+ <servlet-class>lucee.loader.servlet.CFMLServlet</servlet-class>
+ <init-param>
+ <param-name>lucee-server-directory</param-name>
+ <param-value>.</param-value>
+ </init-param>
+ <init-param>
+ <param-name>lucee-web-directory</param-name>
+ <param-value>./webinfs/{web-context-label}/</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>LuceeServlet</servlet-name>
+ <servlet-class>lucee.loader.servlet.LuceeServlet</servlet-class>
+ <init-param>
+ <param-name>lucee-server-directory</param-name>
+ <param-value>.</param-value>
+ </init-param>
+ <init-param>
+ <param-name>lucee-web-directory</param-name>
+ <param-value>./webinfs/{web-context-label}/</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>RESTServlet</servlet-name>
+ <servlet-class>lucee.loader.servlet.RestServlet</servlet-class>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
+
+
+ <servlet-mapping>
+ <servlet-name>CFMLServlet</servlet-name>
+ <url-pattern>*.cfc</url-pattern>
+ <url-pattern>*.cfm</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>LuceeServlet</servlet-name>
+ <url-pattern>*.lucee</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>RESTServlet</servlet-name>
+ <url-pattern>/rest/*</url-pattern>
+ </servlet-mapping>
+
+
+ <welcome-file-list>
+ <welcome-file>index.cfm</welcome-file>
+ <welcome-file>index.lucee</welcome-file>
+ </welcome-file-list>
+
+
+</web-app>
\ No newline at end of file
diff --git a/src/lucee-base/modules/lucee/etc/lucee-webapp-common.xml b/src/lucee-base/modules/lucee/etc/lucee-webapp-common.xml
new file mode 100644
index 0000000..8509852
--- /dev/null
+++ b/src/lucee-base/modules/lucee/etc/lucee-webapp-common.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+
+ <Set name="overrideDescriptor"><Property name="jetty.base"/>/modules/lucee/etc/lucee-servlets.xml</Set>
+
+</Configure>
\ No newline at end of file
diff --git a/src/lucee-base/modules/lucee/lib/lucee_jar_goes_here b/src/lucee-base/modules/lucee/lib/lucee_jar_goes_here
new file mode 100644
index 0000000..e69de29
diff --git a/src/lucee-base/modules/readme.md b/src/lucee-base/modules/readme.md
index 0f67731..65c8636 100644
--- a/src/lucee-base/modules/readme.md
+++ b/src/lucee-base/modules/readme.md
@@ -10,4 +10,5 @@ You can read more about modules in the Jetty documentation:
http://www.eclipse.org/jetty/documentation/current/startup-modules.html
The **lucee.mod** file defines a Lucee module consisting of the other modules
-Lucee requires to run, plus a reference to the Lucee JAR.
+Lucee requires to run, referencing the Lucee JAR and Jetty configuration
+located within the lucee directory.
\ No newline at end of file
diff --git a/src/lucee-base/readme.md b/src/lucee-base/readme.md
index 49fde6b..5fc8065 100644
--- a/src/lucee-base/readme.md
+++ b/src/lucee-base/readme.md
@@ -3,7 +3,7 @@
For the primary Lucee on Jetty readme, see README.TXT in the parent directory.
This lucee-base directory uses the split jetty-home/jetty-base functionality
-available in Jetty 9, to allow configuration of Lucee against an unmodified
+available in Jetty 9, to allow configuration of Lucee against an unmodified
Jetty instance. For more information on jetty-base see the Jetty documentation
at http://www.eclipse.org/jetty/documentation/current/startup-base-and-home.html
@@ -19,14 +19,15 @@ For more specific information, check for a readme in the relevant directory.
readme.md - this file.
start.ini - Jetty startup modules & configuration.
- etc - Jetty configuration overrides.
- ~ lucee-servlets.xml - Lucee CFML Servlet configuration.
- ~ rewrite-rules.xml - Jetty URL rewrite rules.
- lib/ext - Lucee's JAR files.
logs - Jetty's log files are created here.
lucee-server - Lucee's server context and patches go here.
modules - Additional Jetty module files.
~ lucee.mod - Lucee module for Jetty.
+ ~ lucee/ - Configuration files for Lucee module.
+ ~ lib - Lucee's JAR file.
+ ~ etc - Jetty configuration overrides.
+ ~ lucee-servlets.xml - Lucee CFML Servlet configuration.
+ ~ rewrite-rules.xml - Jetty URL rewrite rules.
resources - Jetty resource files.
~ jetty-logging.properties - Jetty logging configuration
webapps - Jetty looks for webapp contexts here.
@@ -37,14 +38,14 @@ For more specific information, check for a readme in the relevant directory.
## Jetty configuration
* The `start.ini` file lists the relevant built-in modules plus `modules/lucee.mod`
-* The `etc/rewrite-rules.xml` file is loaded by start.ini and rewrites *.cfm to enable path info.
-* The `etc/lucee-servlets.xml` file is loaded via the overrideDescriptor setting
+* The `modules/lucee/etc/rewrite-rules.xml` file is loaded by start.ini and rewrites *.cfm to enable path info.
+* The `modules/lucee/etc/lucee-servlets.xml` file is loaded via the overrideDescriptor setting
in a webapp XML config file, and maps *.cfm and *.cfc to Lucee's CFMLServlet.
## Lucee configuration
-* The `lucee-server-directory` parameter is set to use `lucee-base/lucee-server`
+* The `lucee-server-directory` parameter is set to use `lucee-base/lucee-server`
instead of the `lucee-base/lib/ext/lucee-server` default.
-* The `lucee-web-directory` parameter is set to use `lucee-base/webinfs/{web-context-label}`
+* The `lucee-web-directory` parameter is set to use `lucee-base/webinfs/{web-context-label}`
instead of `lucee-base/webapps/{context}/WEB-INF/lucee`
diff --git a/src/lucee-base/start.ini b/src/lucee-base/start.ini
index c24303b..7d4e6bd 100644
--- a/src/lucee-base/start.ini
+++ b/src/lucee-base/start.ini
@@ -1,7 +1,4 @@
---module=lucee,deploy,logging
+--module=lucee,deploy,console-capture
--module=http
-jetty.port=8080
-
---module=rewrite
-etc/rewrite-rules.xml
\ No newline at end of file
+jetty.http.port=8080
\ No newline at end of file
diff --git a/src/lucee-base/webapps/ROOT.xml b/src/lucee-base/webapps/ROOT.xml
index 08bc45a..53e4631 100644
--- a/src/lucee-base/webapps/ROOT.xml
+++ b/src/lucee-base/webapps/ROOT.xml
@@ -12,8 +12,6 @@
readme.md in this directory for details, or check Jetty's documentation.
-->
- <Set name="overrideDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/lucee-servlets.xml</Set>
-
<Set name="resourceBase"><SystemProperty name="jetty.base" default="."/>/webapps/ROOT/</Set>
<Set name="virtualHosts">
diff --git a/src/lucee-base/webapps/readme.md b/src/lucee-base/webapps/readme.md
index d324640..54fafd4 100644
--- a/src/lucee-base/webapps/readme.md
+++ b/src/lucee-base/webapps/readme.md
@@ -8,12 +8,6 @@ This webapps directory is where Jetty WebApp Contexts are located.
There is one context by default - ROOT.xml - which listens on localhost and has
its resourceBase (webroot) set to the lucee-base/webapps/ROOT directory.
-These context XML config files work as per Jetty documentation, with the
-addendum that invoking Lucee means including the lucee-servlets.xml
-configuration via the overrideDescriptor setting:
-
- <Set name="overrideDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/lucee-servlets.xml</Set>
-
## Adding a new context
