diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml index 745a2a53e56..92c236ac470 100644 --- a/solr/solr-ref-guide/build.xml +++ b/solr/solr-ref-guide/build.xml @@ -230,6 +230,7 @@ + diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template index f789b8ceddb..1c55dc47a18 100755 --- a/solr/solr-ref-guide/src/_config.yml.template +++ b/solr/solr-ref-guide/src/_config.yml.template @@ -74,6 +74,7 @@ solr-attributes: &solr-attributes-ref solr-guide-version: "${solr-guide-version}" solr-guide-version-path: "${solr-guide-version-path}" solr-docs-version: "${solr-docs-version}" + java-javadocs: "${javadoc.link}" solr-javadocs: "${html-solr-javadocs}" lucene-javadocs: "${html-lucene-javadocs}" build-date: "${DSTAMP}" diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adoc index ef476d70804..10dd26436ee 100644 --- a/solr/solr-ref-guide/src/language-analysis.adoc +++ b/solr/solr-ref-guide/src/language-analysis.adoc @@ -274,7 +274,7 @@ The principles of JDK Collation are the same as those of ICU Collation; you just *Arguments for `solr.CollationField`, specified as attributes within the `` element:* -Using a System collator (see http://www.oracle.com/technetwork/java/javase/java8locales-2095355.html[Oracle's list of locales supported in Java 8]): +Using a System collator (see http://www.oracle.com/technetwork/java/javase/java8locales-2095355.html[Oracle's list of locales supported in Java]): `language`:: (required) http://www.loc.gov/standards/iso639-2/php/code_list.php[ISO-639] language code @@ -282,17 +282,17 @@ Using a System collator (see http://www.oracle.com/technetwork/java/javase/java8 `variant`:: Vendor or browser-specific code -`strength`:: Valid values are `primary`, `secondary`, `tertiary` or `identical`. See http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html[Oracle Java 8 Collator javadocs] for more information. +`strength`:: Valid values are `primary`, `secondary`, `tertiary` or `identical`. See {java-javadocs}java/text/Collator.html[Java Collator javadocs] for more information. -`decomposition`:: Valid values are `no`, `canonical`, or `full`. See http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html[Oracle Java 8 Collator javadocs] for more information. +`decomposition`:: Valid values are `no`, `canonical`, or `full`. See {java-javadocs}java/text/Collator.html[Java Collator javadocs] for more information. Using a Tailored ruleset: -`custom`:: (required) Path to a UTF-8 text file containing rules supported by the http://docs.oracle.com/javase/8/docs/api/java/text/RuleBasedCollator.html[`JDK RuleBasedCollator`] +`custom`:: (required) Path to a UTF-8 text file containing rules supported by the {java-javadocs}java/text/RuleBasedCollator.html[`JDK RuleBasedCollator`] -`strength`:: Valid values are `primary`, `secondary`, `tertiary` or `identical`. See http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html[Oracle Java 8 Collator javadocs] for more information. +`strength`:: Valid values are `primary`, `secondary`, `tertiary` or `identical`. See {java-javadocs}java/text/Collator.html[Java Collator javadocs] for more information. -`decomposition`:: Valid values are `no`, `canonical`, or `full`. See http://docs.oracle.com/javase/8/docs/api/java/text/Collator.html[Oracle Java 8 Collator javadocs] for more information. +`decomposition`:: Valid values are `no`, `canonical`, or `full`. See {java-javadocs}java/text/Collator.html[Java Collator javadocs] for more information. .A `solr.CollationField` example: [source,xml] diff --git a/solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc b/solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc index 26f4a8759e0..55f37de7414 100644 --- a/solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc +++ b/solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc @@ -29,7 +29,7 @@ Python supports accessing JDBC using the https://pypi.python.org/pypi/JayDeBeApi [source,bash] ---- #!/usr/bin/env bash -# Java 8 must already be installed +# Java must already be installed pip install JayDeBeApi @@ -70,7 +70,7 @@ Jython supports accessing JDBC natively with Java interfaces or with the zxJDBC [source,bash] ---- #!/usr/bin/env bash -# Java 8 and Jython must already be installed +# Java and Jython must already be installed export CLASSPATH="$(echo $(ls /opt/solr/dist/solr-solrj* /opt/solr/dist/solrj-lib/*) | tr ' ' ':')" diff --git a/solr/solr-ref-guide/src/solr-jdbc-r.adoc b/solr/solr-ref-guide/src/solr-jdbc-r.adoc index e43dde4955b..90371359228 100644 --- a/solr/solr-ref-guide/src/solr-jdbc-r.adoc +++ b/solr/solr-ref-guide/src/solr-jdbc-r.adoc @@ -25,7 +25,7 @@ R supports accessing JDBC using the https://www.rforge.net/RJDBC/[RJDBC] library ---- #!/usr/bin/env bash -# Java 8 must already be installed and R configured with `R CMD javareconf` +# Java must already be installed and R configured with `R CMD javareconf` Rscript -e 'install.packages("RJDBC", dep=TRUE)' Rscript solr_rjdbc.R diff --git a/solr/solr-ref-guide/src/tokenizers.adoc b/solr/solr-ref-guide/src/tokenizers.adoc index a35149910f9..b3352399783 100644 --- a/solr/solr-ref-guide/src/tokenizers.adoc +++ b/solr/solr-ref-guide/src/tokenizers.adoc @@ -323,7 +323,7 @@ This tokenizer creates synonyms from file path hierarchies. This tokenizer uses a Java regular expression to break the input text stream into tokens. The expression provided by the pattern argument can be interpreted either as a delimiter that separates tokens, or to match patterns that should be extracted from the text as tokens. -See http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html[the Javadocs for `java.util.regex.Pattern`] for more information on Java regular expression syntax. +See {java-javadocs}java/util/regex/Pattern.html[the Javadocs for `java.util.regex.Pattern`] for more information on Java regular expression syntax. *Factory class:* `solr.PatternTokenizerFactory` @@ -470,7 +470,7 @@ Simple tokenizer that splits the text stream on whitespace and returns sequences `rule`:: Specifies how to define whitespace for the purpose of tokenization. Valid values: -* `java`: (Default) Uses https://docs.oracle.com/javase/8/docs/api/java/lang/Character.html#isWhitespace-int-[Character.isWhitespace(int)] +* `java`: (Default) Uses {java-javadocs}java/lang/Character.html#isWhitespace-int-[Character.isWhitespace(int)] * `unicode`: Uses Unicode's WHITESPACE property *Example:* @@ -488,4 +488,4 @@ Specifies how to define whitespace for the purpose of tokenization. Valid values == OpenNLP Tokenizer and OpenNLP Filters -See <> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters. \ No newline at end of file +See <> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters. diff --git a/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc b/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc index c4eaad8ad08..fdcfe5ab7e1 100644 --- a/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc +++ b/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc @@ -868,7 +868,7 @@ DateFormatTransformer applies only on the fields with an attribute `dateTimeForm This transformer recognizes the following attributes: dateTimeFormat:: -The format used for parsing this field. This must comply with the syntax of the http://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html[Java SimpleDateFormat] class. +The format used for parsing this field. This must comply with the syntax of the {java-javadocs}java/text/SimpleDateFormat.html[Java SimpleDateFormat] class. sourceColName:: The column on which the dateFormat is to be applied. If this is absent source and target are same. @@ -993,7 +993,7 @@ Note that this transformer can be used to either split a string into tokens base === The ScriptTransformer -The script transformer allows arbitrary transformer functions to be written in any scripting language supported by Java, such as Javascript, JRuby, Jython, Groovy, or BeanShell. Javascript is integrated into Java 8; you'll need to integrate other languages yourself. +The script transformer allows arbitrary transformer functions to be written in any scripting language supported by Java, such as Javascript, JRuby, Jython, Groovy, or BeanShell. Javascript is integrated into Java by default; you'll need to integrate other languages yourself. Each function you write must accept a row variable (which corresponds to a `Java Map`, thus permitting `get,put,remove` operations). Thus you can modify the value of an existing field or add new fields. The return value of the function is the returned object. diff --git a/solr/solr-ref-guide/src/working-with-dates.adoc b/solr/solr-ref-guide/src/working-with-dates.adoc index ae3b737e701..d5f3203c1c6 100644 --- a/solr/solr-ref-guide/src/working-with-dates.adoc +++ b/solr/solr-ref-guide/src/working-with-dates.adoc @@ -18,7 +18,7 @@ == Date Formatting -Solr's date fields (`DatePointField`, `DateRangeField` and the deprecated `TrieDateField`) represent "dates" as a point in time with millisecond precision. The format used is a restricted form of the canonical representation of dateTime in the http://www.w3.org/TR/xmlschema-2/#dateTime[XML Schema specification] – a restricted subset of https://en.wikipedia.org/wiki/ISO_8601[ISO-8601]. For those familiar with Java 8, Solr uses https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html#ISO_INSTANT[DateTimeFormatter.ISO_INSTANT] for formatting, and parsing too with "leniency". +Solr's date fields (`DatePointField`, `DateRangeField` and the deprecated `TrieDateField`) represent "dates" as a point in time with millisecond precision. The format used is a restricted form of the canonical representation of dateTime in the http://www.w3.org/TR/xmlschema-2/#dateTime[XML Schema specification] – a restricted subset of https://en.wikipedia.org/wiki/ISO_8601[ISO-8601]. For those familiar with Java date handling, Solr uses {java-javadocs}java/time/format/DateTimeFormatter.html#ISO_INSTANT[DateTimeFormatter.ISO_INSTANT] for formatting, and parsing too with "leniency". `YYYY-MM-DDThh:mm:ssZ` @@ -110,7 +110,7 @@ Example: ==== TZ -By default, all date math expressions are evaluated relative to the UTC TimeZone, but the `TZ` parameter can be specified to override this behaviour, by forcing all date based addition and rounding to be relative to the specified http://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html[time zone]. +By default, all date math expressions are evaluated relative to the UTC TimeZone, but the `TZ` parameter can be specified to override this behaviour, by forcing all date based addition and rounding to be relative to the specified {java-javadocs}java/util/TimeZone.html[time zone]. For example, the following request will use range faceting to facet over the current month, "per day" relative UTC: