You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by sh...@apache.org on 2015/06/26 14:35:39 UTC
svn commit: r1687768 - in /manifoldcf/trunk: ./
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/
connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/
Author: shinichiro
Date: Fri Jun 26 12:35:39 2015
New Revision: 1687768
URL: http://svn.apache.org/r1687768
Log:
Fix for CONNECTORS-1216
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1687768&r1=1687767&r2=1687768&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jun 26 12:35:39 2015
@@ -3,6 +3,10 @@ $Id$
======================= 2.2-dev =====================
+CONNECTORS-1216: Set default core/collection name
+and add required check on Solr connector.
+(Shinichiro Abe)
+
CONNECTORS-1215: Fuzzyml parser needs to ignore "<" followed by
whitespace, since those are technically not valid tags and some sites
care.
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1687768&r1=1687767&r2=1687768&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java Fri Jun 26 12:35:39 2015
@@ -340,7 +340,7 @@ public class SolrConnector extends org.a
String core = params.getParameter(SolrConfig.PARAM_CORE);
if (core != null && core.length() == 0)
- core = null;
+ core = "collection1";
// Pick up timeouts
String socketTimeoutString = params.getParameter(SolrConfig.PARAM_SOCKET_TIMEOUT);
@@ -784,6 +784,12 @@ public class SolrConnector extends org.a
" editconnection.webappname.focus();\n"+
" return false;\n"+
" }\n"+
+" if (editconnection.core.value == \"\")\n"+
+" {\n"+
+" alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.PleaseSupplySolrCoreName")+"\");\n"+
+" editconnection.core.focus();\n"+
+" return false;\n"+
+" }\n"+
" if (editconnection.core.value != \"\" && editconnection.core.value.indexOf(\"/\") != -1)\n"+
" {\n"+
" alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.CoreNameCannotHaveCharacters")+"\");\n"+
@@ -974,7 +980,7 @@ public class SolrConnector extends org.a
String core = parameters.getParameter(SolrConfig.PARAM_CORE);
if (core == null)
- core = "";
+ core = "collection1";
String znodePath = parameters.getParameter(SolrConfig.PARAM_ZOOKEEPER_ZNODE_PATH);
if (znodePath == null)
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1687768&r1=1687767&r2=1687768&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Fri Jun 26 12:35:39 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
SolrConnector.PleaseSupplyAValidSolrServerName=Please supply a valid Solr server name
SolrConnector.SolrServerPortMustBeAValidInteger=Solr server port must be a valid integer
SolrConnector.WebApplicationNameCannotHaveCharacters=Web application name cannot have '/' characters
+SolrConnector.PleaseSupplySolrCoreName=Please supply Solr core name
SolrConnector.CoreNameCannotHaveCharacters=Core name cannot have '/' characters
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=Web application must be specified if core is specified
SolrConnector.ConnectionTimeoutMustBeInteger=Connection timeout must be an integer
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1687768&r1=1687767&r2=1687768&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties Fri Jun 26 12:35:39 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
SolrConnector.PleaseSupplyAValidSolrServerName=æ£ããSolrãµã¼ãåãå
¥åãã¦ãã ãã
SolrConnector.SolrServerPortMustBeAValidInteger=Solrãµã¼ããã¼ãçªå·ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
SolrConnector.WebApplicationNameCannotHaveCharacters=Webã¢ããªã±ã¼ã·ã§ã³åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
+SolrConnector.PleaseSupplySolrCoreName=ã³ã¢åãå
¥åãã¦ãã ãã
SolrConnector.CoreNameCannotHaveCharacters=ã³ã¢åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=ã³ã¢ãæå®ããå ´åã¯Webã¢ããªã±ã¼ã·ã§ã³ãæå®ãã¦ãã ãã
SolrConnector.ConnectionTimeoutMustBeInteger=ã³ãã¯ã·ã§ã³ã¿ã¤ã ã¢ã¦ãã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties?rev=1687768&r1=1687767&r2=1687768&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties Fri Jun 26 12:35:39 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
SolrConnector.PleaseSupplyAValidSolrServerName=请è¾å
¥ææçSolræå¡å¨å
SolrConnector.SolrServerPortMustBeAValidInteger=Solræå¡å¨ç«¯å£å¿
须为ææçæ´æ°
SolrConnector.WebApplicationNameCannotHaveCharacters=Webåºç¨ç¨åºåä¸è½å
å«å符â/â
+SolrConnector.PleaseSupplySolrCoreName==请è¾å
¥SolrCoreå
SolrConnector.CoreNameCannotHaveCharacters=Coreåä¸è½å
å«å符â/â
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=å¦Coreå·²æå®åéæå®Webåºç¨ç¨åº
SolrConnector.ConnectionTimeoutMustBeInteger=è¿æ¥è¶
æ¶å¼å¿
须为æ´æ°