lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1160668 [3/3] - in /lucene/dev/branches/flexscoring: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/ lucene/contrib/memory/src/java/org/apache/lucene/index/memory/ lucene/contrib/misc/src/java/org/apache/lucene/i...
Date Tue, 23 Aug 2011 12:51:47 GMT
Modified: lucene/dev/branches/flexscoring/solr/contrib/uima/src/test-files/solr-uima/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/contrib/uima/src/test-files/solr-uima/conf/schema.xml?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/contrib/uima/src/test-files/solr-uima/conf/schema.xml
(original)
+++ lucene/dev/branches/flexscoring/solr/contrib/uima/src/test-files/solr-uima/conf/schema.xml
Tue Aug 23 12:51:44 2011
@@ -663,7 +663,7 @@
     most applications.
   -->
   <!--
-    <similarity class="org.apache.lucene.search.DefaultSimilarity"/>
+    <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/>
   -->
   <!--
     ... OR ... Specify a SimilarityFactory class name implementation

Modified: lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/FieldType.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/FieldType.java
Tue Aug 23 12:51:44 2011
@@ -27,10 +27,10 @@ import org.apache.lucene.index.FieldInfo
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Similarity;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.UnicodeUtil;

Modified: lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
Tue Aug 23 12:51:44 2011
@@ -20,10 +20,10 @@ package org.apache.solr.schema;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Fieldable;
-import org.apache.lucene.search.DefaultSimilarity;
 import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Similarity;
-import org.apache.lucene.search.SimilarityProvider;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.Similarity;
+import org.apache.lucene.search.similarities.SimilarityProvider;
 import org.apache.lucene.util.Version;
 import org.apache.solr.common.ResourceLoader;
 import org.apache.solr.common.SolrException;

Modified: lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java
Tue Aug 23 12:51:44 2011
@@ -16,7 +16,7 @@ package org.apache.solr.schema;
  * limitations under the License.
  */
 
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.similarities.Similarity;
 import org.apache.solr.common.params.SolrParams;
 
 public abstract class SimilarityFactory {

Modified: lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
Tue Aug 23 12:51:44 2011
@@ -19,6 +19,7 @@ package org.apache.solr.search;
 import org.apache.lucene.index.*;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.*;
+import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.OpenBitSet;

Modified: lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/SolrSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/SolrSimilarityProvider.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/SolrSimilarityProvider.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/java/org/apache/solr/search/SolrSimilarityProvider.java
Tue Aug 23 12:51:44 2011
@@ -17,8 +17,8 @@ package org.apache.solr.search;
  * limitations under the License.
  */
 
-import org.apache.lucene.search.DefaultSimilarityProvider;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
+import org.apache.lucene.search.similarities.Similarity;
 import org.apache.solr.schema.FieldType;
 import org.apache.solr.schema.IndexSchema;
 

Modified: lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-copyfield-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-copyfield-test.xml?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-copyfield-test.xml
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-copyfield-test.xml
Tue Aug 23 12:51:44 2011
@@ -468,6 +468,6 @@
       A custom similarity may be specified here, but the default is fine
       for most applications.
  -->
- <!-- <similarity class="org.apache.lucene.search.DefaultSimilarity"/> -->
+ <!-- <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/>
-->
 
 </schema>

Modified: lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-required-fields.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-required-fields.xml?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-required-fields.xml
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test-files/solr/conf/schema-required-fields.xml
Tue Aug 23 12:51:44 2011
@@ -434,6 +434,6 @@
       A custom similarity may be specified here, but the default is fine
       for most applications.
  -->
- <!-- <similarity class="org.apache.lucene.search.DefaultSimilarity"/> -->
+ <!-- <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/>
-->
 
 </schema>

Modified: lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/CustomSimilarityFactory.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
Tue Aug 23 12:51:44 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.solr.schema;
 
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.similarities.Similarity;
 
 public class CustomSimilarityFactory extends SimilarityFactory {
   @Override

Modified: lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
Tue Aug 23 12:51:44 2011
@@ -27,7 +27,7 @@ import org.apache.solr.common.params.Map
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.request.SolrQueryRequest;
-import org.apache.lucene.search.SimilarityProvider;
+import org.apache.lucene.search.similarities.SimilarityProvider;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

Modified: lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
Tue Aug 23 12:51:44 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.solr.schema;
 
-import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
 
 public class MockConfigurableSimilarity extends DefaultSimilarity {
   private String passthrough;

Modified: lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
Tue Aug 23 12:51:44 2011
@@ -18,8 +18,8 @@ package org.apache.solr.schema;
  */
 
 import org.apache.lucene.misc.SweetSpotSimilarity;
-import org.apache.lucene.search.DefaultSimilarity;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.Similarity;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.search.SolrIndexSearcher;

Modified: lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
(original)
+++ lucene/dev/branches/flexscoring/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
Tue Aug 23 12:51:44 2011
@@ -19,9 +19,9 @@ package org.apache.solr.search.function;
 
 import org.apache.lucene.index.FieldInvertState;
 import org.apache.lucene.index.codecs.CodecProvider;
-import org.apache.lucene.search.DefaultSimilarity;
 import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.search.TFIDFSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.TFIDFSimilarity;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;

Modified: lucene/dev/branches/flexscoring/solr/example/example-DIH/solr/db/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/example/example-DIH/solr/db/conf/schema.xml?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/example/example-DIH/solr/db/conf/schema.xml (original)
+++ lucene/dev/branches/flexscoring/solr/example/example-DIH/solr/db/conf/schema.xml Tue Aug
23 12:51:44 2011
@@ -354,6 +354,6 @@
  <!-- Similarity is the scoring routine for each document vs. a query.
       A custom similarity may be specified here, but the default is fine
       for most applications.  -->
- <!-- <similarity class="org.apache.lucene.search.DefaultSimilarity"/> -->
+ <!-- <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/>
-->
 
 </schema>

Modified: lucene/dev/branches/flexscoring/solr/example/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/example/solr/conf/schema.xml?rev=1160668&r1=1160667&r2=1160668&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/example/solr/conf/schema.xml (original)
+++ lucene/dev/branches/flexscoring/solr/example/solr/conf/schema.xml Tue Aug 23 12:51:44
2011
@@ -615,7 +615,7 @@
  <!-- Similarity is the scoring routine for each document vs. a query.
       A custom similarity may be specified here, but the default is fine
       for most applications.  -->
- <!-- <similarity class="org.apache.lucene.search.DefaultSimilarity"/> -->
+ <!-- <similarity class="org.apache.lucene.search.similarities.DefaultSimilarity"/>
-->
  <!-- ... OR ...
       Specify a SimilarityFactory class name implementation
       allowing parameters to be used.



Mime
View raw message