janhoy commented on a change in pull request #526:
URL: https://github.com/apache/solr/pull/526#discussion_r784844159
##########
File path:
solr/core/src/test-files/solr/configsets/upload/with-lib-directive/solrconfig.xml
##########
@@ -37,7 +37,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
- <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-ltr-\d.*\.jar"
/>
+ <lib dir="${solr.install.dir:../../../..}/contrib/ltr/lib/" regex=".*\.jar"
/>
Review comment:
Yea, people will have to update their `solrconfig.xml` lib. But it is
more logical with one include for the contribs that have other dependency libs
in 'lib/'. Or perhaps they will start using `SOLR_MODULES=ltr` instead :)
##########
File path: solr/solr-ref-guide/src/jdbc-dbvisualizer.adoc
##########
@@ -22,8 +22,8 @@ For DbVisualizer, you will need to create a new driver for
Solr using the DbVisu
This will add several SolrJ client .jars to the DbVisualizer classpath.
The files required are:
-* all .jars found in `$SOLR_HOME/dist/solrj-lib`
-* the SolrJ .jar found at `$SOLR_HOME/dist/solr-solrj-<version>.jar`
+* all .jars found in `$SOLR_HOME/server/solr-webapp/webapp/WEB-INF/lib/\*` and
`$SOLR_HOME/server/lib/ext/*`
Review comment:
Why is it that we suddenly have to include the `lib/ext/*` location?
Guess it is for log4j impl, but how come this worked before?
Also, our `server` folder is NOT under `$SOLR_HOME`, but under `$SOLR_TIP`...
##########
File path: solr/solr-ref-guide/src/solrj.adoc
##########
@@ -65,16 +65,16 @@ To compile code manually that uses SolrJ, use a `javac`
command similar to:
[source,bash,subs="attributes"]
----
-javac -cp .:$SOLR_HOME/dist/solr-solrj-{solr-docs-version}.0.jar ...
+javac -cp
.:$SOLR_HOME/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-{solr-docs-version}.0.jar
...
----
At runtime, you need a few of SolrJ's dependencies, in addition to SolrJ
itself.
-For convenience, these dependencies are made available in the `dist/solrj-lib`
directory.
+In the Solr distribution these dependencies are not separated from Solr's
dependencies, so you must include all.
Review comment:
Rather than ask users to add ALL solr's jars, perhaps link to e.g.
https://search.maven.org/artifact/org.apache.solr/solr-solrj/8.11.1/jar and
tell them that just a few of those are required, and depending on their use
case they may include zookeeper jars and netty jars (zk https).
##########
File path: solr/solr-ref-guide/src/indexing-with-update-handlers.adoc
##########
@@ -277,7 +277,7 @@ The status field will be non-zero in case of failure.
The Scripting contrib module provides a separate XSLT Update Request Handler
that allows you to index any arbitrary XML by using the `<tr>` parameter to
apply an https://en.wikipedia.org/wiki/XSLT[XSL transformation].
You must have an XSLT stylesheet in the `conf/xslt` directory of your
<<config-sets.adoc#,configset>> that can transform the incoming data to the
expected `<add><doc/></add>` format, and use the `tr` parameter to specify the
name of that stylesheet.
-Learn more about adding the `dist/solr-scripting-*.jar` file into Solr's
<<libs.adoc#lib-directories,Lib Directories>>.
+Learn more about adding the `contrib/scripting/lib/solr-scripting-*.jar` file
into Solr's <<libs.adoc#lib-directories,Lib Directories>>.
Review comment:
Why not `contrib/scripting/lib/*.jar`?
##########
File path: solr/solr-ref-guide/src/docker-networking.adoc
##########
@@ -205,7 +205,7 @@ To load data, and see it was split over shards:
[source,bash]
----
docker exec -it --user=solr zksolr1 bin/post -c my_collection1
example/exampledocs/manufacturers.xml
-# /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -classpath
/opt/solr/dist/solr-core-9.0.0.jar -Dauto=yes -Dc=my_collection1 -Ddata=files
org.apache.solr.util.SimplePostTool example/exampledocs/manufacturers.xml
+# /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -classpath
/opt/solr/server/lib/ext/*:/opt/solr/server/solr-webapp/webapp/WEB-INF/lib/*
-Dauto=yes -Dc=my_collection1 -Ddata=files org.apache.solr.util.SimplePostTool
example/exampledocs/manufacturers.xml
Review comment:
I somehow wished we already got rid of `start.jar` and had assembled the
classpath programmatically during startup, as @uschindler explains in
https://issues.apache.org/jira/browse/SOLR-11087. Then we could leave solr-core
and solrj in `dist/` and put them on classpath from there and not in WEB-INF,
which would acieve the same goal of not duplicating jars in the distro.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
