diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 035cff3539c..0807a4aa87d 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -319,6 +319,8 @@ Documentation * SOLR-1792: Documented peculiar behavior of TestHarness.LocalRequestFactory (hossman) +* SOLR-1848: Added in http://localhost:8983/solr/example/queries.html to demonstrate Queries in the Example. + ================== Release 1.4.0 ================== Release Date: See http://lucene.apache.org/solr for the official release date. diff --git a/solr/example/contexts/static-content.xml b/solr/example/contexts/static-content.xml new file mode 100644 index 00000000000..120ad86e000 --- /dev/null +++ b/solr/example/contexts/static-content.xml @@ -0,0 +1,8 @@ + + /solr/example + /static/ + + org.mortbay.jetty.servlet.DefaultServlet + / + + diff --git a/solr/example/static/queries.html b/solr/example/static/queries.html new file mode 100644 index 00000000000..f00eafac7cd --- /dev/null +++ b/solr/example/static/queries.html @@ -0,0 +1,45 @@ + + + + + + + +Welcome to Solr + + + +

Welcome to Solr!

+Solr +

Sample Queries

+ +

The following queries below can be used to try out different queries against the Solr example. This assumes you have indexed documents first. See the Solr Tutorial for more info on indexing.

+

Basics

+ +

Spatial

+ + + \ No newline at end of file diff --git a/solr/site/skin/basic.css b/solr/site/skin/basic.css index 4ed58b99ae7..eb24c326c6c 100755 --- a/solr/site/skin/basic.css +++ b/solr/site/skin/basic.css @@ -163,4 +163,4 @@ p { .codefrag { font-family: "Courier New", Courier, monospace; font-size: 110%; -} +} \ No newline at end of file diff --git a/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png b/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png index cdb460a1da7..dd790d31697 100755 Binary files a/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png and b/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png differ diff --git a/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png b/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png index 3eff254fd17..790f43fa388 100755 Binary files a/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png and b/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png differ diff --git a/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png b/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png index b175f27b16e..1987c0aa476 100755 Binary files a/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png and b/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png differ diff --git a/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png b/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png index e9f4440d1f5..b69812acfd7 100755 Binary files a/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png and b/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png differ diff --git a/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png b/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png index f1e015b36c3..07e5ebeb723 100755 Binary files a/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png and b/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png differ diff --git a/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png b/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png index e9f4440d1f5..b69812acfd7 100755 Binary files a/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png and b/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png differ diff --git a/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png b/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png index 29388b5efc9..5e44a80812b 100755 Binary files a/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png and b/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png differ diff --git a/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png b/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png index 944ed73333d..cbaea9c9a7e 100755 Binary files a/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png and b/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png differ diff --git a/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png b/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png index c4d4a8c7ce3..6fe87de6193 100755 Binary files a/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png and b/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png differ diff --git a/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png b/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png index 944ed73333d..cbaea9c9a7e 100755 Binary files a/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png and b/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png differ diff --git a/solr/site/skin/print.css b/solr/site/skin/print.css index 8916b9fc01e..aaa99319acd 100755 --- a/solr/site/skin/print.css +++ b/solr/site/skin/print.css @@ -51,4 +51,4 @@ a:link, a:visited { acronym { border: 0; -} +} \ No newline at end of file diff --git a/solr/site/skin/profile.css b/solr/site/skin/profile.css index ca72cdbd10b..2ed95546ec6 100755 --- a/solr/site/skin/profile.css +++ b/solr/site/skin/profile.css @@ -172,4 +172,4 @@ a:hover { color:#6587ff} } - + \ No newline at end of file diff --git a/solr/site/skin/screen.css b/solr/site/skin/screen.css index aa8c457cb30..c6084f81df3 100755 --- a/solr/site/skin/screen.css +++ b/solr/site/skin/screen.css @@ -584,4 +584,4 @@ p.instruction { list-style-image: url('../images/instruction_arrow.png'); list-style-position: outside; margin-left: 2em; -} +} \ No newline at end of file diff --git a/solr/site/tutorial.html b/solr/site/tutorial.html index 6f195a74703..71f411b0282 100755 --- a/solr/site/tutorial.html +++ b/solr/site/tutorial.html @@ -5,7 +5,7 @@ -Solr tutorial (version 3.0.0.2010.03.26.09.09.44) +Solr tutorial (version 3.0.0.2010.03.26.12.34.39) @@ -157,7 +157,7 @@ document.write("Last Published: " + document.lastModified);
- This document is for Apache Solr version 3.0.0.2010.03.26.09.09.44. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using. + This document is for Apache Solr version 3.0.0.2010.03.26.12.34.39. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
@@ -181,7 +181,7 @@ document.write("Last Published: " + document.lastModified);

Solr tutorial

- This document is for Apache Solr version 3.0.0.2010.03.26.09.09.44. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using. + This document is for Apache Solr version 3.0.0.2010.03.26.12.34.39. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.