rm scripting module, XSLTResponseWriter removed #9260

We don't need the scripting module anymore.
IQSS · Aug 24, 2023 · 8666472 · 8666472
1 parent e5be4be
commit 8666472
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 deletions.
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr
@@ -7,7 +7,7 @@
 
 SOLR_DIR="/usr/local/solr/solr-9.3.0"
 SOLR_COMMAND="bin/solr"
-SOLR_ARGS="-m 1g -j jetty.host=127.0.0.1 -Dsolr.modules=scripting"
+SOLR_ARGS="-m 1g -j jetty.host=127.0.0.1"
 SOLR_USER=solr
 
 case $1 in

diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
@@ -6,7 +6,7 @@ After = syslog.target network.target remote-fs.target nss-lookup.target
 User = solr
 Type = forking
 WorkingDirectory = /usr/local/solr/solr-9.3.0
-ExecStart = /usr/local/solr/solr-9.3.0/bin/solr start -m 1g -j "jetty.host=127.0.0.1" -Dsolr.modules=scripting
+ExecStart = /usr/local/solr/solr-9.3.0/bin/solr start -m 1g -j "jetty.host=127.0.0.1"
 ExecStop = /usr/local/solr/solr-9.3.0/bin/solr stop
 LimitNOFILE=65000
 LimitNPROC=65000

diff --git a/doc/sphinx-guides/source/developers/classic-dev-env.rst b/doc/sphinx-guides/source/developers/classic-dev-env.rst
@@ -166,7 +166,7 @@ To install Solr, execute the following commands:
 
 (Please note that the extra jetty argument below is a security measure to limit connections to Solr to only your computer. For extra security, run a firewall.)
 
-``bin/solr start -j "-Djetty.host=127.0.0.1 -Dsolr.modules=scripting"``
+``bin/solr start -j "-Djetty.host=127.0.0.1"``
 
 ``bin/solr create_core -c collection1 -d server/solr/collection1/conf``
 

diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst
@@ -226,8 +226,6 @@ For systems using init.d (like CentOS 6), download this :download:`Solr init scr
         service start solr
         chkconfig solr on
 
-Please note that as of Solr 9 the following argument `to enable a module <https://solr.apache.org/guide/solr/latest/configuration-guide/solr-modules.html>`_ has been added to the init scripts: ``-Dsolr.modules=scripting``
-
 Securing Solr
 =============
 

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -78,8 +78,6 @@ services:
     depends_on:
       - dev_solr_initializer
     restart: on-failure
-    environment:
-     - SOLR_MODULES=scripting
     ports:
       - "8983:8983"
     networks:

diff --git a/scripts/vagrant/setup-solr.sh b/scripts/vagrant/setup-solr.sh
@@ -10,7 +10,7 @@ su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME && tar xfz solr-9.3.0.tgz"
 su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-9.3.0/server/solr && cp -r configsets/_default . && mv _default collection1"
 su $SOLR_USER -s /bin/sh -c "cp /dataverse/conf/solr/9.3.0/schema*.xml $SOLR_HOME/solr-9.3.0/server/solr/collection1/conf/"
 su $SOLR_USER -s /bin/sh -c "cp /dataverse/conf/solr/9.3.0/solrconfig.xml $SOLR_HOME/solr-9.3.0/server/solr/collection1/conf/solrconfig.xml"
-su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-9.3.0 && bin/solr start -Dsolr.modules=scripting && bin/solr create_core -c collection1 -d server/solr/collection1/conf/"
+su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-9.3.0 && bin/solr start && bin/solr create_core -c collection1 -d server/solr/collection1/conf/"
 cp /dataverse/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr /etc/init.d/solr
 chmod 755 /etc/init.d/solr
 /etc/init.d/solr stop