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 2014/11/27 21:41:07 UTC
svn commit: r1642229 [6/7] - in /lucene/dev/branches/lucene6005: ./
dev-tools/ dev-tools/eclipse/dot.settings/
dev-tools/idea/lucene/benchmark/src/ dev-tools/idea/lucene/highlighter/
dev-tools/maven/ dev-tools/scripts/ lucene/ lucene/analysis/ lucene/a...
Modified: lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Thu Nov 27 20:41:01 2014
@@ -165,7 +165,7 @@ public class DirectUpdateHandler2 extend
} catch (SolrException e) {
throw e;
} catch (RuntimeException t) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
String.format(Locale.ROOT, "Exception writing document id %s to the index; possible analysis error.",
cmd.getPrintableId()), t);
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java Thu Nov 27 20:41:01 2014
@@ -59,8 +59,9 @@ public final class MaxFieldValueUpdatePr
public Collection pickSubset(Collection values) {
Collection result = values;
try {
- result = Collections.singletonList
- (Collections.max(values));
+ // NOTE: the extra cast to Object is needed to prevent compile
+ // errors on Eclipse Compiler (ecj) used for javadoc lint
+ result = Collections.singletonList((Object) Collections.max(values));
} catch (ClassCastException e) {
throw new SolrException
(BAD_REQUEST,
Modified: lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java Thu Nov 27 20:41:01 2014
@@ -59,8 +59,9 @@ public final class MinFieldValueUpdatePr
public Collection pickSubset(Collection values) {
Collection result = values;
try {
- result = Collections.singletonList
- (Collections.min(values));
+ // NOTE: the extra cast to Object is needed to prevent compile
+ // errors on Eclipse Compiler (ecj) used for javadoc lint
+ result = Collections.singletonList((Object) Collections.min(values));
} catch (ClassCastException e) {
throw new SolrException
(BAD_REQUEST,
Modified: lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/CommandOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/CommandOperation.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/CommandOperation.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/CommandOperation.java Thu Nov 27 20:41:01 2014
@@ -210,5 +210,8 @@ public class CommandOperation {
}
}
+ public CommandOperation getCopy(){
+ return new CommandOperation(name,commandData);
+ }
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/SolrCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/SolrCLI.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/SolrCLI.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/SolrCLI.java Thu Nov 27 20:41:01 2014
@@ -43,6 +43,7 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.FileUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NoHttpResponseException;
@@ -54,7 +55,6 @@ import org.apache.http.client.ResponseHa
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.util.EntityUtils;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
@@ -204,6 +204,8 @@ public class SolrCLI {
return new ApiTool();
else if ("create_collection".equals(toolType))
return new CreateCollectionTool();
+ else if ("create_core".equals(toolType))
+ return new CreateCoreTool();
// If you add a built-in tool to this class, add it here to avoid
// classpath scanning
@@ -223,6 +225,7 @@ public class SolrCLI {
formatter.printHelp("status", getToolOptions(new StatusTool()));
formatter.printHelp("api", getToolOptions(new ApiTool()));
formatter.printHelp("create_collection", getToolOptions(new CreateCollectionTool()));
+ formatter.printHelp("create_core", getToolOptions(new CreateCoreTool()));
List<Class<Tool>> toolClasses = findToolClassesInPackage("org.apache.solr.util");
for (Class<Tool> next : toolClasses) {
@@ -701,13 +704,13 @@ public class SolrCLI {
}
} // end ApiTool class
+ private static final String DEFAULT_CONFIG_SET = "data_driven_schema_configs";
+
/**
* Supports create_collection command in the bin/solr script.
*/
public static class CreateCollectionTool implements Tool {
- private static final String DEFAULT_CONFIG_SET = "data_driven_schema_configs";
-
@Override
public String getName() {
return "create_collection";
@@ -796,8 +799,12 @@ public class SolrCLI {
Map<String,Object> status = statusTool.reportStatus(solrUrl, systemInfo, httpClient);
Map<String,Object> cloud = (Map<String, Object>)status.get("cloud");
- if (cloud == null)
- throw new IllegalArgumentException("Solr server at "+solrUrl+" not running in SolrCloud mode!");
+ if (cloud == null) {
+ System.err.println("\nERROR: Solr at "+solrUrl+
+ " is running in standalone server mode, please use the create_core command instead;\n" +
+ "create_collection can only be used when running in SolrCloud mode.\n");
+ return 1;
+ }
String zookeeper = (String) cloud.get("ZooKeeper");
if (zookeeper.endsWith("(embedded)")) {
@@ -869,7 +876,7 @@ public class SolrCLI {
String collectionName = cli.getOptionValue("name");
String createCollectionUrl =
String.format(Locale.ROOT,
- "%s/admin/collections?action=CREATE&name=%s&numShards=%d&replicationFactor=%d&maxShardsPerNode=%d&configSet=%s",
+ "%s/admin/collections?action=CREATE&name=%s&numShards=%d&replicationFactor=%d&maxShardsPerNode=%d&collection.configName=%s",
baseUrl,
collectionName,
numShards,
@@ -883,6 +890,7 @@ public class SolrCLI {
CharArr arr = new CharArr();
new JSONWriter(arr, 2).write(json);
System.out.println(arr.toString());
+ System.out.println();
}
protected int optionAsInt(CommandLine cli, String option, int defaultVal) {
@@ -1164,5 +1172,112 @@ public class SolrCLI {
new JSONWriter(arr, 2).write(report);
System.out.println(arr.toString());
}
- } // end HealthcheckTool
+ } // end HealthcheckTool
+
+ public static class CreateCoreTool implements Tool {
+
+ @Override
+ public String getName() {
+ return "create_core";
+ }
+
+ @SuppressWarnings("static-access")
+ @Override
+ public Option[] getOptions() {
+ return new Option[] {
+ OptionBuilder
+ .withArgName("URL")
+ .hasArg()
+ .isRequired(false)
+ .withDescription("Base Solr URL, default is http://localhost:8983/solr")
+ .create("solrUrl"),
+ OptionBuilder
+ .withArgName("NAME")
+ .hasArg()
+ .isRequired(true)
+ .withDescription("Name of the core to create.")
+ .create("name"),
+ OptionBuilder
+ .withArgName("CONFIG")
+ .hasArg()
+ .isRequired(false)
+ .withDescription("Name of the configuration for this core; default is "+DEFAULT_CONFIG_SET)
+ .create("config"),
+ OptionBuilder
+ .withArgName("DIR")
+ .hasArg()
+ .isRequired(true)
+ .withDescription("Path to configsets directory on the local system.")
+ .create("configsetsDir")
+ };
+ }
+
+ @Override
+ public int runTool(CommandLine cli) throws Exception {
+
+ String solrUrl = cli.getOptionValue("solrUrl", "http://localhost:8983/solr");
+ if (!solrUrl.endsWith("/"))
+ solrUrl += "/";
+
+ File configsetsDir = new File(cli.getOptionValue("configsetsDir"));
+ if (!configsetsDir.isDirectory())
+ throw new FileNotFoundException(configsetsDir.getAbsolutePath()+" not found!");
+
+ String configSet = cli.getOptionValue("config", DEFAULT_CONFIG_SET);
+ File configSetDir = new File(configsetsDir, configSet);
+ if (!configSetDir.isDirectory())
+ throw new FileNotFoundException("Specified config "+configSet+
+ " not found in "+configsetsDir.getAbsolutePath());
+
+ File confDir = new File(configSetDir,"conf");
+
+ String coreName = cli.getOptionValue("name");
+
+ String systemInfoUrl = solrUrl+"admin/info/system";
+ HttpClient httpClient = getHttpClient();
+ String solrHome = null;
+ try {
+ Map<String,Object> systemInfo = getJson(httpClient, systemInfoUrl, 2);
+ if ("solrcloud".equals(systemInfo.get("mode"))) {
+ System.err.println("\nERROR: Solr at "+solrUrl+
+ " is running in SolrCloud mode, please use create_collection command instead.\n");
+ return 1;
+ }
+
+ // convert raw JSON into user-friendly output
+ solrHome = (String)systemInfo.get("solr_home");
+ if (solrHome == null) {
+ solrHome = configsetsDir.getParentFile().getAbsolutePath();
+ }
+ } finally {
+ closeHttpClient(httpClient);
+ }
+
+ File coreInstanceDir = new File(solrHome, coreName);
+ if (!coreInstanceDir.isDirectory()) {
+ coreInstanceDir.mkdirs();
+ if (!coreInstanceDir.isDirectory())
+ throw new IOException("Failed to create new core instance directory: "+coreInstanceDir.getAbsolutePath());
+ }
+
+ FileUtils.copyDirectoryToDirectory(confDir, coreInstanceDir);
+
+ String createCoreUrl =
+ String.format(Locale.ROOT,
+ "%sadmin/cores?action=CREATE&name=%s&instanceDir=%s",
+ solrUrl,
+ coreName,
+ coreName);
+
+ System.out.println("Creating new core '"+coreName+"' using command:\n\n"+createCoreUrl+"\n");
+
+ Map<String,Object> json = getJson(createCoreUrl);
+ CharArr arr = new CharArr();
+ new JSONWriter(arr, 2).write(json);
+ System.out.println(arr.toString());
+ System.out.println();
+
+ return 0;
+ }
+ } // end CreateCoreTool class
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml Thu Nov 27 20:41:01 2014
@@ -201,9 +201,10 @@ NOTE: Tests expect every field in this s
<fieldtype name="str_dv_last" class="solr.StrField" stored="true" indexed="false" docValues="true" sortMissingLast="true"/>
<fieldtype name="str_dv_first" class="solr.StrField" stored="true" indexed="false" docValues="true" sortMissingFirst="true"/>
- <fieldtype name="bin" class="solr.SortableBinaryField" stored="true" indexed="true" />
- <fieldtype name="bin_last" class="solr.SortableBinaryField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="bin_first" class="solr.SortableBinaryField" stored="true" indexed="true" sortMissingFirst="true"/>
+ <!-- note: all 'binary' fields have docvalues, because this fieldtype doesnt support indexing -->
+ <fieldtype name="bin" class="solr.SortableBinaryField" stored="true" indexed="true" docValues="true"/>
+ <fieldtype name="bin_last" class="solr.SortableBinaryField" stored="true" indexed="true" docValues="true" sortMissingLast="true"/>
+ <fieldtype name="bin_first" class="solr.SortableBinaryField" stored="true" indexed="true" docValues="true" sortMissingFirst="true"/>
<fieldtype name="bin_dv" class="solr.SortableBinaryField" stored="true" indexed="false" docValues="true"/>
<fieldtype name="bin_dv_last" class="solr.SortableBinaryField" stored="true" indexed="false" docValues="true" sortMissingLast="true"/>
<fieldtype name="bin_dv_first" class="solr.SortableBinaryField" stored="true" indexed="false" docValues="true" sortMissingFirst="true"/>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml Thu Nov 27 20:41:01 2014
@@ -65,6 +65,8 @@
<field name="pointvector" type="pointvector" />
<field name="bbox" type="bbox" />
+ <dynamicField name="bboxD_*" type="bbox" indexed="true" />
+
</fields>
<uniqueKey>id</uniqueKey>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml Thu Nov 27 20:41:01 2014
@@ -219,7 +219,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml Thu Nov 27 20:41:01 2014
@@ -214,7 +214,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml Thu Nov 27 20:41:01 2014
@@ -185,7 +185,6 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
@@ -201,11 +200,6 @@ based HashBitset. -->
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
<requestHandler name="dismax" class="solr.SearchHandler" >
<lst name="defaults">
@@ -230,8 +224,6 @@ based HashBitset. -->
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
<!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler">
<lst name="defaults">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml Thu Nov 27 20:41:01 2014
@@ -185,8 +185,6 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. -->
@@ -201,12 +199,6 @@ based HashBitset. -->
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
-
<requestHandler name="dismax" class="solr.SearchHandler" >
<lst name="defaults">
<str name="defType">dismax</str>
@@ -230,8 +222,6 @@ based HashBitset. -->
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
<!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler">
<lst name="defaults">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml Thu Nov 27 20:41:01 2014
@@ -50,8 +50,6 @@
</arr>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml Thu Nov 27 20:41:01 2014
@@ -45,15 +45,6 @@
<useFilterForSortedQuery>${solr.test.useFilterForSortedQuery}</useFilterForSortedQuery>
</query>
-
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
<requestHandler name="/select" class="solr.SearchHandler" default="true" />
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
- <requestHandler name="/admin/" class="solr.admin.AdminHandlers" />
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml Thu Nov 27 20:41:01 2014
@@ -38,15 +38,7 @@
</updateLog>
</updateHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
<requestHandler name="/select" class="solr.SearchHandler" default="true" />
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
- <requestHandler name="/admin/" class="solr.admin.AdminHandlers" />
<updateRequestProcessorChain name="convert-ttl-defaults">
<processor class="solr.processor.DocExpirationUpdateProcessorFactory">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml Thu Nov 27 20:41:01 2014
@@ -48,8 +48,6 @@
</query>
- <requestHandler name="/admin/" class="solr.admin.AdminHandlers" />
-
<requestDispatcher handleSelect="false">
<httpCaching never304="true"/>
</requestDispatcher>
@@ -66,8 +64,6 @@
</lst>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler">
- </requestHandler>
<queryResponseWriter name="json" class="solr.JSONResponseWriter">
<!-- For the purposes of the tutorial, JSON responses are written as
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml Thu Nov 27 20:41:01 2014
@@ -39,14 +39,6 @@
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
- <requestHandler name="/update" class="solr.UpdateRequestHandler"/>
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
<requestHandler name="/dump" class="DumpRequestHandler" initParams="a">
<lst name="defaults">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml Thu Nov 27 20:41:01 2014
@@ -55,8 +55,6 @@
</lst>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml Thu Nov 27 20:41:01 2014
@@ -36,7 +36,6 @@
<str name="maxNumberOfBackups">1</str>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
<!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml Thu Nov 27 20:41:01 2014
@@ -56,8 +56,6 @@
</lst>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml Thu Nov 27 20:41:01 2014
@@ -54,8 +54,5 @@
</requestHandler>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml Thu Nov 27 20:41:01 2014
@@ -185,8 +185,6 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. -->
@@ -201,11 +199,6 @@ based HashBitset. -->
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
<requestHandler name="dismax" class="solr.SearchHandler" >
<lst name="defaults">
@@ -230,8 +223,6 @@ based HashBitset. -->
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
<!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler">
<lst name="defaults">
@@ -250,8 +241,6 @@ based HashBitset. -->
</lst>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">
<!-- This is slightly different from the field value so we can test dealing with token offset changes -->
<str name="queryAnalyzerFieldType">lowerpunctfilt</str>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml Thu Nov 27 20:41:01 2014
@@ -40,8 +40,6 @@
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="master">
<str name="replicateAfter">commit</str>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml Thu Nov 27 20:41:01 2014
@@ -39,21 +39,14 @@
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
+
<requestHandler name="/update" class="solr.UpdateRequestHandler">
<lst name="defaults">
<str name="update.chain">add-unknown-fields-to-the-schema</str>
</lst>
</requestHandler>
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
- <!-- Add unknown fields to the schema
+ <!-- Add unknown fields to the schema
An example field type guessing update processor that will
attempt to parse string-typed field values as Booleans, Longs,
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Thu Nov 27 20:41:01 2014
@@ -40,8 +40,6 @@
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="slave">
<str name="masterUrl">http://127.0.0.1:TEST_PORT/solr</str>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml Thu Nov 27 20:41:01 2014
@@ -40,11 +40,6 @@
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
- <requestHandler name="/replication" class="solr.ReplicationHandler">
-
- </requestHandler>
<!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml Thu Nov 27 20:41:01 2014
@@ -46,16 +46,6 @@
<requestHandler name="standard" class="solr.StandardRequestHandler">
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
-
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<updateHandler class="solr.DirectUpdateHandler2">
<updateLog>
<str name="dir">${solr.ulog.dir:}</str>
@@ -85,8 +75,6 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
<requestHandler name="/admin/file" class="solr.admin.ShowFileRequestHandler" >
<lst name="invariants">
<str name="hidden">bogus.txt</str>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml Thu Nov 27 20:41:01 2014
@@ -46,16 +46,6 @@
<requestHandler name="standard" class="solr.StandardRequestHandler">
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
-
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
<updateHandler class="solr.DirectUpdateHandler2">
<updateLog>
<str name="dir">${solr.ulog.dir:}</str>
@@ -85,7 +75,6 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
<requestHandler name="/admin/file" class="solr.admin.ShowFileRequestHandler" >
<lst name="invariants">
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml Thu Nov 27 20:41:01 2014
@@ -48,10 +48,5 @@
<queryResponseWriter name="javabin"
class="solr.TestTolerantSearch$BadResponseWriter" />
-
- <requestHandler name="/admin/"
- class="org.apache.solr.handler.admin.AdminHandlers" />
-
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml Thu Nov 27 20:41:01 2014
@@ -45,14 +45,7 @@
</requestHandler>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
+ <requestHandler name="/dump" class="solr.DumpRequestHandler">
</requestHandler>
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Thu Nov 27 20:41:01 2014
@@ -190,8 +190,6 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. -->
@@ -206,12 +204,6 @@
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
-
<requestHandler name="dismax" class="solr.SearchHandler" >
<lst name="defaults">
<str name="defType">dismax</str>
@@ -235,8 +227,6 @@
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
<requestHandler name="/admin/file" class="solr.admin.ShowFileRequestHandler" >
<lst name="invariants">
<str name="hidden">bogus.txt</str>
@@ -267,7 +257,7 @@
</lst>
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
+
<searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">
<!-- This is slightly different from the field value so we can test dealing with token offset changes -->
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml Thu Nov 27 20:41:01 2014
@@ -71,6 +71,4 @@
<requestHandler name="standard" class="solr.SearchHandler" default="true">
</requestHandler>
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
-
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java Thu Nov 27 20:41:01 2014
@@ -105,12 +105,14 @@ public class MinimalSchemaTest extends S
Set<String> handlerNames = h.getCore().getRequestHandlers().keySet();
for (String handler : handlerNames) {
try {
+
if (handler.startsWith("/update")) {
continue;
}
if (handler.startsWith("/mlt")) {
continue;
}
+ if(handler.equals("/admin/ping")) continue;
assertQ("failure w/handler: '" + handler + "'",
req("qt", handler,
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfig.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfig.java Thu Nov 27 20:41:01 2014
@@ -107,10 +107,6 @@ public class TestConfig extends SolrTest
ShowFileRequestHandler handler = (ShowFileRequestHandler) h.getCore().getRequestHandler("/admin/file");
assertTrue("file handler should have been automatically registered", handler != null);
- //System.out.println( handler.getHiddenFiles() );
- // should not contain: <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
- assertFalse(handler.getHiddenFiles().contains("schema.xml".toUpperCase(Locale.ROOT)));
- assertTrue(handler.getHiddenFiles().contains("PROTWORDS.TXT"));
}
// If defaults change, add test methods to cover each version
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfigSets.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfigSets.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfigSets.java Thu Nov 27 20:41:01 2014
@@ -121,7 +121,7 @@ public class TestConfigSets extends Solr
// We initially don't have a /get handler defined
SolrCore core = container.create(new CoreDescriptor(container, "core1", testDirectory + "/core", "configSet", "configset-2"));
assertThat("No /get handler should be defined in the initial configuration",
- core.getRequestHandler("/get"), is(nullValue()));
+ core.getRequestHandler("/dump"), is(nullValue()));
// Now copy in a config with a /get handler and reload
FileUtils.copyFile(getFile("solr/collection1/conf/solrconfig-withgethandler.xml"),
@@ -130,7 +130,7 @@ public class TestConfigSets extends Solr
core = container.getCore("core1");
assertThat("A /get handler should be defined in the reloaded configuration",
- core.getRequestHandler("/get"), is(notNullValue()));
+ core.getRequestHandler("/dump"), is(notNullValue()));
core.close();
container.shutdown();
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestInitParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestInitParams.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestInitParams.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestInitParams.java Thu Nov 27 20:41:01 2014
@@ -18,6 +18,7 @@ package org.apache.solr.core;
*/
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
@@ -25,6 +26,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.util.Arrays;
+import java.util.HashMap;
+
+import static java.util.Collections.singletonMap;
public class TestInitParams extends SolrTestCaseJ4 {
@BeforeClass
@@ -46,6 +50,14 @@ public class TestInitParams extends Solr
def = (NamedList) nl.get(PluginInfo.APPENDS);
assertEquals("C", def.get("c"));
}
+
+ InitParams initParams = h.getCore().getSolrConfig().getInitParams().get("a");
+
+ PluginInfo pluginInfo = new PluginInfo("requestHandler",
+ new HashMap<String, String>(),
+ new NamedList<>(singletonMap("defaults", new NamedList(ZkNodeProps.makeMap("a", "A1")))), null);
+ initParams.apply(pluginInfo);
+ assertEquals( "A",initParams.defaults.get("a"));
}
@Test
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java Thu Nov 27 20:41:01 2014
@@ -32,9 +32,9 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.management.remote.rmi.RMIConnectorServer;
+
import java.io.IOException;
import java.net.ServerSocket;
-import java.net.URL;
import java.rmi.registry.LocateRegistry;
import java.rmi.server.RMIServerSocketFactory;
import java.util.Set;
@@ -175,51 +175,4 @@ public class TestJmxMonitoredMap extends
}
- private class MockInfoMBean implements SolrInfoMBean {
- @Override
- public String getName() {
- return "mock";
- }
-
- @Override
- public Category getCategory() {
- return Category.OTHER;
- }
-
- @Override
- public String getDescription() {
- return "mock";
- }
-
- @Override
- public URL[] getDocs() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getVersion() {
- return "mock";
- }
-
- @Override
- public String getSource() {
- return "mock";
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public NamedList getStatistics() {
- NamedList myList = new NamedList<Integer>();
- myList.add("Integer", 123);
- myList.add("Double",567.534);
- myList.add("Long", 32352463l);
- myList.add("Short", (short) 32768);
- myList.add("Byte", (byte) 254);
- myList.add("Float", 3.456f);
- myList.add("String","testing");
- return myList;
- }
- }
-
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java Thu Nov 27 20:41:01 2014
@@ -28,10 +28,16 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.util.EntityUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
+import org.apache.solr.common.cloud.DocCollection;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.ConfigOverlay;
import org.apache.solr.util.RESTfulServerProvider;
@@ -67,7 +73,6 @@ public class TestSolrConfigHandlerConcur
@Override
public void doTest() throws Exception {
-
Map editable_prop_map = (Map) new ObjectBuilder(new JSONParser(new StringReader(
ConfigOverlay.MAPPING))).getObject();
Map caches = (Map) editable_prop_map.get("query");
@@ -143,31 +148,39 @@ public class TestSolrConfigHandlerConcur
return;
}
+ DocCollection coll = cloudClient.getZkStateReader().getClusterState().getCollection("collection1");
+ List<String> urls = new ArrayList<>();
+ for (Slice slice : coll.getSlices()) {
+ for (Replica replica : slice.getReplicas())
+ urls.add(""+replica.get(ZkStateReader.BASE_URL_PROP) + "/"+replica.get(ZkStateReader.CORE_NAME_PROP));
+ }
+
+
//get another node
- RestTestHarness harness = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
+ String url = urls.get(urls.size());
+
long startTime = System.nanoTime();
- boolean success = false;
- long maxTimeoutSeconds = 10;
+ long maxTimeoutSeconds = 20;
while ( TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds) {
Thread.sleep(100);
errmessages.clear();
- Map respMap = getAsMap("/config/overlay?wt=json", harness);
+ Map respMap = getAsMap(url+"/config/overlay?wt=json");
Map m = (Map) respMap.get("overlay");
if(m!= null) m = (Map) m.get("props");
if(m == null) {
- errmessages.add(MessageFormat.format( "overlay does not exist for cache: {} , iteration: {} response {} ", cacheName, i, respMap.toString()));
+ errmessages.add(MessageFormat.format( "overlay does not exist for cache: {0} , iteration: {1} response {2} ", cacheName, i, respMap.toString()));
continue;
}
Object o = getObjectByPath(m, true, asList("query", cacheName, "size"));
- if(!val1.equals(o)) errmessages.add(MessageFormat.format("'size' property not set, expected = {}, actual {}", val1,o));
+ if(!val1.equals(o)) errmessages.add(MessageFormat.format("'size' property not set, expected = {0}, actual {1}", val1,o));
o = getObjectByPath(m, true, asList("query", cacheName, "initialSize"));
- if(!val2.equals(o)) errmessages.add(MessageFormat.format("'initialSize' property not set, expected = {}, actual {}", val2,o));
+ if(!val2.equals(o)) errmessages.add(MessageFormat.format("'initialSize' property not set, expected = {0}, actual {1}", val2,o));
o = getObjectByPath(m, true, asList("query", cacheName, "autowarmCount"));
- if(!val3.equals(o)) errmessages.add(MessageFormat.format("'autowarmCount' property not set, expected = {}, actual {}", val3,o));
+ if(!val3.equals(o)) errmessages.add(MessageFormat.format("'autowarmCount' property not set, expected = {0}, actual {1}", val3,o));
if(errmessages.isEmpty()) break;
}
if(!errmessages.isEmpty()) {
@@ -178,5 +191,15 @@ public class TestSolrConfigHandlerConcur
}
-
+ private Map getAsMap(String uri) throws Exception {
+ HttpGet get = new HttpGet(uri) ;
+ HttpEntity entity = null;
+ try {
+ entity = cloudClient.getLbServer().getHttpClient().execute(get).getEntity();
+ String response = EntityUtils.toString(entity, StandardCharsets.UTF_8);
+ return (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
+ } finally {
+ EntityUtils.consumeQuietly(entity);
+ }
+ }
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestRTGBase.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestRTGBase.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestRTGBase.java Thu Nov 27 20:41:01 2014
@@ -126,9 +126,7 @@ public class TestRTGBase extends SolrTes
protected int getFirstMatch(IndexReader r, Term t) throws IOException {
- Fields fields = MultiFields.getFields(r);
- if (fields == null) return -1;
- Terms terms = fields.terms(t.field());
+ Terms terms = MultiFields.getTerms(r, t.field());
if (terms == null) return -1;
BytesRef termBytes = t.bytes();
final TermsEnum termsEnum = terms.iterator(null);
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java Thu Nov 27 20:41:01 2014
@@ -51,7 +51,7 @@ public class TestSolr4Spatial extends So
@ParametersFactory
public static Iterable<Object[]> parameters() {
return Arrays.asList(new Object[][]{
- {"srpt_geohash"}, {"srpt_quad"}, {"stqpt_geohash"}, {"pointvector"}
+ {"srpt_geohash"}, {"srpt_quad"}, {"stqpt_geohash"}, {"pointvector"}, {"bbox"}
});
}
@@ -158,7 +158,7 @@ public class TestSolr4Spatial extends So
assertQ(req(
"fl", "id," + fieldName, "q", "*:*", "rows", "1000",
- "fq", "{!geofilt sfield="+fieldName+" pt="+IN+" d=9}"),
+ "fq", "{!bbox sfield="+fieldName+" pt="+IN+" d=9}"),
"//result/doc/*[@name='" + fieldName + "']//text()='" + OUT + "'");
}
@@ -172,6 +172,9 @@ public class TestSolr4Spatial extends So
}
private void checkHits(String fieldName, boolean exact, String ptStr, double distKM, int count, int ... docIds) throws ParseException {
+ if (exact && fieldName.equalsIgnoreCase("bbox")) {
+ return; // bbox field only supports rectangular query
+ }
String [] tests = new String[docIds != null && docIds.length > 0 ? docIds.length + 1 : 1];
//test for presence of required ids first
int i = 0;
@@ -322,8 +325,10 @@ public class TestSolr4Spatial extends So
private String radiusQuery(double lat, double lon, double dDEG, String score, String filter) {
//Choose between the Solr/Geofilt syntax, and the Lucene spatial module syntax
- if (random().nextBoolean()) {
- return "{!geofilt " +
+ if (fieldName.equals("bbox") || random().nextBoolean()) {
+ //we cheat for bbox strategy which doesn't do radius, only rect.
+ final String qparser = fieldName.equals("bbox") ? "bbox" : "geofilt";
+ return "{!" + qparser + " " +
"sfield=" + fieldName + " "
+ (score != null ? "score="+score : "") + " "
+ (filter != null ? "filter="+filter : "") + " "
@@ -338,7 +343,8 @@ public class TestSolr4Spatial extends So
@Test
public void testSortMultiVal() throws Exception {
- RandomizedTest.assumeFalse("Multivalue not supported for this field", fieldName.equals("pointvector"));
+ RandomizedTest.assumeFalse("Multivalue not supported for this field",
+ fieldName.equals("pointvector") || fieldName.equals("bbox"));
assertU(adoc("id", "100", fieldName, "1,2"));//1 point
assertU(adoc("id", "101", fieldName, "4,-1", fieldName, "3,5"));//2 points, 2nd is pretty close to query point
@@ -373,12 +379,24 @@ public class TestSolr4Spatial extends So
//show we can index this (without an error)
assertU(adoc("id", "rect", fieldName, rect));
- assertU(adoc("id", "circ", fieldName, circ));
- assertU(commit());
+ if (!fieldName.equals("bbox")) {
+ assertU(adoc("id", "circ", fieldName, circ));
+ assertU(commit());
+ }
//only testing no error
assertJQ(req("q", "{!field f=" + fieldName + "}Intersects(" + rect + ")"));
- assertJQ(req("q", "{!field f=" + fieldName + "}Intersects(" + circ + ")"));
+ if (!fieldName.equals("bbox")) {
+ assertJQ(req("q", "{!field f=" + fieldName + "}Intersects(" + circ + ")"));
+ }
+ }
+
+ @Test
+ public void testBadScoreParam() throws Exception {
+ assertQEx("expect friendly error message",
+ "none",
+ req(radiusQuery(0, 0, 0, "bogus", "false")),
+ SolrException.ErrorCode.BAD_REQUEST);
}
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java Thu Nov 27 20:41:01 2014
@@ -18,6 +18,7 @@ package org.apache.solr.search;
*/
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.SolrException;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,7 +40,7 @@ public class TestSolr4Spatial2 extends S
@Test
public void testBBox() throws Exception {
- String fieldName = "bbox";
+ String fieldName = random().nextBoolean() ? "bbox" : "bboxD_dynamic";
assertU(adoc("id", "0"));//nothing
assertU(adoc("id", "1", fieldName, "ENVELOPE(-10, 20, 15, 10)"));
assertU(adoc("id", "2", fieldName, "ENVELOPE(22, 22, 10, 10)"));//pt
@@ -48,14 +49,16 @@ public class TestSolr4Spatial2 extends S
assertJQ(req("q", "{!field f="+fieldName+" filter=false score=overlapRatio " +
"queryTargetProportion=0.25}" +
"Intersects(ENVELOPE(10,25,12,10))",
- "fl", "id,score",
+ "fl", "*,score",
"debug", "results"),//explain info
"/response/docs/[0]/id=='2'",
"/response/docs/[0]/score==0.75]",
"/response/docs/[1]/id=='1'",
"/response/docs/[1]/score==0.26666668]",
"/response/docs/[2]/id=='0'",
- "/response/docs/[2]/score==0.0"
+ "/response/docs/[2]/score==0.0",
+
+ "/response/docs/[1]/" + fieldName + "=='ENVELOPE(-10, 20, 15, 10)'"//stored value
);
//minSideLength with point query
@@ -86,4 +89,13 @@ public class TestSolr4Spatial2 extends S
);
}
+ @Test
+ public void testBadScoreParam() throws Exception {
+ String fieldName = "bbox";
+ assertQEx("expect friendly error message",
+ "area2D",
+ req("{!field f="+fieldName+" filter=false score=bogus}Intersects(ENVELOPE(0,0,12,12))"),
+ SolrException.ErrorCode.BAD_REQUEST);
+ }
+
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java Thu Nov 27 20:41:01 2014
@@ -30,6 +30,10 @@ import java.util.HashSet;
public class CloudMLTQParserTest extends AbstractFullDistribZkTestBase {
public CloudMLTQParserTest() {
+ fixShardCount = true;
+ shardCount = 2;
+ sliceCount = 2;
+
configString = "solrconfig.xml";
schemaString = "schema.xml";
}
Modified: lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/db/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/db/conf/schema.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/db/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/db/conf/schema.xml Thu Nov 27 20:41:01 2014
@@ -615,7 +615,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/mail/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/mail/conf/schema.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/mail/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/mail/conf/schema.xml Thu Nov 27 20:41:01 2014
@@ -534,7 +534,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/rss/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/rss/conf/schema.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/rss/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/rss/conf/schema.xml Thu Nov 27 20:41:01 2014
@@ -565,7 +565,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/solr/conf/schema.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/solr/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/solr/conf/schema.xml Thu Nov 27 20:41:01 2014
@@ -615,7 +615,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/example/multicore/core0/conf/solrconfig.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/example/multicore/core0/conf/solrconfig.xml Thu Nov 27 20:41:01 2014
@@ -57,35 +57,13 @@
</updateLog>
</updateHandler>
- <!-- realtime get handler, guaranteed to return the latest stored fields
- of any document, without the need to commit or open a new searcher. The current
- implementation relies on the updateLog feature being enabled. -->
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
-
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
<requestDispatcher handleSelect="true" >
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" formdataUploadLimitInKB="2048" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
<requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
- <lst name="invariants">
- <str name="q">solrpingquery</str>
- </lst>
- <lst name="defaults">
- <str name="echoParams">all</str>
- </lst>
- </requestHandler>
-
+
<!-- config for the admin interface -->
<admin>
<defaultQuery>solr</defaultQuery>
Modified: lucene/dev/branches/lucene6005/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/example/multicore/core1/conf/solrconfig.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/example/multicore/core1/conf/solrconfig.xml Thu Nov 27 20:41:01 2014
@@ -57,34 +57,13 @@
</updateLog>
</updateHandler>
- <!-- realtime get handler, guaranteed to return the latest stored fields
- of any document, without the need to commit or open a new searcher. The current
- implementation relies on the updateLog feature being enabled. -->
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- </lst>
- </requestHandler>
-
- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
-
<requestDispatcher handleSelect="true" >
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" formdataUploadLimitInKB="2048" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
<requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
- <lst name="invariants">
- <str name="q">solrpingquery</str>
- </lst>
- <lst name="defaults">
- <str name="echoParams">all</str>
- </lst>
- </requestHandler>
<!-- config for the admin interface -->
<admin>
Modified: lucene/dev/branches/lucene6005/solr/server/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/server/build.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/server/build.xml (original)
+++ lucene/dev/branches/lucene6005/solr/server/build.xml Thu Nov 27 20:41:01 2014
@@ -51,14 +51,14 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure,sync-hack">
<sequential>
<!-- jetty libs in lib/ -->
- <ivy:retrieve conf="jetty" type="jar" log="download-only"/>
- <ivy:retrieve conf="logging" type="jar,bundle" log="download-only"
+ <ivy:retrieve conf="jetty" type="jar" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="logging" type="jar,bundle" log="download-only" symlink="${ivy.symlink}"
pattern="lib/ext/[artifact]-[revision].[ext]"/>
<!-- start.jar -->
- <ivy:retrieve conf="start" type="jar" log="download-only"
+ <ivy:retrieve conf="start" type="jar" log="download-only" symlink="${ivy.symlink}"
pattern="start.jar"/>
<!-- servlet-api.jar -->
- <ivy:retrieve conf="servlet" log="download-only" type="orbit"
+ <ivy:retrieve conf="servlet" log="download-only" type="orbit" symlink="${ivy.symlink}"
pattern="lib/servlet-api-3.0.jar"/>
</sequential>
</target>
Modified: lucene/dev/branches/lucene6005/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml Thu Nov 27 20:41:01 2014
@@ -445,25 +445,6 @@
</lst>
</requestHandler>
- <!-- realtime get handler, guaranteed to return the latest stored fields of
- any document, without the need to commit or open a new searcher. The
- current implementation relies on the updateLog feature being enabled.
-
- ** WARNING **
- Do NOT disable the realtime get handler at /get if you are using
- SolrCloud otherwise any leader election will cause a full sync in ALL
- replicas for the shard in question. Similarly, a replica recovery will
- also always fetch the complete index from the leader because a partial
- sync will not be possible in the absence of this handler.
- -->
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- <str name="wt">json</str>
- <str name="indent">true</str>
- </lst>
- </requestHandler>
-
<!--
The export request handler is used to export full sorted result sets.
Do not change these defaults.
@@ -561,30 +542,6 @@
class="solr.DocumentAnalysisRequestHandler"
startup="lazy" />
- <!-- Admin Handlers
-
- Admin Handlers - This will register all the standard admin
- RequestHandlers.
- -->
- <requestHandler name="/admin/"
- class="solr.admin.AdminHandlers" />
-
- <!-- ping/healthcheck -->
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
- <lst name="invariants">
- <str name="q">solrpingquery</str>
- </lst>
- <lst name="defaults">
- <str name="echoParams">all</str>
- </lst>
- <!-- An optional feature of the PingRequestHandler is to configure the
- handler with a "healthcheckFile" which can be used to enable/disable
- the PingRequestHandler.
- relative paths are resolved against the data dir
- -->
- <!-- <str name="healthcheckFile">server-enabled.txt</str> -->
- </requestHandler>
-
<!-- Echo the request contents back to the client -->
<requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
<lst name="defaults">
@@ -593,22 +550,7 @@
</lst>
</requestHandler>
- <!-- Solr Replication
-
- The SolrReplicationHandler supports replicating indexes from a
- "master" used for indexing and "slaves" used for queries.
- http://wiki.apache.org/solr/SolrReplication
-
- 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).
-
- https://wiki.apache.org/solr/SolrCloud/
- -->
- <requestHandler name="/replication" class="solr.ReplicationHandler" >
-
- </requestHandler>
<!-- Search Components
Modified: lucene/dev/branches/lucene6005/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml Thu Nov 27 20:41:01 2014
@@ -860,20 +860,7 @@
</lst>
</requestHandler>
-
- <!-- realtime get handler, guaranteed to return the latest stored fields of
- any document, without the need to commit or open a new searcher. The
- current implementation relies on the updateLog feature being enabled. -->
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- <str name="wt">json</str>
- <str name="indent">true</str>
- </lst>
- </requestHandler>
-
-
- <!-- A Robust Example
+ <!-- A Robust Example
This example SearchHandler declaration shows off usage of the
SearchHandler with many defaults declared
@@ -1057,13 +1044,6 @@
class="solr.DocumentAnalysisRequestHandler"
startup="lazy" />
- <!-- Admin Handlers
-
- Admin Handlers - This will register all the standard admin
- RequestHandlers.
- -->
- <requestHandler name="/admin/"
- class="solr.admin.AdminHandlers" />
<!-- This single handler is equivalent to the following... -->
<!--
<requestHandler name="/admin/luke" class="solr.admin.LukeRequestHandler" />
@@ -1073,34 +1053,8 @@
<requestHandler name="/admin/properties" class="solr.admin.PropertiesRequestHandler" />
<requestHandler name="/admin/file" class="solr.admin.ShowFileRequestHandler" >
-->
- <!-- If you wish to hide files under ${solr.home}/conf, explicitly
- register the ShowFileRequestHandler using:
- -->
- <!--
- <requestHandler name="/admin/file"
- class="solr.admin.ShowFileRequestHandler" >
- <lst name="invariants">
- <str name="hidden">synonyms.txt</str>
- <str name="hidden">anotherfile.txt</str>
- </lst>
- </requestHandler>
- -->
- <!-- ping/healthcheck -->
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
- <lst name="invariants">
- <str name="q">solrpingquery</str>
- </lst>
- <lst name="defaults">
- <str name="echoParams">all</str>
- </lst>
- <!-- An optional feature of the PingRequestHandler is to configure the
- handler with a "healthcheckFile" which can be used to enable/disable
- the PingRequestHandler.
- relative paths are resolved against the data dir
- -->
- <!-- <str name="healthcheckFile">server-enabled.txt</str> -->
- </requestHandler>
+
<!-- Echo the request contents back to the client -->
<requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
Modified: lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml Thu Nov 27 20:41:01 2014
@@ -616,7 +616,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml Thu Nov 27 20:41:01 2014
@@ -903,24 +903,6 @@
</requestHandler>
- <!-- realtime get handler, guaranteed to return the latest stored fields of
- any document, without the need to commit or open a new searcher. The
- current implementation relies on the updateLog feature being enabled.
-
- ** WARNING **
- Do NOT disable the realtime get handler at /get if you are using
- SolrCloud otherwise any leader election will cause a full sync in ALL
- replicas for the shard in question. Similarly, a replica recovery will
- also always fetch the complete index from the leader because a partial
- sync will not be possible in the absence of this handler.
- -->
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
- <lst name="defaults">
- <str name="omitHeader">true</str>
- <str name="wt">json</str>
- <str name="indent">true</str>
- </lst>
- </requestHandler>
<!--
The export request handler is used to export full sorted result sets.
@@ -1171,13 +1153,6 @@
class="solr.DocumentAnalysisRequestHandler"
startup="lazy" />
- <!-- Admin Handlers
-
- Admin Handlers - This will register all the standard admin
- RequestHandlers.
- -->
- <requestHandler name="/admin/"
- class="solr.admin.AdminHandlers" />
<!-- This single handler is equivalent to the following... -->
<!--
<requestHandler name="/admin/luke" class="solr.admin.LukeRequestHandler" />
@@ -1215,21 +1190,6 @@
</lst>
</requestHandler>
-->
- <!-- ping/healthcheck -->
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
- <lst name="invariants">
- <str name="q">solrpingquery</str>
- </lst>
- <lst name="defaults">
- <str name="echoParams">all</str>
- </lst>
- <!-- An optional feature of the PingRequestHandler is to configure the
- handler with a "healthcheckFile" which can be used to enable/disable
- the PingRequestHandler.
- relative paths are resolved against the data dir
- -->
- <!-- <str name="healthcheckFile">server-enabled.txt</str> -->
- </requestHandler>
<!-- Echo the request contents back to the client -->
<requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
@@ -1239,41 +1199,6 @@
</lst>
</requestHandler>
- <!-- Solr Replication
-
- The SolrReplicationHandler supports replicating indexes from a
- "master" used for indexing and "slaves" used for queries.
-
- http://wiki.apache.org/solr/SolrReplication
-
- 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).
-
- https://wiki.apache.org/solr/SolrCloud/
- -->
- <requestHandler name="/replication" class="solr.ReplicationHandler" >
- <!--
- To enable simple master/slave replication, uncomment one of the
- 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.
- -->
- <!--
- <lst name="master">
- <str name="replicateAfter">commit</str>
- <str name="replicateAfter">startup</str>
- <str name="confFiles">schema.xml,stopwords.txt</str>
- </lst>
- -->
- <!--
- <lst name="slave">
- <str name="masterUrl">http://your-master-hostname:8983/solr</str>
- <str name="pollInterval">00:00:60</str>
- </lst>
- -->
- </requestHandler>
-
<!-- Search Components
Search components are registered to SolrCore and used by
Modified: lucene/dev/branches/lucene6005/solr/site/html/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/site/html/tutorial.html?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/site/html/tutorial.html (original)
+++ lucene/dev/branches/lucene6005/solr/site/html/tutorial.html Thu Nov 27 20:41:01 2014
@@ -54,13 +54,13 @@ To follow along with this tutorial, you
</p>
<ol>
-<li>Java 1.7 or greater. Some places you can get it are from
+<li>Java 1.8 or greater. Some places you can get it are from
<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Oracle</a>,
<a href="http://openjdk.java.net/">Open JDK</a>, or
<a href="http://www.ibm.com/developerworks/java/jdk/">IBM</a>.
<ul>
<li>Running <span class="codefrag">java -version</span> at the command
- line should indicate a version number starting with 1.7.
+ line should indicate a version number starting with 1.8.
</li>
<li>Gnu's GCJ is not supported and does not work with Solr.</li>
</ul>