You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2018/04/05 18:39:15 UTC
[1/2] lucene-solr:master: SOLR-10616: add 'java-javadocs' as a
variable in the ref-guide,
and cleanup some overly specific mentions of 'Java 8'
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 25720fc4d -> 6032d6011
refs/heads/master 4137f320a -> 9009fe637
SOLR-10616: add 'java-javadocs' as a variable in the ref-guide, and cleanup some overly specific mentions of 'Java 8'
Continuation of SOLR-12118
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9009fe63
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9009fe63
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9009fe63
Branch: refs/heads/master
Commit: 9009fe6378c8f3fe1757ef744114c3e558919a68
Parents: 4137f32
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Apr 5 11:36:24 2018 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Apr 5 11:36:24 2018 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/build.xml | 1 +
solr/solr-ref-guide/src/_config.yml.template | 1 +
solr/solr-ref-guide/src/language-analysis.adoc | 12 ++++++------
solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc | 4 ++--
solr/solr-ref-guide/src/solr-jdbc-r.adoc | 2 +-
solr/solr-ref-guide/src/tokenizers.adoc | 6 +++---
...ed-data-store-data-with-the-data-import-handler.adoc | 4 ++--
solr/solr-ref-guide/src/working-with-dates.adoc | 4 ++--
8 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/build.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml
index 745a2a5..92c236a 100644
--- a/solr/solr-ref-guide/build.xml
+++ b/solr/solr-ref-guide/build.xml
@@ -230,6 +230,7 @@
<attribute key="solr-guide-draft-status" value="${solr-guide-draft-status}" />
<attribute key="solr-guide-version" value="${solr-guide-version}" />
<attribute key="solr-docs-version" value="${solr-docs-version}" />
+ <attribute key="java-javadocs" value="${javadoc.link}" />
<attribute key="solr-javadocs" value="@{solr-javadocs}" />
<attribute key="lucene-javadocs" value="@{lucene-javadocs}" />
<attribute key="build-date" value="${DSTAMP}" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/_config.yml.template
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index f789b8c..1c55dc4 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}"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/language-analysis.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adoc
index ef476d7..10dd264 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 `<fieldtype>` 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]
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc
----------------------------------------------------------------------
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 26f4a87..55f37de 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 ' ' ':')"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/solr-jdbc-r.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/solr-jdbc-r.adoc b/solr/solr-ref-guide/src/solr-jdbc-r.adoc
index e43dde4..9037135 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/tokenizers.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/tokenizers.adoc b/solr/solr-ref-guide/src/tokenizers.adoc
index a351499..b335239 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 <<language-analysis.adoc#opennlp-integration,OpenNLP Integration>> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters.
\ No newline at end of file
+See <<language-analysis.adoc#opennlp-integration,OpenNLP Integration>> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc
----------------------------------------------------------------------
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 c4eaad8..fdcfe5a 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<String,Object>`, 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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9009fe63/solr/solr-ref-guide/src/working-with-dates.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/working-with-dates.adoc b/solr/solr-ref-guide/src/working-with-dates.adoc
index ae3b737..d5f3203 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:
[2/2] lucene-solr:branch_7x: SOLR-10616: add 'java-javadocs' as a
variable in the ref-guide,
and cleanup some overly specific mentions of 'Java 8'
Posted by ho...@apache.org.
SOLR-10616: add 'java-javadocs' as a variable in the ref-guide, and cleanup some overly specific mentions of 'Java 8'
Continuation of SOLR-12118
(cherry picked from commit 9009fe6378c8f3fe1757ef744114c3e558919a68)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6032d601
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6032d601
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6032d601
Branch: refs/heads/branch_7x
Commit: 6032d6011cedc14ddf2370401cfbd87488ef2b3b
Parents: 25720fc
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Apr 5 11:36:24 2018 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Apr 5 11:36:39 2018 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/build.xml | 1 +
solr/solr-ref-guide/src/_config.yml.template | 1 +
solr/solr-ref-guide/src/language-analysis.adoc | 12 ++++++------
solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc | 4 ++--
solr/solr-ref-guide/src/solr-jdbc-r.adoc | 2 +-
solr/solr-ref-guide/src/tokenizers.adoc | 6 +++---
...ed-data-store-data-with-the-data-import-handler.adoc | 4 ++--
solr/solr-ref-guide/src/working-with-dates.adoc | 4 ++--
8 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/build.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml
index 745a2a5..92c236a 100644
--- a/solr/solr-ref-guide/build.xml
+++ b/solr/solr-ref-guide/build.xml
@@ -230,6 +230,7 @@
<attribute key="solr-guide-draft-status" value="${solr-guide-draft-status}" />
<attribute key="solr-guide-version" value="${solr-guide-version}" />
<attribute key="solr-docs-version" value="${solr-docs-version}" />
+ <attribute key="java-javadocs" value="${javadoc.link}" />
<attribute key="solr-javadocs" value="@{solr-javadocs}" />
<attribute key="lucene-javadocs" value="@{lucene-javadocs}" />
<attribute key="build-date" value="${DSTAMP}" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/_config.yml.template
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_config.yml.template b/solr/solr-ref-guide/src/_config.yml.template
index f789b8c..1c55dc4 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}"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/language-analysis.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/language-analysis.adoc b/solr/solr-ref-guide/src/language-analysis.adoc
index ef476d7..10dd264 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 `<fieldtype>` 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]
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/solr-jdbc-python-jython.adoc
----------------------------------------------------------------------
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 26f4a87..55f37de 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 ' ' ':')"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/solr-jdbc-r.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/solr-jdbc-r.adoc b/solr/solr-ref-guide/src/solr-jdbc-r.adoc
index e43dde4..9037135 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/tokenizers.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/tokenizers.adoc b/solr/solr-ref-guide/src/tokenizers.adoc
index a351499..b335239 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 <<language-analysis.adoc#opennlp-integration,OpenNLP Integration>> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters.
\ No newline at end of file
+See <<language-analysis.adoc#opennlp-integration,OpenNLP Integration>> for information about using the OpenNLP Tokenizer, along with information about available OpenNLP token filters.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/uploading-structured-data-store-data-with-the-data-import-handler.adoc
----------------------------------------------------------------------
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 c4eaad8..fdcfe5a 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<String,Object>`, 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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6032d601/solr/solr-ref-guide/src/working-with-dates.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/working-with-dates.adoc b/solr/solr-ref-guide/src/working-with-dates.adoc
index ae3b737..d5f3203 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: