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/

[shinichiro]

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=连接超时值必须为整数