This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new c4e801e found additional links to the old wiki (#361)
c4e801e is described below
commit c4e801e83491c43d09973cb1595371e183362530
Author: Eric Pugh <[email protected]>
AuthorDate: Fri Oct 22 14:47:39 2021 -0400
found additional links to the old wiki (#361)
Co-authored-by: [email protected] <>
---
solr/README.md | 2 +-
.../apache/solr/search/grouping/package-info.java | 8 +++----
.../solr/search/TestExtendedDismaxParser.java | 26 +++++++++++-----------
.../src/markdown/SYSTEM_REQUIREMENTS.md | 12 +++++-----
solr/example/README.md | 12 +++++-----
.../conf/managed-schema | 10 ++++-----
.../org/apache/solr/client/solrj/SolrQuery.java | 14 ++++++------
.../src/java/org/apache/solr/cloud/package.html | 2 +-
8 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/solr/README.md b/solr/README.md
index 1a9b257..4c3710d 100644
--- a/solr/README.md
+++ b/solr/README.md
@@ -129,7 +129,7 @@ or linked from "docs/index.html" in a binary distribution.
Also, there are Solr clients for many programming languages, see
- * https://wiki.apache.org/solr/IntegratingSolr
+ * https://cwiki.apache.org/confluence/display/solr/IntegratingSolr
Files included in an Apache Solr binary distribution
diff --git
a/solr/core/src/java/org/apache/solr/search/grouping/package-info.java
b/solr/core/src/java/org/apache/solr/search/grouping/package-info.java
index ee0555f..82b65e9 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/package-info.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/package-info.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/**
+
+/**
* APIs and classes for implementing result grouping
* <p>
- * See the <a href="https://wiki.apache.org/solr/FieldCollapsing";>solr
wiki</a> for more information
+ * See the <a href="https://solr.apache.org/guide/result-grouping.html";>Solr
Ref Guide</a> for more information
*/
package org.apache.solr.search.grouping;
-
-
diff --git
a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index 4efb51f..1703b35 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -497,33 +497,33 @@ public class TestExtendedDismaxParser extends
SolrTestCaseJ4 {
***/
}
-
+
public void testBoostQuery() {
assertQ(
- req("q", "tekna", "qf", "text_sw", "defType", "edismax", "bq",
"id:54^100", "bq", "id:53^10", "fq", "id:[52 TO 54]", "fl", "id,score"),
+ req("q", "tekna", "qf", "text_sw", "defType", "edismax", "bq",
"id:54^100", "bq", "id:53^10", "fq", "id:[52 TO 54]", "fl", "id,score"),
"//doc[1]/str[@name='id'][.='54']",
"//doc[2]/str[@name='id'][.='53']",
"//doc[3]/str[@name='id'][.='52']"
);
-
+
// non-trivial bqs
- assertQ(req("q", "tekna",
- "qf", "text_sw",
- "defType", "edismax",
- "bq", "(text_sw:blasdfadsf id:54)^100",
- "bq", "id:[53 TO 53]^10",
- "fq", "id:[52 TO 54]",
- "fl", "id,score"),
+ assertQ(req("q", "tekna",
+ "qf", "text_sw",
+ "defType", "edismax",
+ "bq", "(text_sw:blasdfadsf id:54)^100",
+ "bq", "id:[53 TO 53]^10",
+ "fq", "id:[52 TO 54]",
+ "fl", "id,score"),
"//doc[1]/str[@name='id'][.='54']",
"//doc[2]/str[@name='id'][.='53']",
"//doc[3]/str[@name='id'][.='52']"
);
// genuine negative boosts are not legal
- // see SOLR-3823, SOLR-3278, LUCENE-4378 and
- //
https://wiki.apache.org/solr/SolrRelevancyFAQ#How_do_I_give_a_negative_.28or_very_low.29_boost_to_documents_that_match_a_query.3F
+ // see SOLR-3823, SOLR-3278, LUCENE-4378 and
+ //
https://cwiki.apache.org/confluence/display/solr/SolrRelevancyFAQ#SolrRelevancyFAQ-HowdoIgiveanegative(orverylow)boosttodocumentsthatmatchaquery?
assertQ(
- req("q", "tekna", "qf", "text_sw", "defType", "edismax", "bq", "(*:*
-id:54)^100", "bq", "id:53^10", "bq", "id:52", "fq", "id:[52 TO 54]", "fl",
"id,score"),
+ req("q", "tekna", "qf", "text_sw", "defType", "edismax", "bq", "(*:*
-id:54)^100", "bq", "id:53^10", "bq", "id:52", "fq", "id:[52 TO 54]", "fl",
"id,score"),
"//doc[1]/str[@name='id'][.='53']",
"//doc[2]/str[@name='id'][.='52']",
"//doc[3]/str[@name='id'][.='54']"
diff --git a/solr/documentation/src/markdown/SYSTEM_REQUIREMENTS.md
b/solr/documentation/src/markdown/SYSTEM_REQUIREMENTS.md
index 275d142..57687e7 100644
--- a/solr/documentation/src/markdown/SYSTEM_REQUIREMENTS.md
+++ b/solr/documentation/src/markdown/SYSTEM_REQUIREMENTS.md
@@ -1,15 +1,15 @@
-# System Requirements
+# System Requirements
Apache Solr runs on Java 11 or greater.
It is also recommended to always use the latest update version of your
Java VM, because bugs may affect Solr. An overview of known JVM bugs
-can be found on http://wiki.apache.org/lucene-java/JavaBugs
+can be found on https://cwiki.apache.org/confluence/display/lucene/JavaBugs
With all Java versions it is strongly recommended to not use experimental
`-XX` JVM options.
-CPU, disk and memory requirements are based on the many choices made in
-implementing Solr (document size, number of documents, and number of
-hits retrieved to name a few). The benchmarks page has some information
-related to performance on particular platforms.
+CPU, disk and memory requirements are based on the many choices made in
+implementing Solr (document size, number of documents, and number of
+hits retrieved to name a few). The benchmarks page has some information
+related to performance on particular platforms.
diff --git a/solr/example/README.md b/solr/example/README.md
index 1ba2d62..491d88a 100644
--- a/solr/example/README.md
+++ b/solr/example/README.md
@@ -58,14 +58,14 @@ To add documents to the index, use bin/post, for example:
For more information about this example please read...
* [solr/example/README.md](./README.md)
-
+
For more information about the "Solr Home" and Solr specific configuration
* https://lucene.apache.org/solr/guide/solr-tutorial.html
For a Solr tutorial
- * https://wiki.apache.org/solr/SolrResources
+ * https://solr.apache.org/resources.html
For a list of other tutorials and introductory articles.
@@ -75,13 +75,13 @@ Notes About These Examples
### References to Jar Files Outside This Directory
Various example SolrHome dirs contained in this directory may use "<lib>"
-statements in the solrconfig.xml file to reference plugin jars outside of
+statements in the solrconfig.xml file to reference plugin jars outside of
this directory for loading "contrib" plugins via relative paths.
-If you make a copy of this example server and wish to use the
-ExtractingRequestHandler (SolrCell), the clustering component,
+If you make a copy of this example server and wish to use the
+ExtractingRequestHandler (SolrCell), the clustering component,
or any other modules in "contrib", you will need to
-copy the required jars or update the paths to those jars in your
+copy the required jars or update the paths to those jars in your
solrconfig.xml.
### Logging
diff --git
a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
index 2aec064..da016ab 100644
---
a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
+++
b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
@@ -26,7 +26,7 @@
It should be kept correct and concise, usable out-of-the-box.
For more information, on how to customize this file, please see
- http://wiki.apache.org/solr/SchemaXml
+ http://solr.apache.org/guide/fields-and-schema-design.html
PERFORMANCE NOTE: this schema includes many optional features and should not
be used for benchmarking. To improve performance one could
@@ -368,7 +368,7 @@
matching across fields.
For more info on customizing your analyzer chain, please see
- http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters
+
http://lucene.apache.org/solr/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters
-->
<!-- One can also specify an existing Analyzer class that has a
@@ -701,7 +701,7 @@
<!-- An alternative geospatial field type new to Solr 4. It supports
multiValued and polygon shapes.
For more information about this and other Spatial fields new to Solr 4,
see:
- http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
+ http://solr.apache.org/guide/spatial-search.html
-->
<fieldType name="location_rpt"
class="solr.SpatialRecursivePrefixTreeFieldType"
geo="true" distErrPct="0.025" maxDistErr="0.001"
distanceUnits="kilometers" />
@@ -712,7 +712,7 @@
<fieldType name="bbox" class="solr.BBoxField"
geo="true" distanceUnits="kilometers" numberType="pdouble" />
- <!-- Money/currency field type. See
http://wiki.apache.org/solr/MoneyFieldType
+ <!-- Money/currency field type. See
https://solr.apache.org/guide/currencies-exchange-rates.html
Parameters:
amountLongSuffix: Required. Refers to a dynamic field for the raw
amount sub-field.
The dynamic field must have a field type that
extends LongValueFieldType.
@@ -1023,7 +1023,7 @@
Punctuation characters are discarded by default. Use
discardPunctuation="false" to keep them.
- See http://wiki.apache.org/solr/JapaneseLanguageSupport for more on
Japanese language support.
+ See https://solr.apache.org/guide/language-analysis.html#japanese
for more on Japanese language support.
-->
<tokenizer name="japanese" mode="search"/>
<!--<tokenizer name="japanese" mode="search"
userDictionary="lang/userdict_ja.txt"/>-->
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
index 8454ee1..60e6ae3 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
@@ -280,19 +280,19 @@ public class SolrQuery extends ModifiableSolrParams
this.set(FacetParams.FACET, true);
return this;
}
-
+
/**
* Add Interval Faceting on a field. All intervals for the same field should
be included
* in the same call to this method.
- * For syntax documentation see <a
href="https://wiki.apache.org/solr/SimpleFacetParameters#Interval_Faceting";>Solr
wiki</a>.
+ * For syntax documentation see <a
href="https://solr.apache.org/guide/faceting.html#interval-faceting";>Solr
wiki</a>.
* <br>
- * Key substitution, filter exclusions or other local params on the field
are not supported when using this method,
- * if this is needed, use the lower level {@link #add} method.<br>
+ * Key substitution, filter exclusions or other local params on the field
are not supported when using this method,
+ * if this is needed, use the lower level {@link #add} method.<br>
* Key substitution IS supported on intervals when using this method.
- *
- *
+ *
+ *
* @param field the field to add facet intervals. Must be an existing field
and can't be null
- * @param intervals Intervals to be used for faceting. It can be an empty
array, but it can't
+ * @param intervals Intervals to be used for faceting. It can be an empty
array, but it can't
* be <code>null</code>
* @return this
*/
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/package.html
b/solr/test-framework/src/java/org/apache/solr/cloud/package.html
index c4a88b7..dcc3f33 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/package.html
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/package.html
@@ -18,6 +18,6 @@
<!-- not a package-info.java, because we already defined this package in core/
-->
<html>
<body>
-Base classes and utilities for creating and testing <a
href="https://wiki.apache.org/solr/SolrCloud";>Solr Cloud</a> clusters.
+Base classes and utilities for creating and testing <a
href="https://solr.apache.org/guide/deployment-guide.html";>Solr Cloud</a>
clusters.
</body>
</html>
