You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/08/27 12:15:42 UTC
svn commit: r1620852 [3/3] - in /lucene/dev/branches/lucene5904: ./
dev-tools/ dev-tools/maven/solr/ lucene/ lucene/analysis/
lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/
lucene/analysis/common/src/test/org/...
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml Wed Aug 27 10:15:38 2014
@@ -47,7 +47,7 @@
<double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<!-- a basic solrconfig for postings highlighter -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml Wed Aug 27 10:15:38 2014
@@ -21,7 +21,7 @@
Test Config for QParser init
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard"
class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml Wed Aug 27 10:15:38 2014
@@ -22,7 +22,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml Wed Aug 27 10:15:38 2014
@@ -20,7 +20,7 @@
<!-- a basic solrconfig that tests can use when they want simple minimal solrconfig/schema
DO NOT ADD THINGS TO THIS CONFIG! -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard"
class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml Wed Aug 27 10:15:38 2014
@@ -23,7 +23,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
<config>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml Wed Aug 27 10:15:38 2014
@@ -23,7 +23,7 @@
* "gettableFiles" option
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml Wed Aug 27 10:15:38 2014
@@ -20,7 +20,7 @@
<config>
<jmx />
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
<!-- used to keep RAM reqs down for HdfsDirectoryFactory -->
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml Wed Aug 27 10:15:38 2014
@@ -26,7 +26,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}" />
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml Wed Aug 27 10:15:38 2014
@@ -23,7 +23,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml Wed Aug 27 10:15:38 2014
@@ -20,7 +20,7 @@
<!-- a basic solrconfig that tests can use when they want simple minimal solrconfig/schema
DO NOT ADD THINGS TO THIS CONFIG! -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml Wed Aug 27 10:15:38 2014
@@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<commitWithin>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -50,7 +50,7 @@
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</str>
</directoryFactory>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home.
If replication is in use, this should match the replication configuration. -->
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<commitWithin>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<commitWithin>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -26,7 +26,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<commitWithin>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/crazy-path-to-config.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/crazy-path-to-config.xml Wed Aug 27 10:15:38 2014
@@ -22,7 +22,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="collection1/conf/solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/solr-50-all.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/solr-50-all.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/solr-50-all.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/solr-50-all.xml Wed Aug 27 10:15:38 2014
@@ -53,4 +53,4 @@
<int name="connTimeout">${connTimeout:110}</int>
</shardHandlerFactory>
-</solr>
\ No newline at end of file
+</solr>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java Wed Aug 27 10:15:38 2014
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.util.Version;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilterFactory;
import org.apache.lucene.analysis.util.ResourceLoader;
@@ -200,7 +201,7 @@ public class TestWordDelimiterFilterFact
String testText = "I borrowed $5,400.00 at 25% interest-rate";
ResourceLoader loader = new SolrResourceLoader("solr/collection1");
Map<String,String> args = new HashMap<>();
- args.put("luceneMatchVersion", TEST_VERSION_CURRENT.toString());
+ args.put("luceneMatchVersion", Version.LATEST.toString());
args.put("generateWordParts", "1");
args.put("generateNumberParts", "1");
args.put("catenateWords", "1");
@@ -224,7 +225,7 @@ public class TestWordDelimiterFilterFact
/* custom behavior */
args = new HashMap<>();
// use a custom type mapping
- args.put("luceneMatchVersion", TEST_VERSION_CURRENT.toString());
+ args.put("luceneMatchVersion", Version.LATEST.toString());
args.put("generateWordParts", "1");
args.put("generateNumberParts", "1");
args.put("catenateWords", "1");
Modified: lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java Wed Aug 27 10:15:38 2014
@@ -48,8 +48,11 @@ public class TestSolrIndexConfig extends
public void testIndexConfigParsing() throws Exception {
IndexWriterConfig iwc = solrConfig.indexConfig.toIndexWriterConfig(h.getCore().getLatestSchema());
-
- checkIndexWriterConfig(iwc);
+ try {
+ checkIndexWriterConfig(iwc);
+ } finally {
+ iwc.getInfoStream().close();
+ }
}
private void checkIndexWriterConfig(LiveIndexWriterConfig iwc) {
Modified: lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/search/TestStressLucene.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/search/TestStressLucene.java (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test/org/apache/solr/search/TestStressLucene.java Wed Aug 27 10:15:38 2014
@@ -101,7 +101,7 @@ public class TestStressLucene extends Te
// RAMDirectory dir = new RAMDirectory();
- // final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ // final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new WhitespaceAnalyzer()));
Directory dir = newDirectory();
Modified: lucene/dev/branches/lucene5904/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -1001,6 +1001,29 @@
</lst>
</requestHandler>
+ <requestHandler name="/update/json" class="solr.UpdateRequestHandler">
+ <!-- See below for information on defining
+ updateRequestProcessorChains that can be used by name
+ on each Update Request
+ -->
+ <lst name="defaults">
+ <str name="update.contentType">application/json</str>
+ <str name="update.chain">add-unknown-fields-to-the-schema</str>
+ </lst>
+ </requestHandler>
+
+ <requestHandler name="/update/json/docs" class="solr.UpdateRequestHandler">
+ <!-- See below for information on defining
+ updateRequestProcessorChains that can be used by name
+ on each Update Request
+ -->
+ <lst name="defaults">
+ <str name="update.contentType">application/json</str>
+ <str name="update.chain">add-unknown-fields-to-the-schema</str>
+ <bool name="json.command">false</bool>
+ </lst>
+ </requestHandler>
+
<!-- Solr Cell Update Request Handler
http://wiki.apache.org/solr/ExtractingRequestHandler
Modified: lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/solrconfig-minimal.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/solrconfig-minimal.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<commitWithin>
Modified: lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<commitWithin>
Modified: lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTests.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTests.java (original)
+++ lucene/dev/branches/lucene5904/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTests.java Wed Aug 27 10:15:38 2014
@@ -17,14 +17,22 @@
package org.apache.solr.client.solrj;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.InputStreamEntity;
import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
import org.apache.solr.client.solrj.impl.BinaryResponseParser;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.ByteArrayInputStream;
+
public class SolrSchemalessExampleTests extends SolrExampleTestsBase {
private static Logger log = LoggerFactory
.getLogger(SolrSchemalessExampleTests.class);
@@ -33,7 +41,27 @@ public class SolrSchemalessExampleTests
public static void beforeTest() throws Exception {
createJetty(ExternalPaths.EXAMPLE_SCHEMALESS_HOME, null, null);
}
-
+
+ @Test
+ public void testArbitraryJsonIndexing() throws Exception {
+ HttpSolrServer server = (HttpSolrServer) getSolrServer();
+ server.deleteByQuery("*:*");
+ server.commit();
+ assertNumFound("*:*", 0); // make sure it got in
+
+ // two docs, one with uniqueKey, another without it
+ String json = "{\"id\":\"abc1\", \"name\": \"name1\"} {\"name\" : \"name2\"}";
+ HttpClient httpClient = server.getHttpClient();
+ HttpPost post = new HttpPost(server.getBaseURL() + "/update/json/docs");
+ post.setHeader("Content-Type", "application/json");
+ post.setEntity(new InputStreamEntity(new ByteArrayInputStream(json.getBytes("UTF-8")), -1));
+ HttpResponse response = httpClient.execute(post);
+ assertEquals(200, response.getStatusLine().getStatusCode());
+ server.commit();
+ assertNumFound("*:*", 2);
+ }
+
+
@Override
public SolrServer createNewSolrServer() {
try {
Modified: lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/common.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/common.css?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/common.css (original)
+++ lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/common.css Wed Aug 27 10:15:38 2014
@@ -195,6 +195,11 @@ ul
z-index: 42;
}
+.scroll #header
+{
+ position: absolute;
+}
+
#header #solr
{
background-image: url( ../../img/solr.png );
Modified: lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/menu.css?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/menu.css (original)
+++ lucene/dev/branches/lucene5904/solr/webapp/web/css/styles/menu.css Wed Aug 27 10:15:38 2014
@@ -24,6 +24,12 @@ limitations under the License.
width: 150px;
}
+.scroll #menu-wrapper
+{
+ position: absolute;
+ top: 90px;
+}
+
.has-environment #menu-wrapper
{
top: 160px;
Modified: lucene/dev/branches/lucene5904/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/webapp/web/js/scripts/app.js?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/lucene5904/solr/webapp/web/js/scripts/app.js Wed Aug 27 10:15:38 2014
@@ -144,6 +144,8 @@ var sammy = $.sammy
this.active_core = active_element;
}
+
+ check_fixed_menu();
}
);
}
@@ -403,6 +405,9 @@ var solr_admin = function( app_config )
}
);
+ check_fixed_menu();
+ $( window ).resize( check_fixed_menu );
+
var system_url = config.solr_path + '/admin/info/system?wt=json';
$.ajax
(
@@ -594,6 +599,11 @@ var solr_admin = function( app_config )
);
};
+ check_fixed_menu = function check_fixed_menu()
+ {
+ $( '#wrapper' ).toggleClass( 'scroll', $( window ).height() < $( '#menu-wrapper' ).height() + $( '#header' ).height() + 40 );
+ }
+
};
var connection_check_delay = 1000;