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

kwright Wed, 08 Jan 2014 02:46:55 -0800

Author: kwright
Date: Wed Jan  8 10:45:12 2014
New Revision: 1556489

URL: http://svn.apache.org/r1556489
Log:
Remove duplicates from commons properties file


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

Modified: 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1556489&r1=1556488&r2=1556489&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Wed Jan  8 10:45:12 2014
@@ -830,7 +830,7 @@ public class SolrConnector extends org.a
 "  }\n"+
 "  if (editconnection.core.value != \"\" && 
editconnection.core.value.indexOf(\"/\") != -1)\n"+
 "  {\n"+
-"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.CoreNameCannotHaveCharacter")+"\");\n"+
+"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.CoreNameCannotHaveCharacters")+"\");\n"+
 "    editconnection.core.focus();\n"+
 "    return false;\n"+
 "  }\n"+

Modified: 
manifoldcf/branches/CONNECTORS-840/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-840/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1556489&r1=1556488&r2=1556489&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Wed Jan  8 10:45:12 2014
@@ -28,7 +28,7 @@ SolrConnector.SingleServer=Single server
 SolrConnector.SolrCloud=SolrCloud
 SolrConnector.ZookeeperHosts=ZooKeeper hosts:
 SolrConnector.Host=Host
-SolrConnector.Port=Port\:
+SolrConnector.Port=Port:
 SolrConnector.ZnodePath=Znode path:
 SolrConnector.Protocol=Protocol:
 SolrConnector.ServerName=Server name:
@@ -83,7 +83,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.CoreNameCannotHaveCharacter=Core name cannot have '/' characters
+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
 SolrConnector.SocketTimeoutMustBeInteger=Socket timeout must be an integer
@@ -92,9 +92,6 @@ SolrConnector.RemovePathMustStartWAChara
 SolrConnector.StatusPathMustStartWACharacter=Status path must start with a  
'/' character
 SolrConnector.MaximumDocumentLengthMustBAnInteger=Maximum document length must 
be an integer
 SolrConnector.CommitWithinValueMustBeAnInteger=Commit-within value must be an 
integer
-SolrConnector.CoreNameCannotHaveCharacters=Core name cannot have '/' characters
-SolrConnector.RemovePathMustStartWithACharacter=Remove path must start with a  
'/' character
-SolrConnector.StatusPathMustStartWithACharacter=Status path must start with a  
'/' character
 SolrConnector.MaximumDocumentLengthMustBeAnInteger=Maximum document length 
must be an integer
 SolrConnector.ArgumentNameCannotBeAnEmptyString=Argument name cannot be an 
empty string
 SolrConnector.DeleteCert=Delete cert 

Modified: 
manifoldcf/branches/CONNECTORS-840/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-840/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1556489&r1=1556488&r2=1556489&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Wed Jan  8 10:45:12 2014
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 SolrConnector.Arguments=å¼æ°
+SolrConnector.KeepAllMetadata=Keep all metadata
 SolrConnector.Arguments2=å¼æ°ï¼
 SolrConnector.Commits=ã³ããã
 SolrConnector.Documents=ã³ã³ãã³ã
@@ -27,11 +28,10 @@ SolrConnector.SingleServer=ã·ã³�
 SolrConnector.SolrCloud=SolrCloud
 SolrConnector.ZookeeperHosts=ZooKeeperãã¹ã:
 SolrConnector.Host=ãã¹ã
-SolrConnector.Port=ãã¼ã
+SolrConnector.Port=ãã¼ã:
 SolrConnector.ZnodePath=Znodeãã¹:
 SolrConnector.Protocol=ãããã³ã«ï¼
 SolrConnector.ServerName=ãµã¼ãåï¼
-SolrConnector.Port=ãã¼ãï¼
 SolrConnector.WebApplicationName=Webã¢ããªã±ã¼ã·ã§ã³åï¼
 SolrConnector.CoreName=ã³ã¢/ã³ã¬ã¯ã·ã§ã³å:
 SolrConnector.CollectionName=ã³ã¬ã¯ã·ã§ã³å:
@@ -75,15 +75,15 @@ SolrConnector.SolrFieldName=Solrãã
 
SolrConnector.NoFieldMappingSpecified=ãã£ã¼ã«ããããã³ã°ã®æå®ãããã¾ãã
 
SolrConnector.NoZookeeperHostsSpecified=ZooKeeperãã¹ãã®æå®ãããã¾ãã
 SolrConnector.AddFieldMapping=ãã£ã¼ã«ããããã³ã°ãè¿½å 
