From ba77a5f2eb13ffb418b84dac1df957dc3e9e2247 Mon Sep 17 00:00:00 2001 From: Cassandra Targett Date: Thu, 23 Jan 2020 15:28:20 -0600 Subject: [PATCH] SOLR-14214: Clean up client lists and references --- .../solr-ref-guide/src/client-api-lineup.adoc | 28 ++----------------- solr/solr-ref-guide/src/client-apis.adoc | 10 +++---- solr/solr-ref-guide/src/using-javascript.adoc | 4 +-- .../src/using-solr-from-ruby.adoc | 2 +- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/solr/solr-ref-guide/src/client-api-lineup.adoc b/solr/solr-ref-guide/src/client-api-lineup.adoc index 61564c94b45..edcbea4c287 100644 --- a/solr/solr-ref-guide/src/client-api-lineup.adoc +++ b/solr/solr-ref-guide/src/client-api-lineup.adoc @@ -1,4 +1,4 @@ -= Client API Lineup += Other Clients // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -16,28 +16,4 @@ // specific language governing permissions and limitations // under the License. -The Solr Wiki contains a list of client APIs at http://wiki.apache.org/solr/IntegratingSolr. - -Here is the list of client APIs, current at this writing (November 2011): - -// TODO: Change column width to %autowidth.spread when https://github.com/asciidoctor/asciidoctor-pdf/issues/599 is fixed - -[cols="20,20,60",options="header"] -|=== -|Name |Environment |URL -|SolRuby |Ruby |https://github.com/rsolr/rsolr -|DelSolr |Ruby |https://github.com/avvo/delsolr -|acts_as_solr |Rails |http://acts-as-solr.rubyforge.org/, http://rubyforge.org/projects/background-solr/ -|Flare |Rails |http://wiki.apache.org/solr/Flare -|SolPHP |PHP |http://wiki.apache.org/solr/SolPHP -|SolrJ |Java |http://wiki.apache.org/solr/SolJava -|Python API |Python |http://wiki.apache.org/solr/SolPython -|PySolr |Python |http://code.google.com/p/pysolr/ -|SolPerl |Perl |http://wiki.apache.org/solr/SolPerl -|Solr.pm |Perl |http://search.cpan.org/~garafola/Solr-0.03/lib/Solr.pm -|SolrForrest |Forrest/Cocoon |http://wiki.apache.org/solr/SolrForrest -|SolrSharp |C# |http://www.codeplex.com/solrsharp -|SolColdfusion |ColdFusion |http://solcoldfusion.riaforge.org/ -|SolrNet |.NET |https://github.com/mausch/SolrNet -|AJAX Solr |AJAX |http://github.com/evolvingweb/ajax-solr/wiki -|=== +The Solr Wiki contains a list of client APIs at https://cwiki.apache.org/confluence/display/solr/IntegratingSolr. diff --git a/solr/solr-ref-guide/src/client-apis.adoc b/solr/solr-ref-guide/src/client-apis.adoc index 7897680b123..6f3b828ace3 100644 --- a/solr/solr-ref-guide/src/client-apis.adoc +++ b/solr/solr-ref-guide/src/client-apis.adoc @@ -1,5 +1,5 @@ = Client APIs -:page-children: introduction-to-client-apis, choosing-an-output-format, client-api-lineup, using-javascript, using-python, using-solrj, using-solr-from-ruby +:page-children: introduction-to-client-apis, choosing-an-output-format, using-solrj, using-javascript, using-python, using-solr-from-ruby, client-api-lineup // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -23,14 +23,12 @@ This section discusses the available client APIs for Solr. It covers the followi <>: Information about choosing a response format in Solr. +<>: Detailed information about SolrJ, an API for working with Java applications. + <>: Explains why a client API is not needed for JavaScript responses. <>: Information about Python and JSON responses. -<>: A list of all Solr Client APIs, with links. - -<>: Detailed information about SolrJ, an API for working with Java applications. - <>: Detailed information about using Solr with Ruby applications. -<>: Describes the MBean request handler for programmatic access to Solr server statistics and information. +<>: How to find links to 3rd-party client libraries. diff --git a/solr/solr-ref-guide/src/using-javascript.adoc b/solr/solr-ref-guide/src/using-javascript.adoc index 33993713015..64c8894f7a1 100644 --- a/solr/solr-ref-guide/src/using-javascript.adoc +++ b/solr/solr-ref-guide/src/using-javascript.adoc @@ -22,6 +22,6 @@ HTTP requests can be sent to Solr using the standard `XMLHttpRequest` mechanism. By default, Solr sends <>, which are easily interpreted in JavaScript. You don't need to add anything to the request URL to have responses sent as JSON. -For more information and an excellent example, read the SolJSON page on the Solr Wiki: +For more information and an excellent example, take a look at the SolJSON page on the Solr Wiki: -http://wiki.apache.org/solr/SolJSON +https://cwiki.apache.org/confluence/display/solr/SolJSON#SolJSON-UsingSolr'sJSONoutputforAJAX diff --git a/solr/solr-ref-guide/src/using-solr-from-ruby.adoc b/solr/solr-ref-guide/src/using-solr-from-ruby.adoc index 922fb05b2d5..b34e56fc7d3 100644 --- a/solr/solr-ref-guide/src/using-solr-from-ruby.adoc +++ b/solr/solr-ref-guide/src/using-solr-from-ruby.adoc @@ -111,4 +111,4 @@ puts 'number of matches = ' + rsp['response']['numFound'].to_s rsp['response']['docs'].each { |doc| puts 'name field = ' + doc['name'] } ---- -For simple interactions with Solr, this may be all you need! If you are building complex interactions with Solr, then consider the libraries mentioned at https://wiki.apache.org/solr/Ruby%20Response%20Format +For simple interactions with Solr, this may be all you need! If you are building complex interactions with Solr, then consider the libraries mentioned in the https://cwiki.apache.org/confluence/display/solr/Ruby+Response+Format#RubyResponseFormat-Libraries[Solr Wiki].