svn commit: r1427396 - in /manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main: java/org/apache/manifoldcf/agents/output/solr/ native2ascii/org/apache/manifoldcf/agents/output/solr/

[kwright]

Author: kwright
Date: Tue Jan  1 13:00:28 2013
New Revision: 1427396

URL: http://svn.apache.org/viewvc?rev=1427396&view=rev
Log:
Add collection field to zookeeper tab

Modified:
    
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties

Modified: 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1427396&r1=1427395&r2=1427396&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Tue Jan  1 13:00:28 2013
@@ -956,6 +956,10 @@ public class SolrConnector extends org.a
     if (core == null)
       core = "";
 
+    String collection = parameters.getParameter(SolrConfig.PARAM_COLLECTION);
+    if (collection == null)
+      collection = "collection1";
+    
     String connectionTimeout = 
parameters.getParameter(SolrConfig.PARAM_CONNECTION_TIMEOUT);
     if (connectionTimeout == null)
       connectionTimeout = "60";
@@ -1296,6 +1300,13 @@ public class SolrConnector extends org.a
 "  </tr>\n"+
 "  <tr><td colspan=\"2\" class=\"separator\"><hr/></td></tr>\n"+
 "  <tr>\n"+
+"    <td class=\"description\"><nobr>" + 
Messages.getBodyString(locale,"SolrConnector.CollectionName") + 
"</nobr></td>\n"+
+"    <td class=\"value\">\n"+
+"      <input name=\"collection\" type=\"text\" size=\"16\" 
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(collection)+"\"/>\n"+
+"    </td>\n"+
+"  </tr>\n"+
+"  <tr><td colspan=\"2\" class=\"separator\"><hr/></td></tr>\n"+
+"  <tr>\n"+
 "    <td class=\"description\"><nobr>" + 
Messages.getBodyString(locale,"SolrConnector.ZookeeperClientTimeout") + 
"</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input name=\"zkclienttimeout\" type=\"text\" size=\"5\" 
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(zkClientTimeout)+"\"/>\n"+
@@ -1640,6 +1651,10 @@ public class SolrConnector extends org.a
     if (core != null)
       parameters.setParameter(SolrConfig.PARAM_CORE,core);
 
+    String collection = variableContext.getParameter("collection");
+    if (collection != null)
+      parameters.setParameter(SolrConfig.PARAM_COLLECTION,collection);
+
     String connectionTimeout = 
variableContext.getParameter("connectiontimeout");
     if (connectionTimeout != null)
       
parameters.setParameter(SolrConfig.PARAM_CONNECTION_TIMEOUT,connectionTimeout);

Modified: 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1427396&r1=1427395&r2=1427396&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Tue Jan  1 13:00:28 2013
@@ -32,7 +32,8 @@ SolrConnector.Protocol=Protocol:
 SolrConnector.ServerName=Server name:
 SolrConnector.Port=Port:
 SolrConnector.WebApplicationName=Web application name:
-SolrConnector.CoreName=Core name:
+SolrConnector.CoreName=Core/Collection name:
+SolrConnector.CollectionName=Collection name:
 SolrConnector.ConnectionTimeout=Connection timeout (seconds):
 SolrConnector.SocketTimeout=Socket timeout (seconds):
 SolrConnector.ZookeeperClientTimeout=Zookeeper client timeout (seconds):

Modified: 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1427396&r1=1427395&r2=1427396&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Tue Jan  1 13:00:28 2013
@@ -32,7 +32,8 @@ SolrConnector.Protocol=プロãƒ�
 SolrConnector.ServerName=サーバ名：
 SolrConnector.Port=ポート：
 SolrConnector.WebApplicationName=Webアプリケーション名：
-SolrConnector.CoreName=コア名：
+SolrConnector.CoreName=Core/Collection name:
+SolrConnector.CollectionName=Collection name:
 SolrConnector.ConnectionTimeout=Connection timeout (seconds):
 SolrConnector.SocketTimeout=Socket timeout (seconds):
 SolrConnector.ZookeeperClientTimeout=Zookeeper client timeout (seconds):