+SolrConnector.ChooseACertificateFile=è¨¼ææ¸ãã¡ã¤ã«ãé¸æãã¦ãã 
ãã
 
SolrConnector.ZookeeperHostCannotBeNull=ZooKeeperãã¹ãã¯Nullã«ã§ãã¾ãã
 
SolrConnector.ZookeeperPortCannotBeNull=ZooKeeperãã¼ãã¯Nullã«ã§ãã¾ãã
 SolrConnector.ZookeeperPortMustBeAnInteger=ZooKeeperãã¼ãã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
 
SolrConnector.ZnodePathMustStartWithACharacter=Znodeãã¹ã¯ã/ãããå§ãã¦ãã
 ãã
-SolrConnector.ChooseACertificateFile=è¨¼ææ¸ãã¡ã¤ã«ãé¸æãã¦ãã 
ãã
 SolrConnector.PleaseSupplyAValidSolrServerName=æ£ããSolrãµã¼ãåãå
¥åãã¦ãã ãã
 
SolrConnector.SolrServerPortMustBeAValidInteger=Solrãµã¼ããã¼ãçªå·ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
 
SolrConnector.WebApplicationNameCannotHaveCharacters=Webã¢ããªã±ã¼ã·ã§ã³åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
-SolrConnector.CoreNameCannotHaveCharacter=ã³ã¢åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
+SolrConnector.CoreNameCannotHaveCharacters=ã³ã¢åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
 
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=ã³ã¢ãæå®ããå
 ´åã¯Webã¢ããªã±ã¼ã·ã§ã³ãæå®ãã¦ãã ãã
 SolrConnector.ConnectionTimeoutMustBeInteger=ã³ãã¯ã·ã§ã³ã¿ã¤ã 
ã¢ã¦ãã«ã¯æ´æ°ãå¥åãã¦ãã ãã
 SolrConnector.SocketTimeoutMustBeInteger=ã½ã±ããã¿ã¤ã 
ã¢ã¦ãå¤ã«ã¯æ´æ°ãå¥åãã¦ãã ãã
@@ -92,16 +92,7 @@ SolrConnector.RemovePathMustStartWAChara
 SolrConnector.StatusPathMustStartWACharacter=ç¶æ
ãã¹ã¯æåã/ãããå§ãã¦ãã ãã
 
SolrConnector.MaximumDocumentLengthMustBAnInteger=ã³ã³ãã³ãã®æå¤§é·ãã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
 
SolrConnector.CommitWithinValueMustBeAnInteger=Commit-withinå¤ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
-SolrConnector.PleaseSupplyAValidSolrServerName=æ£ããSolrãµã¼ãåãå
¥åãã¦ãã ãã
-SolrConnector.SolrServerPortMustBeAValidInteger=Solrãµã¼ããã¼ãã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
-SolrConnector.WebApplicationNameCannotHaveCharacters=Webã¢ããªã±ã¼ã·ã§ã³åã«ã¯æåã/ãã¯ä½¿ããªãã§ãã
 ãã
-SolrConnector.CoreNameCannotHaveCharacters=ã³ã¢åã«ã¯æåã/ãã¯ä½¿ããªãã§ãã
 ãã
-SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=ã³ã¢ãæå®ããå
 ´åã¯Webã¢ããªã±ã¼ã·ã§ã³ãæå®ãã¦ãã ãã
-SolrConnector.UpdatePathMustStartWithACharacter=æ´æ°ãã¹ã¯ã/ãããå§ãã¦ãã
 ãã
-SolrConnector.RemovePathMustStartWithACharacter=åé¤ãã¹ã¯ã/ãããå§ãã¦ãã
 ãã
-SolrConnector.StatusPathMustStartWithACharacter=ç¶æ
ãã¹ã¯ã/ãããå§ãã¦ãã ãã
 
SolrConnector.MaximumDocumentLengthMustBeAnInteger=æå¤§ã³ã³ãã³ãé·ãã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
-SolrConnector.CommitWithinValueMustBeAnInteger=Commit-withinã®å¤ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
 SolrConnector.ArgumentNameCannotBeAnEmptyString=å¼æ°åãå¥åãã¦ãã 
ãã
 SolrConnector.DeleteCert=è¨¼ææ¸ãåé¤ 
 SolrConnector.Delete=åé¤

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

Reply via email to