svn commit: r1092084 - in /nutch/branches/branch-1.3: CHANGES.txt conf/nutch-default.xml src/java/org/apache/nutch/indexer/solr/SolrConstants.java

[ma...@apache.org]

Author: markus
Date: Thu Apr 14 09:59:11 2011
New Revision: 1092084

URL: http://svn.apache.org/viewvc?rev=1092084&view=rev
Log:
NUTCH-976 Rename properties solrindex.* to solr.*

Modified:
    nutch/branches/branch-1.3/CHANGES.txt
    nutch/branches/branch-1.3/conf/nutch-default.xml
    nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrConstants.java

Modified: nutch/branches/branch-1.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.3/CHANGES.txt?rev=1092084&r1=1092083&r2=1092084&view=diff
==============================================================================
--- nutch/branches/branch-1.3/CHANGES.txt (original)
+++ nutch/branches/branch-1.3/CHANGES.txt Thu Apr 14 09:59:11 2011
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Release 1.3 - Current Development
 
+* NUTCH-976 Rename properties solrindex.* to solr.* (markus)
+
 * NUTCH-890 Fix IllegalAccessError with slf4j used in Solrj (markus)
 
 * NUTCH-891 Subcollection plugin won't require blacklist any more (markus)

Modified: nutch/branches/branch-1.3/conf/nutch-default.xml
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.3/conf/nutch-default.xml?rev=1092084&r1=1092083&r2=1092084&view=diff
==============================================================================
--- nutch/branches/branch-1.3/conf/nutch-default.xml (original)
+++ nutch/branches/branch-1.3/conf/nutch-default.xml Thu Apr 14 09:59:11 2011
@@ -1024,8 +1024,9 @@
 </property>
 
 <!-- solr index properties -->
+
 <property>
-  <name>solrindex.mapping.file</name>
+  <name>solr.mapping.file</name>
   <value>solrindex-mapping.xml</value>
   <description>
   Defines the name of the file that will be used in the mapping of internal
@@ -1033,4 +1034,14 @@
   </description>
 </property>
 
+<property> 
+  <name>solr.commit.size</name>
+  <value>1000</value>
+  <description>
+  Defines the number of documents to send to Solr in a single update batch.
+  Decrease when handling very large documents to prevent Nutch from running
+  out of memory.
+  </description>  
+</property> 
+
 </configuration>

Modified: nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrConstants.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrConstants.java?rev=1092084&r1=1092083&r2=1092084&view=diff
==============================================================================
--- nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrConstants.java (original)
+++ nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrConstants.java Thu Apr 14 09:59:11 2011
@@ -22,6 +22,8 @@ public interface SolrConstants {
   public static final String SERVER_URL = SOLR_PREFIX + "server.url";
 
   public static final String COMMIT_SIZE = SOLR_PREFIX + "commit.size";
+
+  public static final String MAPPING_FILE = SOLR_PREFIX + "mapping.file";
   
   public static final String ID_FIELD = "id";