You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/01/04 15:53:21 UTC
svn commit: r1649347 [13/31] - in /lucene/dev/branches/lucene6005: ./
dev-tools/ dev-tools/idea/solr/contrib/dataimporthandler-extras/
dev-tools/idea/solr/contrib/extraction/
dev-tools/idea/solr/contrib/map-reduce/
dev-tools/idea/solr/contrib/velocity/...
Modified: lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml Sun Jan 4 14:53:12 2015
@@ -23,18 +23,18 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
- <fieldtype name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
- <fieldtype name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary" decomposition="canonical"/>
- <fieldtype name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
- <fieldtype name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
+ <fieldType name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
+ <fieldType name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
+ <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary" decomposition="canonical"/>
+ <fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
+ <fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
</types>
<fields>
Modified: lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml Sun Jan 4 14:53:12 2015
@@ -23,27 +23,27 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- ignores punctuation and whitespace -->
- <fieldtype name="sort_ignore_punctuation_t" class="solr.ICUCollationField"
+ <fieldType name="sort_ignore_punctuation_t" class="solr.ICUCollationField"
locale="en" strength="primary" alternate="shifted"/>
<!-- ignores only whitespace -->
- <fieldtype name="sort_ignore_space_t" class="solr.ICUCollationField"
+ <fieldType name="sort_ignore_space_t" class="solr.ICUCollationField"
locale="en" strength="primary" alternate="shifted" variableTop=" "/>
<!-- ignores only accents, but not case -->
- <fieldtype name="sort_ignore_accents_t" class="solr.ICUCollationField"
+ <fieldType name="sort_ignore_accents_t" class="solr.ICUCollationField"
locale="en" strength="primary" caseLevel="true"/>
<!-- sorts numerics in numeric order -->
- <fieldtype name="sort_numerics_t" class="solr.ICUCollationField"
+ <fieldType name="sort_numerics_t" class="solr.ICUCollationField"
locale="en" numeric="true"/>
<!-- sorts uppercase before lowercase -->
- <fieldtype name="sort_uppercase_first_t" class="solr.ICUCollationField"
+ <fieldType name="sort_uppercase_first_t" class="solr.ICUCollationField"
locale="en" strength="tertiary" caseFirst="upper"/>
</types>
Modified: lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java Sun Jan 4 14:53:12 2015
@@ -60,7 +60,7 @@ public class TestICUCollationField exten
* Ugly: but what to do? We want to test custom sort, which reads rules in as a resource.
* These are largish files, and jvm-specific (as our documentation says, you should always
* look out for jvm differences with collation).
- * So its preferable to create this file on-the-fly.
+ * So it's preferable to create this file on-the-fly.
*/
public static String setupSolrHome() throws Exception {
String tmpFile = createTempDir().toFile().getAbsolutePath();
Modified: lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java Sun Jan 4 14:53:12 2015
@@ -58,7 +58,7 @@ public class TestICUCollationFieldDocVal
* Ugly: but what to do? We want to test custom sort, which reads rules in as a resource.
* These are largish files, and jvm-specific (as our documentation says, you should always
* look out for jvm differences with collation).
- * So its preferable to create this file on-the-fly.
+ * So it's preferable to create this file on-the-fly.
*/
public static String setupSolrHome() throws Exception {
File tmpFile = createTempDir().toFile();
Modified: lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java Sun Jan 4 14:53:12 2015
@@ -33,7 +33,7 @@ public abstract class MultiDelegateExpre
}
}
/**
- * <code>AddExpression</code> returns the sum of it's components' values.
+ * <code>AddExpression</code> returns the sum of its components' values.
*/
class AddExpression extends MultiDelegateExpression {
public AddExpression(Expression[] delegates) {
@@ -56,7 +56,7 @@ class AddExpression extends MultiDelegat
}
}
/**
- * <code>MultiplyExpression</code> returns the product of it's delegates' values.
+ * <code>MultiplyExpression</code> returns the product of its delegates' values.
*/
class MultiplyExpression extends MultiDelegateExpression {
public MultiplyExpression(Expression[] delegates) {
@@ -110,7 +110,7 @@ class DateMathExpression extends MultiDe
}
}
/**
- * <code>ConcatenateExpression</code> returns the concatenation of it's delegates' values in the order given.
+ * <code>ConcatenateExpression</code> returns the concatenation of its delegates' values in the order given.
*/
class ConcatenateExpression extends MultiDelegateExpression {
public ConcatenateExpression(Expression[] delegates) {
Modified: lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java Sun Jan 4 14:53:12 2015
@@ -22,7 +22,7 @@ import org.apache.lucene.queries.functio
import org.apache.solr.analytics.util.AnalyticsParams;
/**
- * <code>AddDoubleFunction</code> returns the sum of it's components.
+ * <code>AddDoubleFunction</code> returns the sum of its components.
*/
public class AddDoubleFunction extends MultiDoubleFunction {
public final static String NAME = AnalyticsParams.ADD;
Modified: lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java Sun Jan 4 14:53:12 2015
@@ -22,7 +22,7 @@ import org.apache.lucene.queries.functio
import org.apache.solr.analytics.util.AnalyticsParams;
/**
- * <code>MultiplyDoubleFunction</code> returns the product of it's components.
+ * <code>MultiplyDoubleFunction</code> returns the product of its components.
*/
public class MultiplyDoubleFunction extends MultiDoubleFunction {
public final static String NAME = AnalyticsParams.MULTIPLY;
Modified: lucene/dev/branches/lucene6005/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml Sun Jan 4 14:53:12 2015
@@ -31,7 +31,7 @@
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
attribute and any other attributes determine the real type and
- behavior of the fieldtype.
+ behavior of the fieldType.
-->
<!-- numeric field types that store and index the text
@@ -46,10 +46,10 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldtype name="boolean" class="solr.BoolField" />
- <fieldtype name="string" class="solr.StrField" />
+ <fieldType name="boolean" class="solr.BoolField" />
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="uuid" class="solr.UUIDField" />
Modified: lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml Sun Jan 4 14:53:12 2015
@@ -255,7 +255,7 @@
<!-- since fields of this type are by default not stored or indexed, any data added to
them will be ignored outright
-->
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -305,7 +305,7 @@
</requestHandler>
<!-- DisMaxRequestHandler allows easy searching across multiple fields
- for simple user-entered phrases. It's implementation is now
+ for simple user-entered phrases. Its implementation is now
just the standard SearchHandler with a default query parser
of "dismax".
see http://wiki.apache.org/solr/DisMaxRequestHandler
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java Sun Jan 4 14:53:12 2015
@@ -534,7 +534,7 @@ public class MailEntityProcessor extends
}
public void remove() {
- throw new UnsupportedOperationException("Its read only mode...");
+ throw new UnsupportedOperationException("It's read only mode...");
}
private void getTopLevelFolders(Store mailBox) {
@@ -544,7 +544,7 @@ public class MailEntityProcessor extends
try {
folders.add(mailbox.getFolder(topLevelFolders.get(i)));
} catch (MessagingException e) {
- // skip bad ones unless its the last one and still no good folder
+ // skip bad ones unless it's the last one and still no good folder
if (folders.size() == 0 && i == topLevelFolders.size() - 1) throw new DataImportHandlerException(
DataImportHandlerException.SEVERE, "Folder retreival failed");
}
@@ -705,7 +705,7 @@ public class MailEntityProcessor extends
}
public void remove() {
- throw new UnsupportedOperationException("Its read only mode...");
+ throw new UnsupportedOperationException("It's read only mode...");
}
private SearchTerm getSearchTerm() {
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml Sun Jan 4 14:53:12 2015
@@ -190,7 +190,7 @@
<!-- since fields of this type are by default not stored or indexed, any data added to
them will be ignored outright
-->
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -294,7 +294,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler">
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java Sun Jan 4 14:53:12 2015
@@ -50,11 +50,12 @@ public class ContextImpl extends Context
private Map<String, Object> entitySession, globalSession;
+ private Exception lastException = null;
+
DocBuilder.DocWrapper doc;
DocBuilder docBuilder;
- Exception lastException = null;
public ContextImpl(EntityProcessorWrapper epw, VariableResolver resolver,
@@ -255,4 +256,8 @@ public class ContextImpl extends Context
public String replaceTokens(String template) {
return resolver.replaceTokens(template);
}
+
+ public Exception getLastException() { return lastException; }
+
+ public void setLastException(Exception lastException) {this.lastException = lastException; }
}
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java Sun Jan 4 14:53:12 2015
@@ -171,7 +171,7 @@ public class DocBuilder {
currentProcess = Context.FULL_DUMP;
}
ContextImpl ctx = new ContextImpl(null, getVariableResolver(), null, currentProcess, session, null, this);
- ctx.lastException = lastException;
+ ctx.setLastException(lastException);
listener.onEvent(ctx);
}
@@ -400,7 +400,7 @@ public class DocBuilder {
}
private void resetEntity(EntityProcessorWrapper epw) {
- epw.setInitalized(false);
+ epw.setInitialized(false);
for (EntityProcessorWrapper child : epw.getChildren()) {
resetEntity(child);
}
@@ -432,9 +432,9 @@ public class DocBuilder {
pk == null ? Context.FULL_DUMP : Context.DELTA_DUMP,
session, parentCtx, this);
epw.init(ctx);
- if (!epw.isInitalized()) {
+ if (!epw.isInitialized()) {
entitiesToDestroy.add(epw);
- epw.setInitalized(true);
+ epw.setInitialized(true);
}
if (reqParams.getStart() > 0) {
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java Sun Jan 4 14:53:12 2015
@@ -45,7 +45,7 @@ public class EntityProcessorWrapper exte
private DataSource datasource;
private List<EntityProcessorWrapper> children = new ArrayList<>();
private DocBuilder docBuilder;
- private boolean initalized;
+ private boolean initialized;
private String onError;
private Context context;
private VariableResolver resolver;
@@ -317,11 +317,23 @@ public class EntityProcessorWrapper exte
this.datasource = datasource;
}
+ /** @deprecated will be removed in Solr 6; use {@link #isInitialized()} */
+ @Deprecated
public boolean isInitalized() {
- return initalized;
+ return initialized;
}
- public void setInitalized(boolean initalized) {
- this.initalized = initalized;
+ public boolean isInitialized() {
+ return initialized;
+ }
+
+ /** @deprecated will be removed in Solr 6; use {@link #setInitialized(boolean)} */
+ @Deprecated
+ public void setInitalized(boolean initialized) {
+ this.initialized = initialized;
+ }
+
+ public void setInitialized(boolean initialized) {
+ this.initialized = initialized;
}
}
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java Sun Jan 4 14:53:12 2015
@@ -19,10 +19,10 @@ package org.apache.solr.handler.dataimpo
import org.apache.http.client.HttpClient;
import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
@@ -64,7 +64,7 @@ public class SolrEntityProcessor extends
public static final int TIMEOUT_SECS = 5 * 60; // 5 minutes
public static final int ROWS_DEFAULT = 50;
- private SolrServer solrServer = null;
+ private SolrClient solrClient = null;
private String queryString;
private int rows = ROWS_DEFAULT;
private String[] filterQueries;
@@ -100,11 +100,11 @@ public class SolrEntityProcessor extends
// (wt="javabin|xml") default is javabin
if ("xml".equals(context.getResolvedEntityAttribute(CommonParams.WT))) {
// TODO: it doesn't matter for this impl when passing a client currently, but we should close this!
- solrServer = new HttpSolrServer(url.toExternalForm(), client, new XMLResponseParser());
+ solrClient = new HttpSolrClient(url.toExternalForm(), client, new XMLResponseParser());
LOG.info("using XMLResponseParser");
} else {
// TODO: it doesn't matter for this impl when passing a client currently, but we should close this!
- solrServer = new HttpSolrServer(url.toExternalForm(), client);
+ solrClient = new HttpSolrClient(url.toExternalForm(), client);
LOG.info("using BinaryResponseParser");
}
} catch (MalformedURLException e) {
@@ -184,7 +184,7 @@ public class SolrEntityProcessor extends
QueryResponse response = null;
try {
- response = solrServer.query(solrQuery);
+ response = solrClient.query(solrQuery);
} catch (SolrServerException e) {
if (ABORT.equals(onError)) {
wrapAndThrow(SEVERE, e);
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java Sun Jan 4 14:53:12 2015
@@ -566,7 +566,7 @@ public class XPathRecordReader {
for (Node n : searchList)
if (n.xpathName.equals(xpathName)) return n;
// new territory! add a new node for this Xpath bitty
- Node n = new Node(xpathName, this); // a minimal Node initalization
+ Node n = new Node(xpathName, this); // a minimal Node initialization
Matcher m = ATTRIB_PRESENT_WITHVAL.matcher(xpathName);
if (m.find()) {
n.name = m.group(1);
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -298,7 +298,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler">
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -296,7 +296,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler">
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml Sun Jan 4 14:53:12 2015
@@ -29,7 +29,7 @@
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
</fieldType>
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
<fields>
<field name="id" type="string" indexed="true" stored="true" required="true" />
@@ -57,4 +57,4 @@
<uniqueKey>id</uniqueKey>
<defaultSearchField>desc</defaultSearchField>
<solrQueryParser defaultOperator="OR"/>
-</schema>
\ No newline at end of file
+</schema>
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml Sun Jan 4 14:53:12 2015
@@ -240,7 +240,7 @@
<!-- since fields of this type are by default not stored or indexed, any data added to
them will be ignored outright
-->
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -297,7 +297,7 @@
To enable solr1.1 behavior, remove the /update handler or change its path
- "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized
+ "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized
only once. This can not be changed for each request.
-->
<requestHandler name="/update" class="solr.UpdateRequestHandler" >
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Sun Jan 4 14:53:12 2015
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.DirectXmlRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
@@ -67,7 +67,7 @@ public class TestContentStreamDataSource
params.set("command", "full-import");
params.set("clean", "false");
req.setParams(params);
- HttpSolrServer solrServer = new HttpSolrServer(buildUrl(jetty.getLocalPort(), "/solr"));
+ HttpSolrClient solrServer = new HttpSolrClient(buildUrl(jetty.getLocalPort(), "/solr"));
solrServer.request(req);
ModifiableSolrParams qparams = new ModifiableSolrParams();
qparams.add("q", "*:*");
@@ -87,7 +87,7 @@ public class TestContentStreamDataSource
"clean", "false", UpdateParams.COMMIT, "false",
UpdateParams.COMMIT_WITHIN, "1000");
req.setParams(params);
- HttpSolrServer solrServer = new HttpSolrServer(buildUrl(jetty.getLocalPort(), "/solr"));
+ HttpSolrClient solrServer = new HttpSolrClient(buildUrl(jetty.getLocalPort(), "/solr"));
solrServer.request(req);
Thread.sleep(100);
ModifiableSolrParams queryAll = params("q", "*");
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java Sun Jan 4 14:53:12 2015
@@ -324,7 +324,7 @@ public class TestDocBuilder2 extends Abs
@Override
public void onEvent(Context ctx) {
executed = true;
- lastException = ((ContextImpl) ctx).lastException;
+ lastException = ((ContextImpl) ctx).getLastException();
}
}
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java Sun Jan 4 14:53:12 2015
@@ -27,10 +27,9 @@ import java.util.Map.Entry;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.common.SolrInputDocument;
import org.junit.After;
import org.junit.AfterClass;
@@ -281,7 +280,7 @@ public class TestSolrEntityProcessorEndT
sidl.add(sd);
}
- HttpSolrServer solrServer = new HttpSolrServer(getSourceUrl());
+ HttpSolrClient solrServer = new HttpSolrClient(getSourceUrl());
try {
solrServer.setConnectionTimeout(15000);
solrServer.setSoTimeout(30000);
Modified: lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java Sun Jan 4 14:53:12 2015
@@ -394,7 +394,7 @@ public class TestXPathRecordReader exten
+ " this <boo>top level</boo> is ignored because it is external to the forEach\n"
+ " <status>as is <boo>this element</boo></status>\n"
+ " <contenido id=\"10097\" idioma=\"cat\">\n"
- + " This one is <boo>not ignored as its</boo> inside a forEach\n"
+ + " This one is <boo>not ignored as it's</boo> inside a forEach\n"
+ " <antetitulo><i> big <boo>antler</boo></i></antetitulo>\n"
+ " <titulo> My <i>flattened <boo>title</boo></i> </titulo>\n"
+ " <resumen> My summary <i>skip this!</i> </resumen>\n"
@@ -407,15 +407,15 @@ public class TestXPathRecordReader exten
assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
assertEquals("This one is inside a forEach", m.get("cont").toString().trim());
- assertEquals("10097" ,m.get("id"));
- assertEquals("My flattened title",m.get("title").toString().trim());
- assertEquals("My summary" ,m.get("resume").toString().trim());
- assertEquals("My text" ,m.get("text").toString().trim());
- assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(0) );
- assertEquals("antler" ,(String) ((List) m.get("descdend")).get(1) );
- assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(2) );
- assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(3) );
- assertEquals("sub clauses" ,m.get("inr_descd").toString().trim());
+ assertEquals("10097" ,m.get("id"));
+ assertEquals("My flattened title" ,m.get("title").toString().trim());
+ assertEquals("My summary" ,m.get("resume").toString().trim());
+ assertEquals("My text" ,m.get("text").toString().trim());
+ assertEquals("not ignored as it's",(String) ((List) m.get("descdend")).get(0) );
+ assertEquals("antler" ,(String) ((List) m.get("descdend")).get(1) );
+ assertEquals("Within the body of" ,(String) ((List) m.get("descdend")).get(2) );
+ assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(3) );
+ assertEquals("sub clauses" ,m.get("inr_descd").toString().trim());
}
@Test
@@ -428,7 +428,7 @@ public class TestXPathRecordReader exten
+ " this <boo>top level</boo> is ignored because it is external to the forEach\n"
+ " <status>as is <boo>this element</boo></status>\n"
+ " <contenido id=\"10097\" idioma=\"cat\">\n"
- + " This one is <boo>not ignored as its</boo> inside a forEach\n"
+ + " This one is <boo>not ignored as it's</boo> inside a forEach\n"
+ " <antetitulo><i> big <boo>antler</boo></i></antetitulo>\n"
+ " <titulo> My <i>flattened <boo>title</boo></i> </titulo>\n"
+ " <resumen> My summary <i>skip this!</i> </resumen>\n"
@@ -440,13 +440,13 @@ public class TestXPathRecordReader exten
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- assertEquals("top level" ,(String) ((List) m.get("descdend")).get(0) );
- assertEquals("this element" ,(String) ((List) m.get("descdend")).get(1) );
- assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(2) );
- assertEquals("antler" ,(String) ((List) m.get("descdend")).get(3) );
- assertEquals("title" ,(String) ((List) m.get("descdend")).get(4) );
- assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(5) );
- assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(6) );
+ assertEquals("top level" ,(String) ((List) m.get("descdend")).get(0) );
+ assertEquals("this element" ,(String) ((List) m.get("descdend")).get(1) );
+ assertEquals("not ignored as it's",(String) ((List) m.get("descdend")).get(2) );
+ assertEquals("antler" ,(String) ((List) m.get("descdend")).get(3) );
+ assertEquals("title" ,(String) ((List) m.get("descdend")).get(4) );
+ assertEquals("Within the body of" ,(String) ((List) m.get("descdend")).get(5) );
+ assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(6) );
}
@Test
@@ -459,7 +459,7 @@ public class TestXPathRecordReader exten
+ " this <boo>top level</boo> is ignored because it is external to the forEach\n"
+ " <status>as is <boo>this element</boo></status>\n"
+ " <contenido id=\"10097\" idioma=\"cat\">\n"
- + " This one is <boo>not ignored as its</boo> inside a forEach\n"
+ + " This one is <boo>not ignored as it's</boo> inside a forEach\n"
+ " <antetitulo><i> big <boo>antler</boo></i></antetitulo>\n"
+ " <titulo> My <i>flattened <boo>title</boo></i> </titulo>\n"
+ " <resumen> My summary <i>skip this!</i> </resumen>\n"
@@ -471,11 +471,11 @@ public class TestXPathRecordReader exten
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- assertEquals("not ignored as its",((List) m.get("descdend")).get(0) );
- assertEquals("antler" ,((List) m.get("descdend")).get(1) );
- assertEquals("title" ,((List) m.get("descdend")).get(2) );
- assertEquals("Within the body of",((List) m.get("descdend")).get(3) );
- assertEquals("inner as well" ,((List) m.get("descdend")).get(4) );
+ assertEquals("not ignored as it's",((List) m.get("descdend")).get(0) );
+ assertEquals("antler" ,((List) m.get("descdend")).get(1) );
+ assertEquals("title" ,((List) m.get("descdend")).get(2) );
+ assertEquals("Within the body of" ,((List) m.get("descdend")).get(3) );
+ assertEquals("inner as well" ,((List) m.get("descdend")).get(4) );
}
@Test
Modified: lucene/dev/branches/lucene6005/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml Sun Jan 4 14:53:12 2015
@@ -52,48 +52,48 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <fieldType name="failtype1" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <fieldType name="wdf_nocase" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="wdf_preserve" class="solr.TextField">
+ <fieldType name="wdf_preserve" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField" compressThreshold="345" />
+ <fieldType name="highlittext" class="solr.TextField" compressThreshold="345" />
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
of token filters.
-->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.ClassicTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
@@ -101,68 +101,68 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- fieldTypes in this section isolate tokenizers and tokenfilters for testing -->
+ <fieldType name="lowertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LowerCaseTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="keywordtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.ClassicTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -172,52 +172,52 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <!-- fieldtype name="snowballfilt" class="solr.TextField">
+ </fieldType>
+ <!-- fieldType name="snowballfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SnowballPorterFilterFactory"/>
</analyzer>
- </fieldtype -->
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType -->
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="custengporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="stopfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="stopfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StopFilterFactory" ignoreCase="true"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custstopfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="custstopfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lengthfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -232,10 +232,10 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <fieldType name="skutype1" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -246,10 +246,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <fieldType name="skutype2" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -260,20 +260,20 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -281,17 +281,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/lucene6005/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml Sun Jan 4 14:53:12 2015
@@ -27,12 +27,12 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
of token filters.
-->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -40,11 +40,11 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java Sun Jan 4 14:53:12 2015
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.hadoop.fs.FileStatus;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.CloudSolrServer;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.hadoop.MapReduceIndexerTool.Options;
import org.slf4j.Logger;
@@ -91,7 +91,7 @@ class GoLive {
public Request call() {
Request req = new Request();
LOG.info("Live merge " + dir.getPath() + " into " + mergeUrl);
- final HttpSolrServer server = new HttpSolrServer(mergeUrl);
+ final HttpSolrClient server = new HttpSolrClient(mergeUrl);
try {
CoreAdminRequest.MergeIndexes mergeRequest = new CoreAdminRequest.MergeIndexes();
mergeRequest.setCoreName(name);
@@ -149,7 +149,7 @@ class GoLive {
try {
LOG.info("Committing live merge...");
if (options.zkHost != null) {
- CloudSolrServer server = new CloudSolrServer(options.zkHost);
+ CloudSolrClient server = new CloudSolrClient(options.zkHost);
server.setDefaultCollection(options.collection);
server.commit();
server.shutdown();
@@ -157,7 +157,7 @@ class GoLive {
for (List<String> urls : options.shardUrls) {
for (String url : urls) {
// TODO: we should do these concurrently
- HttpSolrServer server = new HttpSolrServer(url);
+ HttpSolrClient server = new HttpSolrClient(url);
server.commit();
server.shutdown();
}
Modified: lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Sun Jan 4 14:53:12 2015
@@ -49,10 +49,10 @@ import org.apache.lucene.util.LuceneTest
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrQuery.ORDER;
-import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
@@ -383,7 +383,7 @@ public class MorphlineGoLiveMiniMRTest e
MapReduceIndexerTool tool;
int res;
QueryResponse results;
- HttpSolrServer server = new HttpSolrServer(cloudJettys.get(0).url);
+ HttpSolrClient server = new HttpSolrClient(cloudJettys.get(0).url);
String[] args = new String[]{};
args = new String[] {
@@ -699,7 +699,7 @@ public class MorphlineGoLiveMiniMRTest e
}
}
- private SolrDocumentList executeSolrQuery(SolrServer collection, String queryString) throws SolrServerException {
+ private SolrDocumentList executeSolrQuery(SolrClient collection, String queryString) throws SolrServerException {
SolrQuery query = new SolrQuery(queryString).setRows(2 * RECORD_COUNT).addSort("id", ORDER.asc);
QueryResponse response = collection.query(query);
return response.getResults();
@@ -713,7 +713,7 @@ public class MorphlineGoLiveMiniMRTest e
Collection<Replica> replicas = slice.getReplicas();
long found = -1;
for (Replica replica : replicas) {
- HttpSolrServer client = new HttpSolrServer(
+ HttpSolrClient client = new HttpSolrClient(
new ZkCoreNodeProps(replica).getCoreUrl());
SolrQuery query = new SolrQuery("*:*");
query.set("distrib", false);
Modified: lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java Sun Jan 4 14:53:12 2015
@@ -16,13 +16,14 @@
*/
package org.apache.solr.morphlines.solr;
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.impl.CloudSolrServer;
+import com.google.common.base.Preconditions;
+import com.google.common.io.Files;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigRenderOptions;
+import com.typesafe.config.ConfigUtil;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrResourceLoader;
@@ -38,12 +39,9 @@ import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import com.google.common.base.Preconditions;
-import com.google.common.io.Files;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigRenderOptions;
-import com.typesafe.config.ConfigUtil;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
/**
* Set of configuration parameters that identify the location and schema of a Solr server or
@@ -92,21 +90,21 @@ public class SolrLocator {
if (collectionName == null || collectionName.length() == 0) {
throw new MorphlineCompilationException("Parameter 'zkHost' requires that you also pass parameter 'collection'", config);
}
- CloudSolrServer cloudSolrServer = new CloudSolrServer(zkHost);
- cloudSolrServer.setDefaultCollection(collectionName);
- cloudSolrServer.connect();
- return new SolrServerDocumentLoader(cloudSolrServer, batchSize);
+ CloudSolrClient cloudSolrClient = new CloudSolrClient(zkHost);
+ cloudSolrClient.setDefaultCollection(collectionName);
+ cloudSolrClient.connect();
+ return new SolrClientDocumentLoader(cloudSolrClient, batchSize);
} else {
if (solrUrl == null || solrUrl.length() == 0) {
throw new MorphlineCompilationException("Missing parameter 'solrUrl'", config);
}
int solrServerNumThreads = 2;
int solrServerQueueLength = solrServerNumThreads;
- SolrServer server = new SafeConcurrentUpdateSolrServer(solrUrl, solrServerQueueLength, solrServerNumThreads);
+ SolrClient server = new SafeConcurrentUpdateSolrClient(solrUrl, solrServerQueueLength, solrServerNumThreads);
// SolrServer server = new HttpSolrServer(solrServerUrl);
// SolrServer server = new ConcurrentUpdateSolrServer(solrServerUrl, solrServerQueueLength, solrServerNumThreads);
// server.setParser(new XMLResponseParser()); // binary parser is used by default
- return new SolrServerDocumentLoader(server, batchSize);
+ return new SolrClientDocumentLoader(server, batchSize);
}
}
Modified: lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml Sun Jan 4 14:53:12 2015
@@ -249,7 +249,7 @@
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
- <fieldtype name="binary" class="solr.BinaryField"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
<!-- The "RandomSortField" is not used to store or search any
data. You can declare fields of this type it in your schema
@@ -482,15 +482,15 @@
</fieldType>
<!--
- <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
- </fieldtype>
+ </fieldType>
-->
- <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<!--
@@ -506,7 +506,7 @@
-->
<filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- lowercases the entire field value, keeping it as a single token. -->
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
@@ -543,7 +543,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
@@ -565,7 +565,7 @@
A Geohash is a compact representation of a latitude longitude pair in a single field.
See http://wiki.apache.org/solr/SpatialSearch
-->
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<!-- Money/currency field type. See http://wiki.apache.org/solr/MoneyFieldType
Parameters:
Modified: lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -122,7 +122,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
@@ -844,104 +844,6 @@
</requestHandler>
- <!-- A Robust Example
-
- This example SearchHandler declaration shows off usage of the
- SearchHandler with many defaults declared
-
- Note that multiple instances of the same Request Handler
- (SearchHandler) can be registered multiple times with different
- names (and different init parameters)
- -->
- <requestHandler name="/browse" class="solr.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
-
- <!-- VelocityResponseWriter settings -->
- <str name="wt">velocity</str>
- <str name="v.template">browse</str>
- <str name="v.layout">layout</str>
- <str name="title">Solritas</str>
-
- <!-- Query settings -->
- <str name="defType">edismax</str>
- <str name="qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
- title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
- </str>
- <str name="df">text</str>
- <str name="mm">100%</str>
- <str name="q.alt">*:*</str>
- <str name="rows">10</str>
- <str name="fl">*,score</str>
-
- <str name="mlt.qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
- title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
- </str>
- <str name="mlt.fl">text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename</str>
- <int name="mlt.count">3</int>
-
- <!-- Faceting defaults -->
- <str name="facet">on</str>
- <str name="facet.field">cat</str>
- <str name="facet.field">manu_exact</str>
- <str name="facet.field">content_type</str>
- <str name="facet.field">author_s</str>
- <str name="facet.query">ipod</str>
- <str name="facet.query">GB</str>
- <str name="facet.mincount">1</str>
- <str name="facet.pivot">cat,inStock</str>
- <str name="facet.range.other">after</str>
- <str name="facet.range">price</str>
- <int name="f.price.facet.range.start">0</int>
- <int name="f.price.facet.range.end">600</int>
- <int name="f.price.facet.range.gap">50</int>
- <str name="facet.range">popularity</str>
- <int name="f.popularity.facet.range.start">0</int>
- <int name="f.popularity.facet.range.end">10</int>
- <int name="f.popularity.facet.range.gap">3</int>
- <str name="facet.range">manufacturedate_dt</str>
- <str name="f.manufacturedate_dt.facet.range.start">NOW/YEAR-10YEARS</str>
- <str name="f.manufacturedate_dt.facet.range.end">NOW</str>
- <str name="f.manufacturedate_dt.facet.range.gap">+1YEAR</str>
- <str name="f.manufacturedate_dt.facet.range.other">before</str>
- <str name="f.manufacturedate_dt.facet.range.other">after</str>
-
- <!-- Highlighting defaults -->
- <str name="hl">on</str>
- <str name="hl.fl">content features title name</str>
- <str name="hl.encoder">html</str>
- <str name="hl.simple.pre"><b></str>
- <str name="hl.simple.post"></b></str>
- <str name="f.title.hl.fragsize">0</str>
- <str name="f.title.hl.alternateField">title</str>
- <str name="f.name.hl.fragsize">0</str>
- <str name="f.name.hl.alternateField">name</str>
- <str name="f.content.hl.snippets">3</str>
- <str name="f.content.hl.fragsize">200</str>
- <str name="f.content.hl.alternateField">content</str>
- <str name="f.content.hl.maxAlternateFieldLength">750</str>
-
- <!-- Spell checking defaults -->
- <str name="spellcheck">on</str>
- <str name="spellcheck.extendedResults">false</str>
- <str name="spellcheck.count">5</str>
- <str name="spellcheck.alternativeTermCount">2</str>
- <str name="spellcheck.maxResultsForSuggest">5</str>
- <str name="spellcheck.collate">true</str>
- <str name="spellcheck.collateExtendedResults">true</str>
- <str name="spellcheck.maxCollationTries">5</str>
- <str name="spellcheck.maxCollations">3</str>
- </lst>
-
- <!-- append spellchecking to our list of components -->
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
-
-
<!-- Update Request Handler.
http://wiki.apache.org/solr/UpdateXmlMessages
@@ -1088,7 +990,7 @@
http://wiki.apache.org/solr/SolrReplication
- It is also neccessary for SolrCloud to function (in Cloud mode, the
+ It is also necessary for SolrCloud to function (in Cloud mode, the
replication handler is used to bulk transfer segments when nodes
are added or need to recover).
@@ -1097,7 +999,7 @@
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<!--
To enable simple master/slave replication, uncomment one of the
- sections below, depending on wether this solr instance should be
+ sections below, depending on whether this solr instance should be
the "master" or a "slave". If this instance is a "slave" you will
also need to fill in the masterUrl to point to a real machine.
-->
Modified: lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml Sun Jan 4 14:53:12 2015
@@ -264,7 +264,7 @@
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
- <fieldtype name="binary" class="solr.BinaryField"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
<!-- The "RandomSortField" is not used to store or search any
data. You can declare fields of this type it in your schema
@@ -496,14 +496,14 @@
</analyzer>
</fieldType>
- <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<!--
@@ -519,7 +519,7 @@
-->
<filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- lowercases the entire field value, keeping it as a single token. -->
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
@@ -556,7 +556,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
Modified: lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -138,7 +138,7 @@
index format, but hooks into the schema to provide per-field customization of
the postings lists and per-document values in the fieldType element
(postingsFormat/docValuesFormat). Note that most of the alternative implementations
- are experimental, so if you choose to customize the index format, its a good
+ are experimental, so if you choose to customize the index format, it's a good
idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader)
before upgrading to a newer version to avoid unnecessary reindexing.
-->
@@ -862,105 +862,6 @@
</lst>
</requestHandler>
-
- <!-- A Robust Example
-
- This example SearchHandler declaration shows off usage of the
- SearchHandler with many defaults declared
-
- Note that multiple instances of the same Request Handler
- (SearchHandler) can be registered multiple times with different
- names (and different init parameters)
- -->
- <requestHandler name="/browse" class="solr.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
-
- <!-- VelocityResponseWriter settings -->
- <str name="wt">velocity</str>
- <str name="v.template">browse</str>
- <str name="v.layout">layout</str>
- <str name="title">Solritas</str>
-
- <!-- Query settings -->
- <str name="defType">edismax</str>
- <str name="qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
- title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
- </str>
- <str name="df">text</str>
- <str name="mm">100%</str>
- <str name="q.alt">*:*</str>
- <str name="rows">10</str>
- <str name="fl">*,score</str>
-
- <str name="mlt.qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
- title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
- </str>
- <str name="mlt.fl">text,features,name,sku,id,manu,cat,title,description,keywords,author,resourcename</str>
- <int name="mlt.count">3</int>
-
- <!-- Faceting defaults -->
- <str name="facet">on</str>
- <str name="facet.field">cat</str>
- <str name="facet.field">manu_exact</str>
- <str name="facet.field">content_type</str>
- <str name="facet.field">author_s</str>
- <str name="facet.query">ipod</str>
- <str name="facet.query">GB</str>
- <str name="facet.mincount">1</str>
- <str name="facet.pivot">cat,inStock</str>
- <str name="facet.range.other">after</str>
- <str name="facet.range">price</str>
- <int name="f.price.facet.range.start">0</int>
- <int name="f.price.facet.range.end">600</int>
- <int name="f.price.facet.range.gap">50</int>
- <str name="facet.range">popularity</str>
- <int name="f.popularity.facet.range.start">0</int>
- <int name="f.popularity.facet.range.end">10</int>
- <int name="f.popularity.facet.range.gap">3</int>
- <str name="facet.range">manufacturedate_dt</str>
- <str name="f.manufacturedate_dt.facet.range.start">NOW/YEAR-10YEARS</str>
- <str name="f.manufacturedate_dt.facet.range.end">NOW</str>
- <str name="f.manufacturedate_dt.facet.range.gap">+1YEAR</str>
- <str name="f.manufacturedate_dt.facet.range.other">before</str>
- <str name="f.manufacturedate_dt.facet.range.other">after</str>
-
- <!-- Highlighting defaults -->
- <str name="hl">on</str>
- <str name="hl.fl">content features title name</str>
- <str name="hl.encoder">html</str>
- <str name="hl.simple.pre"><b></str>
- <str name="hl.simple.post"></b></str>
- <str name="f.title.hl.fragsize">0</str>
- <str name="f.title.hl.alternateField">title</str>
- <str name="f.name.hl.fragsize">0</str>
- <str name="f.name.hl.alternateField">name</str>
- <str name="f.content.hl.snippets">3</str>
- <str name="f.content.hl.fragsize">200</str>
- <str name="f.content.hl.alternateField">content</str>
- <str name="f.content.hl.maxAlternateFieldLength">750</str>
-
- <!-- Spell checking defaults -->
- <str name="spellcheck">on</str>
- <str name="spellcheck.extendedResults">false</str>
- <str name="spellcheck.count">5</str>
- <str name="spellcheck.alternativeTermCount">2</str>
- <str name="spellcheck.maxResultsForSuggest">5</str>
- <str name="spellcheck.collate">true</str>
- <str name="spellcheck.collateExtendedResults">true</str>
- <str name="spellcheck.maxCollationTries">5</str>
- <str name="spellcheck.maxCollations">3</str>
- </lst>
-
- <!-- append spellchecking to our list of components -->
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
-
-
<!-- Update Request Handler.
http://wiki.apache.org/solr/UpdateXmlMessages