You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/12/12 17:28:29 UTC
[lucene-solr] 02/06: @1242 WIP
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 62b6b33b1ed71fae2f7461a03739a16ee21680d0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Dec 11 07:05:17 2020 -0600
@1242 WIP
---
solr/bin/solr | 2 +-
solr/server/build.gradle | 1 +
solr/server/contexts/solr-jetty-context.xml | 3 ++-
solr/server/etc/jetty.xml | 39 -----------------------------
solr/server/modules/quickstart.mod | 3 +++
5 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/solr/bin/solr b/solr/bin/solr
index 71eb07e..7055e1c 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -170,7 +170,7 @@ fi
# Select HTTP OR HTTPS related configurations
SOLR_URL_SCHEME=http
-SOLR_JETTY_CONFIG=()
+SOLR_JETTY_CONFIG=("--module=quickstart")
SOLR_SSL_OPTS=""
if [ -n "$SOLR_HADOOP_CREDENTIAL_PROVIDER_PATH" ]; then
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index 44f8626..209bd1a 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -58,6 +58,7 @@ dependencies {
api 'org.eclipse.jetty:jetty-webapp'
api 'org.eclipse.jetty:jetty-xml'
api 'org.eclipse.jetty:jetty-alpn-server'
+ api 'org.eclipse.jetty:jetty-quickstart'
api 'org.eclipse.jetty.http2:http2-server'
api 'org.eclipse.jetty.http2:http2-common'
diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml
index 6392cd1..34c108a 100644
--- a/solr/server/contexts/solr-jetty-context.xml
+++ b/solr/server/contexts/solr-jetty-context.xml
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.quickstart.QuickStartWebApp">
+ <Set name="autoPreconfigure">true</Set>
<Set name="contextPath"><Property name="hostContext" default="/solr"/></Set>
<Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set>
<Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set>
diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml
index 1fa4a6c9..f2b0d12 100644
--- a/solr/server/etc/jetty.xml
+++ b/solr/server/etc/jetty.xml
@@ -197,44 +197,5 @@
<Set name="dumpAfterStart">false</Set>
<Set name="dumpBeforeStop">true</Set>
- <Call name="addBean">
- <Arg>
- <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
- <Set name="contexts">
- <Ref refid="Contexts" />
- </Set>
- <Call name="setContextAttribute">
- <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
- </Call>
-
- <Call name="addAppProvider">
- <Arg>
- <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
- <Set name="monitoredDirName"><Property name="jetty.base" default="."/>/contexts</Set>
- <Set name="scanInterval">0</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- Add a customize step to the deployment lifecycle -->
- <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
- <Call name="insertLifeCycleNode">
- <Arg>deployed</Arg>
- <Arg>starting</Arg>
- <Arg>customise</Arg>
- </Call>
- <Call name="addLifeCycleBinding">
- <Arg>
- <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
- <Arg>customise</Arg>
- </New>
- </Arg>
- </Call>
- -->
-
- </New>
- </Arg>
- </Call>
</Configure>
diff --git a/solr/server/modules/quickstart.mod b/solr/server/modules/quickstart.mod
new file mode 100644
index 0000000..54bacd1
--- /dev/null
+++ b/solr/server/modules/quickstart.mod
@@ -0,0 +1,3 @@
+
+[xml]
+contexts/solr-jetty-context.xml
\ No newline at end of file