00da9c8 Move module files from template dir to Git submodule.
.gitmodules (new) | 3 +
build/build.sh | 7 +-
lucee.jetty-module (new) | 1 +
src/lucee-base/modules/lucee.mod (gone) | 23 -------
src/lucee-base/modules/lucee/etc/lucee-global-webapp-common.xml (gone) | 14 ----
src/lucee-base/modules/lucee/etc/lucee-rewrite-rules.xml (gone) | 35 ----------
src/lucee-base/modules/lucee/etc/lucee-servlets.xml (gone) | 68 --------------------
src/lucee-base/modules/lucee/etc/lucee-webapp-common.xml (gone) | 8 ---
src/lucee-base/modules/lucee/lib/lucee_jar_goes_here (gone) | 0
9 files changed, 7 insertions(+), 152 deletions(-)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..dfdcbe0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lucee.jetty-module"]
+ path = lucee.jetty-module
+ url = https://code.sorcerersisle.com/lucee.jetty-module.git
diff --git a/build/build.sh b/build/build.sh
index c325f88..05bebe2 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -42,14 +42,13 @@ function showHelp ()
Options marked (+) can be specified multiple times for additional files.
Examples:
- You must specify at least jetty-home, lucee jar, and lucee.jetty-module:
- $0 --jetty=jetty-home-9.4.44.v20210927.zip --lucee=lucee-5.3.8.206.jar --module=../lucee.jetty-module/lucee.mod
+ You must specify at least jetty-home and lucee jar:
+ $0 --jetty=jetty-home-9.4.44.v20210927.zip --lucee=lucee-5.3.8.206.jar
When numerous options are present, escaping newlines can assist readability:
$0 \\
--jetty=jetty-home-9.4.44.v20210927.zip \\
--lucee=lucee-light-5.3.8.206.jar \\
- --module=../lucee.jetty-module/lucee.mod \\
--extension=../ext/lucee.admin.extension-1.0.0.3.lex \\
--extension=../ext/lucee.doc.extension-1.0.0.2.lex \\
--output=../out/luje_9444_538.zip
@@ -84,7 +83,7 @@ function setupDefaults ()
JettyFile=
LuceeFile=
OutputFile="${BuildDir}/${BuildId}.tar"
- declare -ga ModuleFiles
+ ModuleFiles=("$MainDir/lucee.jetty-module/lucee.mod")
declare -ga ExtensionFiles
}
diff --git a/lucee.jetty-module b/lucee.jetty-module
new file mode 160000
index 0000000..eb8bcdc
--- /dev/null
+++ b/lucee.jetty-module
@@ -0,0 +1 @@
+Subproject commit eb8bcdc94ddc5aac8cadd8b8d09b90f23ff26a1e
diff --git a/src/lucee-base/modules/lucee.mod b/src/lucee-base/modules/lucee.mod
deleted file mode 100644
index 4c44919..0000000
--- a/src/lucee-base/modules/lucee.mod
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Lucee Module
-#
-
-[description]
-Enables Lucee CFML engine.
-
-[depend]
-http
-jsp
-rewrite
-
-[lib]
-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
deleted file mode 100644
index 448d440..0000000
--- a/src/lucee-base/modules/lucee/etc/lucee-global-webapp-common.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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
deleted file mode 100644
index 22d2172..0000000
--- a/src/lucee-base/modules/lucee/etc/lucee-rewrite-rules.xml
+++ /dev/null
@@ -1,35 +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">
-
- <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
deleted file mode 100644
index 957c897..0000000
--- a/src/lucee-base/modules/lucee/etc/lucee-servlets.xml
+++ /dev/null
@@ -1,68 +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"
- >
-
- <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
deleted file mode 100644
index 8509852..0000000
--- a/src/lucee-base/modules/lucee/etc/lucee-webapp-common.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index e69de29..0000000
