You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2012/08/04 23:41:00 UTC
svn commit: r1369478 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/core/ lucene/demo/ lucene/facet/ lucene/grouping/
luce...
Author: janhoy
Date: Sat Aug 4 21:40:55 2012
New Revision: 1369478
URL: http://svn.apache.org/viewvc?rev=1369478&view=rev
Log:
SOLR-3439: Make SolrCell easier to use out of the box (merge from trunk)
Added:
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/debug.vm
- copied unchanged from r1369433, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/debug.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/join-doc.vm
- copied unchanged from r1369433, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/join-doc.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/product-doc.vm
- copied unchanged from r1369433, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/product-doc.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/richtext-doc.vm
- copied unchanged from r1369433, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/richtext-doc.vm
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/
- copied from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/7z.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/7z.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/README
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/README
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/ai.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/ai.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/aiff.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/aiff.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/asc.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/asc.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/audio.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/audio.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/bin.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/bin.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/bz2.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/bz2.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/c.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/c.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/cfc.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/cfc.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/cfm.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/cfm.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/chm.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/chm.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/class.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/class.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/conf.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/conf.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/cpp.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/cpp.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/cs.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/cs.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/css.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/css.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/csv.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/csv.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/deb.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/deb.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/divx.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/divx.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/doc.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/doc.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/dot.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/dot.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/eml.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/eml.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/enc.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/enc.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/file.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/file.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/gif.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/gif.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/gz.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/gz.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/hlp.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/hlp.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/htm.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/htm.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/html.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/html.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/image.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/image.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/iso.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/iso.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/jar.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/jar.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/java.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/java.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/jpeg.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/jpeg.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/jpg.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/jpg.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/js.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/js.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/lua.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/lua.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/m.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/m.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/mm.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/mm.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/mov.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/mov.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/mp3.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/mp3.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/mpg.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/mpg.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/odc.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/odc.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/odf.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/odf.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/odg.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/odg.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/odi.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/odi.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/odp.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/odp.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/ods.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/ods.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/odt.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/odt.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/ogg.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/ogg.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/pdf.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/pdf.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/pgp.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/pgp.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/php.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/php.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/pl.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/pl.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/png.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/png.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/ppt.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/ppt.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/ps.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/ps.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/py.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/py.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/ram.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/ram.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/rar.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/rar.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/rb.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/rb.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/rm.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/rm.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/rpm.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/rpm.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/rtf.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/rtf.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/sig.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/sig.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/sql.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/sql.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/swf.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/swf.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/sxc.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/sxc.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/sxd.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/sxd.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/sxi.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/sxi.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/sxw.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/sxw.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/tar.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/tar.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/tex.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/tex.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/tgz.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/tgz.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/txt.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/txt.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/vcf.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/vcf.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/video.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/video.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/vsd.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/vsd.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/wav.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/wav.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/wma.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/wma.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/wmv.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/wmv.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/xls.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/xls.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/xml.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/xml.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/xpi.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/xpi.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/xvid.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/xvid.png
lucene/dev/branches/branch_4x/solr/webapp/web/img/filetypes/zip.png
- copied unchanged from r1369433, lucene/dev/trunk/solr/webapp/web/img/filetypes/zip.png
Removed:
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/doc.vm
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_fields.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_ranges.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hit.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hitGrouped.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat Aug 4 21:40:55 2012
@@ -200,7 +200,7 @@ Other Changes
* SOLR-3215: Clone SolrInputDocument when distrib indexing so that update processors after
the distrib update process do not process the document twice. (Mark Miller)
-
+
* SOLR-3683: Improved error handling if an <analyzer> contains both an
explicit class attribute, as well as nested factories. (hossman)
@@ -213,6 +213,10 @@ Other Changes
using a file (this previously worked in debug mode only). When configuration errors are
encountered, the error message is returned in XML format. (James Dyer)
+* SOLR-3439: Make SolrCell easier to use out of the box. Also improves "/browse" to display
+ rich-text documents correctly, along with facets for author and content_type.
+ With the new "content" field, highlighting of body is supported. See also SOLR-3672 for
+ easier posting of a whole directory structure. (Jack Krupansky, janhoy)
================== 4.0.0-ALPHA ==================
More information about this release, including any errata related to the
Modified: lucene/dev/branches/branch_4x/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java Sat Aug 4 21:40:55 2012
@@ -30,6 +30,8 @@ import org.apache.velocity.runtime.Runti
import org.apache.velocity.tools.generic.*;
import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
public class VelocityResponseWriter implements QueryResponseWriter {
@@ -81,6 +83,64 @@ public class VelocityResponseWriter impl
context.put("engine", engine); // for $engine.resourceExists(...)
+ // Mimetype to extension map for detecting file type and show icon
+ // List of types match the icons in /solr/img/filetypes
+ Map<String, String> mimeToExt = new HashMap<String, String>() {{
+ put("application/x-7z-compressed", "7z");
+ put("application/postscript", "ai");
+ put("application/pgp-signature", "asc");
+ put("application/octet-stream", "bin");
+ put("application/x-bzip2", "bz2");
+ put("text/x-c", "c");
+ put("application/vnd.ms-htmlhelp", "chm");
+ put("application/java-vm", "class");
+ put("text/css", "css");
+ put("text/csv", "csv");
+ put("application/x-debian-package", "deb");
+ put("application/msword", "doc");
+ put("message/rfc822", "eml");
+ put("image/gif", "gif");
+ put("application/winhlp", "hlp");
+ put("text/html", "html");
+ put("application/java-archive", "jar");
+ put("text/x-java-source", "java");
+ put("image/jpeg", "jpeg");
+ put("application/javascript", "js");
+ put("application/vnd.oasis.opendocument.chart", "odc");
+ put("application/vnd.oasis.opendocument.formula", "odf");
+ put("application/vnd.oasis.opendocument.graphics", "odg");
+ put("application/vnd.oasis.opendocument.image", "odi");
+ put("application/vnd.oasis.opendocument.presentation", "odp");
+ put("application/vnd.oasis.opendocument.spreadsheet", "ods");
+ put("application/vnd.oasis.opendocument.text", "odt");
+ put("application/pdf", "pdf");
+ put("application/pgp-encrypted", "pgp");
+ put("image/png", "png");
+ put("application/vnd.ms-powerpoint", "ppt");
+ put("audio/x-pn-realaudio", "ram");
+ put("application/x-rar-compressed", "rar");
+ put("application/vnd.rn-realmedia", "rm");
+ put("application/rtf", "rtf");
+ put("application/x-shockwave-flash", "swf");
+ put("application/vnd.sun.xml.calc", "sxc");
+ put("application/vnd.sun.xml.draw", "sxd");
+ put("application/vnd.sun.xml.impress", "sxi");
+ put("application/vnd.sun.xml.writer", "sxw");
+ put("application/x-tar", "tar");
+ put("application/x-tex", "tex");
+ put("text/plain", "txt");
+ put("text/x-vcard", "vcf");
+ put("application/vnd.visio", "vsd");
+ put("audio/x-wav", "wav");
+ put("audio/x-ms-wma", "wma");
+ put("video/x-ms-wmv", "wmv");
+ put("application/vnd.ms-excel", "xls");
+ put("application/xml", "xml");
+ put("application/x-xpinstall", "xpi");
+ put("application/zip", "zip");
+ }};
+ context.put("mimeToExt", mimeToExt);
+
String layout_template = request.getParams().get("v.layout");
String json_wrapper = request.getParams().get("v.json");
boolean wrap_response = (layout_template != null) || (json_wrapper != null);
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml Sat Aug 4 21:40:55 2012
@@ -109,7 +109,10 @@
<!-- Common metadata fields, named specifically to match up with
SolrCell metadata when parsing rich documents such as Word, PDF.
Some fields are multiValued only because Tika currently may return
- multiple values for them.
+ multiple values for them. Some metadata is parsed from the documents,
+ but there are some which come from the client context:
+ "content_type": From the HTTP headers of incoming stream
+ "resourcename": From SolrCell request param resource.name
-->
<field name="title" type="text_general" indexed="true" stored="true" multiValued="true"/>
<field name="subject" type="text_general" indexed="true" stored="true"/>
@@ -118,10 +121,18 @@
<field name="author" type="text_general" indexed="true" stored="true"/>
<field name="keywords" type="text_general" indexed="true" stored="true"/>
<field name="category" type="text_general" indexed="true" stored="true"/>
+ <field name="resourcename" type="text_general" indexed="true" stored="true"/>
+ <field name="url" type="text_general" indexed="true" stored="true"/>
<field name="content_type" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="last_modified" type="date" indexed="true" stored="true"/>
<field name="links" type="string" indexed="true" stored="true" multiValued="true"/>
+ <!-- Main body of document extracted by SolrCell.
+ NOTE: This field is not indexed by default, since it is also copied to "text"
+ using copyField below. This is to save space. Use this field for returning and
+ highlighting document content. Use the "text" field to search the content. -->
+ <field name="content" type="text_general" indexed="false" stored="true" multiValued="true"/>
+
<!-- catchall field, containing all other searchable text fields (implemented
via copyField further on in this schema -->
@@ -232,6 +243,19 @@
<!-- Copy the price into a currency enabled field (default USD) -->
<copyField source="price" dest="price_c"/>
+
+ <!-- Text fields from SolrCell to search by default in our catch-all field -->
+ <copyField source="title" dest="text"/>
+ <copyField source="author" dest="text"/>
+ <copyField source="description" dest="text"/>
+ <copyField source="keywords" dest="text"/>
+ <copyField source="content" dest="text"/>
+ <copyField source="content_type" dest="text"/>
+ <copyField source="resourcename" dest="text"/>
+ <copyField source="url" dest="text"/>
+
+ <!-- Create a string version of author for faceting -->
+ <copyField source="author" dest="author_s"/>
<!-- Above, multiple source fields are copied to the [text] field.
Another way to map multiple source fields to the same
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml Sat Aug 4 21:40:55 2012
@@ -850,6 +850,7 @@
<str name="defType">edismax</str>
<str name="qf">
text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+ title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
</str>
<str name="df">text</str>
<str name="mm">100%</str>
@@ -859,14 +860,17 @@
<str name="mlt.qf">
text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+ title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
</str>
- <str name="mlt.fl">text,features,name,sku,id,manu,cat</str>
+ <str name="mlt.fl">text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename</str>
<int name="mlt.count">3</int>
<!-- Faceting defaults -->
<str name="facet">on</str>
<str name="facet.field">cat</str>
<str name="facet.field">manu_exact</str>
+ <str name="facet.field">content_type</str>
+ <str name="facet.field">author_s</str>
<str name="facet.query">ipod</str>
<str name="facet.query">GB</str>
<str name="facet.mincount">1</str>
@@ -889,9 +893,18 @@
<!-- Highlighting defaults -->
<str name="hl">on</str>
- <str name="hl.fl">text features name</str>
+ <str name="hl.fl">content features title name</str>
+ <str name="hl.encoder">html</str>
+ <str name="hl.simple.pre"><b></str>
+ <str name="hl.simple.post"></b></str>
+ <str name="f.title.hl.fragsize">0</str>
+ <str name="f.title.hl.alternateField">title</str>
<str name="f.name.hl.fragsize">0</str>
<str name="f.name.hl.alternateField">name</str>
+ <str name="f.content.hl.snippets">3</str>
+ <str name="f.content.hl.fragsize">200</str>
+ <str name="f.content.hl.alternateField">content</str>
+ <str name="f.content.hl.maxAlternateFieldLength">750</str>
<!-- Spell checking defaults -->
<str name="spellcheck">on</str>
@@ -952,9 +965,6 @@
startup="lazy"
class="solr.extraction.ExtractingRequestHandler" >
<lst name="defaults">
- <!-- All the main content goes into "text"... if you need to return
- the extracted text or do highlighting, use a stored field. -->
- <str name="fmap.content">text</str>
<str name="lowernames">true</str>
<str name="uprefix">ignored_</str>
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/VM_global_library.vm?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/VM_global_library.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/VM_global_library.vm Sat Aug 4 21:40:55 2012
@@ -133,10 +133,14 @@
#macro(field $f)
#if($response.response.highlighting.get($docId).get($f).get(0))
- $!response.response.highlighting.get($docId).get($f).get(0)
+ #set($pad = "")
+ #foreach($v in $response.response.highlighting.get($docId).get($f))
+$pad$v##
+ #set($pad = " ... ")
+ #end
#else
#foreach($v in $doc.getFieldValues($f))
- $v
+$v##
#end
#end
#end
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_fields.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_fields.vm?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_fields.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_fields.vm Sat Aug 4 21:40:55 2012
@@ -1,6 +1,8 @@
#if($response.facetFields)
<h2 #annTitle("Facets generated by adding &facet.field= to the request")>Field Facets</h2>
#foreach($field in $response.facetFields)
+ ## Hide facets without value
+ #if($field.values.size() > 0)
<span class="facet-field">$field.name</span>
<ul>
@@ -8,5 +10,6 @@
<li><a href="#url_for_facet_filter($field.name, $facet.name)">$facet.name</a> ($facet.count)</li>
#end
</ul>
+ #end
#end
#end
\ No newline at end of file
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_ranges.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_ranges.vm?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_ranges.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/facet_ranges.vm Sat Aug 4 21:40:55 2012
@@ -1,5 +1,7 @@
<h2 #annTitle("Facets generated by adding &facet.range= to the request")>Range Facets</h2>
#foreach ($field in $response.response.facet_counts.facet_ranges)
+ ## Hide facets without value
+ #if($field.value.counts.size() > 0)
#set($name = $field.key)
#set($display = $name)
#set($f = $field.value.counts)
@@ -9,4 +11,5 @@
#set($before = $field.value.before)
#set($after = $field.value.after)
#display_facet_range($f, $display, $name, $start, $end, $gap, $before, $after)
+ #end
#end
\ No newline at end of file
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hit.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hit.vm?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hit.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hit.vm Sat Aug 4 21:40:55 2012
@@ -1,5 +1,11 @@
#set($docId = $doc.getFieldValue('id'))
<div class="result-document">
- #parse("doc.vm")
+#if($doc.getFieldValue('name'))
+ #parse("product-doc.vm")
+#elseif($doc.getFieldValue('compName_s'))
+ #parse("join-doc.vm")
+#else
+ #parse("richtext-doc.vm")
+#end
</div>
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hitGrouped.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hitGrouped.vm?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hitGrouped.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/hitGrouped.vm Sat Aug 4 21:40:55 2012
@@ -6,7 +6,13 @@
<div class="group-doclist" #annTitle("Contains the top scoring documents in the group")>
#foreach ($doc in $group.doclist)
#set($docId = $doc.getFieldValue('id'))
- #parse("doc.vm")
+ #if($doc.getFieldValue('name'))
+ #parse("product-doc.vm")
+ #elseif($doc.getFieldValue('compName_s'))
+ #parse("join-doc.vm")
+ #else
+ #parse("richtext-doc.vm")
+ #end
#end
</div>
#end</div>
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css?rev=1369478&r1=1369477&r2=1369478&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css Sat Aug 4 21:40:55 2012
@@ -167,6 +167,10 @@ a {
width:60%;
}
+.result-body{
+ background: #ddd;
+}
+
.mlt{
}