You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/01/08 03:44:21 UTC
svn commit: r1430118 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/
lucene/core/src/test/org/apache/l...
Author: hossman
Date: Tue Jan 8 02:44:20 2013
New Revision: 1430118
URL: http://svn.apache.org/viewvc?rev=1430118&view=rev
Log:
SOLR-4272: doc sample xml tweaks to reduce confusion if people cut/paste (merge r1430116)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/site/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -51,18 +51,15 @@ import org.apache.commons.lang.StringUti
* </p>
*
* <pre class="prettyprint">
- * <updateRequestProcessorChain>
- * <processor class="solr.ConcatFieldUpdateProcessorFactory">
- * <str name="delimiter">; </str>
- * <lst name="exclude">
- * <str name="fieldName">primary_author</str>
- * </lst>
- * </processor>
- * <processor class="solr.FirstFieldValueUpdateProcessorFactory">
- * <str name="fieldName">primary_author</str>
- * </processor>
- * </updateRequestProcessorChain>
- * </pre>
+ * <processor class="solr.ConcatFieldUpdateProcessorFactory">
+ * <str name="delimiter">; </str>
+ * <lst name="exclude">
+ * <str name="fieldName">primary_author</str>
+ * </lst>
+ * </processor>
+ * <processor class="solr.FirstFieldValueUpdateProcessorFactory">
+ * <str name="fieldName">primary_author</str>
+ * </processor></pre>
*/
public final class ConcatFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -50,20 +50,17 @@ import org.apache.commons.lang.StringUti
* </p>
*
* <pre class="prettyprint">
- * <updateRequestProcessorChain>
- * <processor class="solr.CloneFieldUpdateProcessorFactory">
- * <str name="source">category</str>
- * <str name="dest">category_count</str>
- * </processor>
- * <processor class="solr.CountFieldValuesUpdateProcessorFactory">
- * <str name="fieldName">category_count</str>
- * </processor>
- * <processor class="solr.DefaultValueUpdateProcessorFactory">
- * <str name="fieldName">category_count</str>
- * <int name="value">0</int>
- * </processor>
- * </updateRequestProcessorChain>
- * </pre>
+ * <processor class="solr.CloneFieldUpdateProcessorFactory">
+ * <str name="source">category</str>
+ * <str name="dest">category_count</str>
+ * </processor>
+ * <processor class="solr.CountFieldValuesUpdateProcessorFactory">
+ * <str name="fieldName">category_count</str>
+ * </processor>
+ * <processor class="solr.DefaultValueUpdateProcessorFactory">
+ * <str name="fieldName">category_count</str>
+ * <int name="value">0</int>
+ * </processor></pre>
*
* <p>
* <b>NOTE:</b> The use of {@link DefaultValueUpdateProcessorFactory} is
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -43,8 +43,7 @@ import org.apache.solr.core.SolrCore;
* <str>solr.TrieIntField</str>
* <str>solr.TrieLongField</str>
* </arr>
- * </processor>
- * </pre>
+ * </processor></pre>
*/
public final class FieldLengthUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -91,8 +91,7 @@ import org.apache.solr.util.plugin.SolrC
* <lst name="exclude">
* <str name="typeClass">solr.DateField</str>
* </lst>
- * </processor>
- * </pre>
+ * </processor></pre>
*
* <p>
* Subclasses define the default selection behavior to be applied if no
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -43,8 +43,7 @@ import java.io.StringWriter;
* <pre class="prettyprint">
* <processor class="solr.HTMLStripFieldUpdateProcessorFactory">
* <str name="typeClass">solr.StrField</str>
- * </processor>
- * </pre>
+ * </processor></pre>
*/
public final class HTMLStripFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -42,22 +42,16 @@ import org.apache.solr.response.SolrQuer
* </p>
*
* <pre class="prettyprint">
- * <updateRequestProcessorChain>
- * <processor class="solr.IgnoreFieldUpdateProcessorFactory" />
- * </updateRequestProcessorChain>
- * </pre>
+ * <processor class="solr.IgnoreFieldUpdateProcessorFactory" /></pre>
*
* <p>
* In this second example, any field name ending in "_raw" found in a
* document being added would be removed...
* </p>
* <pre class="prettyprint">
- * <updateRequestProcessorChain>
- * <processor class="solr.IgnoreFieldUpdateProcessorFactory">
- * <str name="fieldRegex">.*_raw</str>
- * </processor>
- * </updateRequestProcessorChain>
- * </pre>
+ * <processor class="solr.IgnoreFieldUpdateProcessorFactory">
+ * <str name="fieldRegex">.*_raw</str>
+ * </processor></pre>
*/
public final class IgnoreFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RegexReplaceProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -52,8 +52,7 @@ import org.slf4j.LoggerFactory;
* <str name="fieldName">title</str>
* <str name="pattern">\s+</str>
* <str name="replacement"> </str>
- * </processor>
- * </pre>
+ * </processor></pre>
*
* @see java.util.regex.Pattern
*/
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -39,8 +39,7 @@ import org.apache.solr.response.SolrQuer
* <lst name="exclude">
* <str name="fieldRegex">.*_literal</str>
* </lst>
- * </processor>
- * </pre>
+ * </processor></pre>
*
*/
public final class RemoveBlankFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -39,8 +39,7 @@ import org.apache.solr.response.SolrQuer
* <lst name="exclude">
* <str name="fieldRegex">.*_literal</str>
* </lst>
- * </processor>
- * </pre>
+ * </processor></pre>
*/
public final class TrimFieldUpdateProcessorFactory extends FieldMutatingUpdateProcessorFactory {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java?rev=1430118&r1=1430117&r2=1430118&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java Tue Jan 8 02:44:20 2013
@@ -40,8 +40,7 @@ import org.apache.solr.response.SolrQuer
* <processor class="solr.TruncateFieldUpdateProcessorFactory">
* <str name="typeClass">solr.StrField</str>
* <int name="maxLength">100</int>
- * </processor>
- * </pre>
+ * </processor></pre>
*/
public final class TruncateFieldUpdateProcessorFactory
extends FieldMutatingUpdateProcessorFactory {