Return-Path: 
 <solr-commits-return-679-apmail-lucene-solr-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-solr-commits-archive@locus.apache.org
Received: (qmail 15082 invoked from network); 30 Nov 2006 19:00:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Nov 2006 19:00:48 -0000
Received: (qmail 53599 invoked by uid 500); 30 Nov 2006 19:00:57 -0000
Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org
Received: (qmail 53561 invoked by uid 500); 30 Nov 2006 19:00:57 -0000
Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:solr-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:solr-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:solr-commits@lucene.apache.org>
List-Id: <solr-commits.lucene.apache.org>
Reply-To: solr-dev@lucene.apache.org
Delivered-To: mailing list solr-commits@lucene.apache.org
Received: (qmail 53552 invoked by uid 99); 30 Nov 2006 19:00:57 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Nov 2006 11:00:57 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Nov 2006 11:00:47 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0FCC71A9846; Thu, 30 Nov 2006 11:00:09 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r481036 -
 /incubator/solr/trunk/example/solr/conf/schema.xml
Date: Thu, 30 Nov 2006 19:00:08 -0000
To: solr-commits@lucene.apache.org
From: yonik@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061130190009.0FCC71A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: yonik
Date: Thu Nov 30 11:00:07 2006
New Revision: 481036

URL: http://svn.apache.org/viewvc?view=rev&rev=481036
Log:
little schema cleanups

Modified:
    incubator/solr/trunk/example/solr/conf/schema.xml

Modified: incubator/solr/trunk/example/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/incubator/solr/trunk/example/solr/conf/schema.xml?view=diff&rev=481036&r1=481035&r2=481036
==============================================================================
--- incubator/solr/trunk/example/solr/conf/schema.xml (original)
+++ incubator/solr/trunk/example/solr/conf/schema.xml Thu Nov 30 11:00:07 2006
@@ -16,12 +16,12 @@
  limitations under the License.
 -->
 
-<!-- The Solr schema file. This file should be named "schema.xml" and
+<!-- This is the Solr schema file. This file should be named "schema.xml" and
  should be in the conf directory under the solr home
  (i.e. ./solr/conf/schema.xml by default) 
  or located where the classloader for the Solr webapp can find it.
 
- For more information, on how to customize this file, please see...
+ For more information, on how to customize this file, please see
  http://wiki.apache.org/solr/SchemaXml
 -->
 
@@ -35,9 +35,12 @@
 
   <types>
     <!-- field type definitions. The "name" attribute is
-         just a label to be used by field definitions.  The "class"
-         attribute and any other attributes determine the real
-         behavior of the fieldtype.  -->
+       just a label to be used by field definitions.  The "class"
+       attribute and any other attributes determine the real
+       behavior of the fieldtype.
+         Class names starting with "solr" refer to java classes in the
+       org.apache.solr.analysis package.
+    -->
 
     <!-- The StrField type is not analyzed, but indexed/stored verbatim.  
        - StrField and TextField support an optional compressThreshold which
@@ -112,32 +115,18 @@
          this type on the same document, with the purpose of preventing false phrase
          matching across fields.
 
-         For more info on customizing your analyzer chain, please see...
-	  http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters
-	 
+         For more info on customizing your analyzer chain, please see
+         http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters
      -->
 
-     <!-- Standard analyzer commonly used by Lucene developers
-     -->
-    <!-- Standard analyzer commonly used by Lucene developers -->
-    <fieldtype name="text_lu" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory"/>
-        <filter class="solr.EnglishPorterFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldtype>
-    <!-- One could also specify an existing Analyzer class that has a
+    <!-- One can also specify an existing Analyzer class that has a
          default constructor via the class attribute on the analyzer element
-    <fieldtype name="text_lu" class="solr.TextField">
+    <fieldtype name="text_greek" class="solr.TextField">
       <analyzer class="org.apache.lucene.analysis.el.GreekAnalyzer"/>
     </fieldType>
     -->
-    
-    <!-- A text field that only splits on whitespace for more exact matching -->
+
+    <!-- A text field that only splits on whitespace for exact matching of words -->
     <fieldtype name="text_ws" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
@@ -153,24 +142,24 @@
         -->
     <fieldtype name="text" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
-          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-          <!-- in this example, we will only use synonyms at query time
-          <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-          -->
-          <filter class="solr.StopFilterFactory" ignoreCase="true"/>
-          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-          <filter class="solr.LowerCaseFilterFactory"/>
-          <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
-          <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <!-- in this example, we will only use synonyms at query time
+        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+        -->
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-          <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-          <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-          <filter class="solr.StopFilterFactory" ignoreCase="true"/>
-          <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
-          <filter class="solr.LowerCaseFilterFactory"/>
-          <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
-          <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
     </fieldtype>
 
@@ -181,7 +170,7 @@
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
@@ -252,9 +241,7 @@
  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
  <defaultSearchField>text</defaultSearchField>
 
- <!-- SolrQueryParser configuration:
-        defaultOperator="AND|OR"
- -->
+ <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
  <solrQueryParser defaultOperator="OR"/>
 
   <!-- copyField commands copy one field to another at the time a document