lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r923497 - in /lucene/solr/branches/solr: contrib/extraction/src/test/resources/solr/conf/ src/java/org/apache/solr/analysis/ src/test/test-files/solr/conf/
Date Mon, 15 Mar 2010 23:11:14 GMT
Author: rmuir
Date: Mon Mar 15 23:11:14 2010
New Revision: 923497

URL: http://svn.apache.org/viewvc?rev=923497&view=rev
Log:
remove deprecated HtmlStrip*Tokenizer, which only overrides reset() with the charfilter for
a tokenizer

Removed:
    lucene/solr/branches/solr/src/java/org/apache/solr/analysis/HTMLStripReader.java
    lucene/solr/branches/solr/src/java/org/apache/solr/analysis/HTMLStripStandardTokenizerFactory.java
    lucene/solr/branches/solr/src/java/org/apache/solr/analysis/HTMLStripWhitespaceTokenizerFactory.java
Modified:
    lucene/solr/branches/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
    lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-copyfield-test.xml
    lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-required-fields.xml
    lucene/solr/branches/solr/src/test/test-files/solr/conf/schema.xml
    lucene/solr/branches/solr/src/test/test-files/solr/conf/schema12.xml

Modified: lucene/solr/branches/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml?rev=923497&r1=923496&r2=923497&view=diff
==============================================================================
--- lucene/solr/branches/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml (original)
+++ lucene/solr/branches/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml Mon
Mar 15 23:11:14 2010
@@ -158,10 +158,16 @@
       <analyzer><tokenizer class="solr.WhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
     <fieldtype name="HTMLstandardtok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripStandardTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="HTMLwhitetok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>

Modified: lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-copyfield-test.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-copyfield-test.xml?rev=923497&r1=923496&r2=923497&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-copyfield-test.xml (original)
+++ lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-copyfield-test.xml Mon
Mar 15 23:11:14 2010
@@ -150,10 +150,16 @@
       <analyzer><tokenizer class="solr.WhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
     <fieldtype name="HTMLstandardtok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripStandardTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="HTMLwhitetok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>

Modified: lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-required-fields.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-required-fields.xml?rev=923497&r1=923496&r2=923497&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-required-fields.xml (original)
+++ lucene/solr/branches/solr/src/test/test-files/solr/conf/schema-required-fields.xml Mon
Mar 15 23:11:14 2010
@@ -141,10 +141,16 @@
       <analyzer><tokenizer class="solr.WhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
     <fieldtype name="HTMLstandardtok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripStandardTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="HTMLwhitetok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>

Modified: lucene/solr/branches/solr/src/test/test-files/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/test/test-files/solr/conf/schema.xml?rev=923497&r1=923496&r2=923497&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/test/test-files/solr/conf/schema.xml (original)
+++ lucene/solr/branches/solr/src/test/test-files/solr/conf/schema.xml Mon Mar 15 23:11:14
2010
@@ -171,10 +171,16 @@
       <analyzer><tokenizer class="solr.WhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
     <fieldtype name="HTMLstandardtok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripStandardTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="HTMLwhitetok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>

Modified: lucene/solr/branches/solr/src/test/test-files/solr/conf/schema12.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/test/test-files/solr/conf/schema12.xml?rev=923497&r1=923496&r2=923497&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/test/test-files/solr/conf/schema12.xml (original)
+++ lucene/solr/branches/solr/src/test/test-files/solr/conf/schema12.xml Mon Mar 15 23:11:14
2010
@@ -172,10 +172,16 @@
       <analyzer><tokenizer class="solr.WhitespaceTokenizerFactory"/></analyzer>
     </fieldtype>
     <fieldtype name="HTMLstandardtok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripStandardTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="HTMLwhitetok" class="solr.TextField">
-      <analyzer><tokenizer class="solr.HTMLStripWhitespaceTokenizerFactory"/></analyzer>
+      <analyzer>
+      <charFilter class="solr.HTMLStripCharFilterFactory"/>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
     </fieldtype>
     <fieldtype name="standardtokfilt" class="solr.TextField">
       <analyzer>



Mime
View raw message