You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/01/14 02:00:10 UTC
svn commit: r1557898 - in /manifoldcf/branches/CONNECTORS-840-2: ./
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/
connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/
connectors/s...
Author: kwright
Date: Tue Jan 14 01:00:10 2014
New Revision: 1557898
URL: http://svn.apache.org/r1557898
Log:
Add functional feature for CONNECTORS-840, only. Do not include the tests or the mock infrastructure.
Removed:
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/test/
Modified:
manifoldcf/branches/CONNECTORS-840-2/ (props changed)
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
Propchange: manifoldcf/branches/CONNECTORS-840-2/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-840:r1556412-1557896
Modified: manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1557898&r1=1557897&r2=1557898&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Tue Jan 14 01:00:10 2014
@@ -19,8 +19,6 @@
package org.apache.manifoldcf.agents.output.solr;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.core.common.Base64;
-import org.apache.manifoldcf.core.common.XMLDoc;
import org.apache.manifoldcf.core.common.DateParser;
import org.apache.manifoldcf.agents.interfaces.*;
import org.apache.manifoldcf.agents.system.*;
@@ -28,31 +26,21 @@ import org.apache.manifoldcf.agents.syst
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.net.*;
-import javax.net.ssl.*;
import java.util.regex.*;
-import org.apache.log4j.*;
-
-import java.util.concurrent.TimeUnit;
-
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.client.params.ClientPNames;
-import org.apache.http.client.params.HttpClientParams;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
-import org.apache.http.conn.params.ConnRoutePNames;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.protocol.HttpContext;
@@ -483,17 +471,18 @@ public class HttpPoster
/**
* Post the input stream to ingest
- * @param documentURI is the document's uri.
- * @param document is the document structure to ingest.
- * @param arguments are the configuration arguments to pass in the post. Key is argument name, value is a list of the argument values.
- * @param authorityNameString is the name of the governing authority for this document's acls, or null if none.
- * @param activities is the activities object, so we can report what's happening.
- * @return true if the ingestion was successful, or false if the ingestion is illegal.
+ *
+ * @param documentURI is the document's uri.
+ * @param document is the document structure to ingest.
+ * @param arguments are the configuration arguments to pass in the post. Key is argument name, value is a list of the argument values.
+ * @param keepAllMetadata
+ *@param authorityNameString is the name of the governing authority for this document's acls, or null if none.
+ * @param activities is the activities object, so we can report what's happening. @return true if the ingestion was successful, or false if the ingestion is illegal.
* @throws ManifoldCFException, ServiceInterruption
*/
public boolean indexPost(String documentURI,
RepositoryDocument document, Map arguments, Map<String, List<String>> sourceTargets,
- String authorityNameString, IOutputAddActivity activities)
+ boolean keepAllMetadata, String authorityNameString, IOutputAddActivity activities)
throws ManifoldCFException, ServiceInterruption
{
if (Logging.ingest.isDebugEnabled())
@@ -515,7 +504,7 @@ public class HttpPoster
try
{
- IngestThread t = new IngestThread(documentURI,document,arguments,sourceTargets,shareAcls,shareDenyAcls,acls,denyAcls,commitWithin);
+ IngestThread t = new IngestThread(documentURI,document,arguments,keepAllMetadata,sourceTargets,shareAcls,shareDenyAcls,acls,denyAcls,commitWithin);
try
{
t.start();
@@ -765,15 +754,16 @@ public class HttpPoster
*/
protected class IngestThread extends java.lang.Thread
{
- protected String documentURI;
- protected RepositoryDocument document;
- protected Map<String,List<String>> arguments;
- protected Map<String,List<String>> sourceTargets;
- protected String[] shareAcls;
- protected String[] shareDenyAcls;
- protected String[] acls;
- protected String[] denyAcls;
- protected String commitWithin;
+ protected final String documentURI;
+ protected final RepositoryDocument document;
+ protected final Map<String,List<String>> arguments;
+ protected final Map<String,List<String>> sourceTargets;
+ protected final String[] shareAcls;
+ protected final String[] shareDenyAcls;
+ protected final String[] acls;
+ protected final String[] denyAcls;
+ protected final String commitWithin;
+ protected final boolean keepAllMetadata;
protected Long activityStart = null;
protected Long activityBytes = null;
@@ -784,7 +774,7 @@ public class HttpPoster
protected boolean rval = false;
public IngestThread(String documentURI, RepositoryDocument document,
- Map<String,List<String>> arguments, Map<String, List<String>> sourceTargets,
+ Map<String, List<String>> arguments, boolean keepAllMetadata, Map<String, List<String>> sourceTargets,
String[] shareAcls, String[] shareDenyAcls, String[] acls, String[] denyAcls, String commitWithin)
{
super();
@@ -798,6 +788,7 @@ public class HttpPoster
this.denyAcls = denyAcls;
this.sourceTargets = sourceTargets;
this.commitWithin = commitWithin;
+ this.keepAllMetadata=keepAllMetadata;
}
public void run()
@@ -868,32 +859,7 @@ public class HttpPoster
}
// Write the metadata, each in a field by itself
- Iterator<String> iter = document.getFields();
- while (iter.hasNext())
- {
- String fieldName = iter.next();
- List<String> mapping = sourceTargets.get(fieldName);
- if(mapping != null) {
- for(String newFieldName : mapping) {
- if(newFieldName != null && !newFieldName.isEmpty()) {
- if (newFieldName.toLowerCase(Locale.ROOT).equals(idAttributeName.toLowerCase(Locale.ROOT))) {
- newFieldName = ID_METADATA;
- }
- String[] values = document.getFieldAsStrings(fieldName);
- writeField(out,LITERAL+newFieldName,values);
- }
- }
- } else {
- String newFieldName = fieldName;
- if (!newFieldName.isEmpty()) {
- if (newFieldName.toLowerCase(Locale.ROOT).equals(idAttributeName.toLowerCase(Locale.ROOT))) {
- newFieldName = ID_METADATA;
- }
- String[] values = document.getFieldAsStrings(fieldName);
- writeField(out,LITERAL+newFieldName,values);
- }
- }
- }
+ buildSolrParamsFromMetadata(out);
// These are unnecessary now in the case of non-solrcloud setups, because we overrode the SolrJ posting method to use multipart.
//writeField(out,LITERAL+"stream_size",String.valueOf(length));
@@ -983,6 +949,52 @@ public class HttpPoster
}
}
+ /**
+ * builds the solr parameter maps for the update request.
+ * For each mapping expressed is applied the renaming for the metadata field name.
+ * If we set to keep all the metadata, the metadata non present in the mapping will be kept with their original names.
+ * In the other case ignored
+ * @param out
+ * @throws IOException
+ */
+ private void buildSolrParamsFromMetadata(ModifiableSolrParams out) throws IOException
+ {
+ if (this.keepAllMetadata)
+ {
+ Iterator<String> iter = document.getFields();
+ while (iter.hasNext())
+ {
+ String fieldName = iter.next();
+ List<String> mappings = sourceTargets.get(fieldName);
+ if (mappings != null)
+ for (String newFieldName : mappings)
+ applySingleMapping(fieldName, out, newFieldName);
+ else // the fields not mentioned in the mapping are added only if we have set the keep all metadata=true.
+ applySingleMapping(fieldName, out, fieldName);
+ }
+ }
+ else
+ {
+ //don't keep all the metadata but only the ones in sourceTargets
+ for (String originalFieldName : sourceTargets.keySet())
+ {
+ List<String> mapping = sourceTargets.get(originalFieldName);
+ for (String newFieldName : mapping)
+ applySingleMapping(originalFieldName, out, newFieldName);
+ }
+ }
+ }
+
+ private void applySingleMapping(String originalFieldName, ModifiableSolrParams out, String newFieldName) throws IOException {
+ if(newFieldName != null && !newFieldName.isEmpty()) {
+ if (newFieldName.toLowerCase(Locale.ROOT).equals(idAttributeName.toLowerCase(Locale.ROOT))) {
+ newFieldName = ID_METADATA;
+ }
+ String[] values = document.getFieldAsStrings(originalFieldName);
+ writeField(out,LITERAL+newFieldName,values);
+ }
+ }
+
public Throwable getException()
{
return exception;
Modified: manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java?rev=1557898&r1=1557897&r2=1557898&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java (original)
+++ manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java Tue Jan 14 01:00:10 2014
@@ -126,5 +126,10 @@ public class SolrConfig
public static final String ATTRIBUTE_SOURCE = "source";
/** Attribute describing a target field name */
public static final String ATTRIBUTE_TARGET = "target";
+
+ /**
+ * Node describing the keep metadata
+ */
+ public static final String NODE_KEEPMETADATA = "keepAllMetadata";
}
Modified: manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1557898&r1=1557897&r2=1557898&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java Tue Jan 14 01:00:10 2014
@@ -18,11 +18,31 @@
*/
package org.apache.manifoldcf.agents.output.solr;
-import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
-
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity;
+import org.apache.manifoldcf.agents.interfaces.IOutputNotifyActivity;
+import org.apache.manifoldcf.agents.interfaces.IOutputRemoveActivity;
+import org.apache.manifoldcf.agents.interfaces.OutputSpecification;
+import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
+import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
+import org.apache.manifoldcf.core.interfaces.ConfigNode;
+import org.apache.manifoldcf.core.interfaces.ConfigParams;
+import org.apache.manifoldcf.core.interfaces.ConfigurationNode;
+import org.apache.manifoldcf.core.interfaces.IDFactory;
+import org.apache.manifoldcf.core.interfaces.IHTTPOutput;
+import org.apache.manifoldcf.core.interfaces.IKeystoreManager;
+import org.apache.manifoldcf.core.interfaces.IPostParameters;
+import org.apache.manifoldcf.core.interfaces.IThreadContext;
+import org.apache.manifoldcf.core.interfaces.KeystoreManagerFactory;
+import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
+import org.apache.manifoldcf.core.interfaces.SpecificationNode;
/** This is the output connector for SOLR. Currently, no frills.
@@ -493,11 +513,17 @@ public class SolrConnector extends org.a
// Do the source/target pairs
i = 0;
Map<String, List<String>> sourceTargets = new HashMap<String, List<String>>();
+ boolean keepAllMetadata = true;
while (i < spec.getChildCount()) {
SpecificationNode sn = spec.getChild(i++);
- if (sn.getType().equals(SolrConfig.NODE_FIELDMAP)) {
+
+ if(sn.getType().equals(SolrConfig.NODE_KEEPMETADATA)) {
+ String value = sn.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE);
+ keepAllMetadata = Boolean.parseBoolean(value);
+ } else if (sn.getType().equals(SolrConfig.NODE_FIELDMAP)) {
String source = sn.getAttributeValue(SolrConfig.ATTRIBUTE_SOURCE);
String target = sn.getAttributeValue(SolrConfig.ATTRIBUTE_TARGET);
+
if (target == null) {
target = "";
}
@@ -537,6 +563,12 @@ public class SolrConnector extends org.a
packList(sb,sourceTargetsList,'+');
+ // Keep all metadata flag
+ if (keepAllMetadata)
+ sb.append('+');
+ else
+ sb.append('-');
+
// Here, append things which we have no intention of unpacking. This includes stuff that comes from
// the configuration information, for instance.
@@ -629,6 +661,8 @@ public class SolrConnector extends org.a
index = unpackList(nameValues,outputDescription,index,'+');
ArrayList sts = new ArrayList();
index = unpackList(sts,outputDescription,index,'+');
+ ArrayList metadataExtraParams = new ArrayList();
+ index = unpackList(metadataExtraParams, outputDescription, index, '+');
String[] fixedBuffer = new String[2];
// Do the name/value pairs
@@ -662,11 +696,18 @@ public class SolrConnector extends org.a
list.add(target);
}
+ // extract keep all metadata Flag
+ boolean keepAllMetadata = true;
+ if (index < outputDescription.length())
+ {
+ keepAllMetadata = (outputDescription.charAt(index++) == '+');
+ }
+
// Establish a session
getSession();
// Now, go off and call the ingest API.
- if (poster.indexPost(documentURI,document,args,sourceTargets,authorityNameString,activities))
+ if (poster.indexPost(documentURI,document,args,sourceTargets,keepAllMetadata,authorityNameString,activities))
return DOCUMENTSTATUS_ACCEPTED;
return DOCUMENTSTATUS_REJECTED;
}
@@ -782,7 +823,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"+
@@ -2289,6 +2330,7 @@ public class SolrConnector extends org.a
int fieldCounter = 0;
i = 0;
+ SpecificationNode keepMetadata = null;
while (i < os.getChildCount()) {
SpecificationNode sn = os.getChild(i++);
if (sn.getType().equals(SolrConfig.NODE_FIELDMAP)) {
@@ -2325,6 +2367,9 @@ public class SolrConnector extends org.a
);
fieldCounter++;
}
+ else if(sn.getType().equals(SolrConfig.NODE_KEEPMETADATA)) {
+ keepMetadata = sn;
+ }
}
if (fieldCounter == 0)
@@ -2333,6 +2378,12 @@ public class SolrConnector extends org.a
" <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"3\">" + Messages.getBodyString(locale,"SolrConnector.NoFieldMappingSpecified") + "</td></tr>\n"
);
}
+
+ String keepMetadataValue = "";
+ if(keepMetadata != null) {
+ keepMetadataValue = keepMetadata.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE);
+ keepMetadataValue = !keepMetadataValue.isEmpty() && keepMetadataValue != null && keepMetadataValue.equals("true") ? "checked" : "";
+ }
out.print(
" <tr class=\"formrow\"><td class=\"formseparator\" colspan=\"3\"><hr/></td></tr>\n"+
" <tr class=\"formrow\">\n"+
@@ -2350,6 +2401,16 @@ public class SolrConnector extends org.a
" <nobr><input type=\"text\" size=\"15\" name=\"solr_fieldmapping_target\" value=\"\"/></nobr>\n"+
" </td>\n"+
" </tr>\n"+
+ // Adding keep metadata
+ " <tr class=\"formrow\">\n"+
+ " <td class=\"formcolumncell\">\n"+
+ " <input type=\"checkbox\" "+keepMetadataValue+" name=\"solr_keepallmetadata\" value=\"true\" />\n"+
+ " </td>\n"+
+ " <td class=\"formcolumncell\">\n"+
+ Messages.getAttributeString(locale,"SolrConnector.KeepAllMetadata")+
+ " </td>\n"+
+ " <td class=\"formcolumncell\">\n</td>\n"+
+ " </tr>\n"+
" </table>\n"+
" </td>\n"+
" </tr>\n"+
@@ -2376,6 +2437,9 @@ public class SolrConnector extends org.a
);
fieldCounter++;
}
+ else if(sn.getType().equals(SolrConfig.NODE_KEEPMETADATA)) {
+ out.print("<input type=\"hidden\" name=\"solr_keepallmetadata\" value=\""+sn.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE)+"\"/>\n");
+ }
}
out.print(
"<input type=\"hidden\" name=\"solr_fieldmapping_count\" value=\""+Integer.toString(fieldCounter)+"\"/>\n"
@@ -2404,7 +2468,7 @@ public class SolrConnector extends org.a
while (i < os.getChildCount())
{
SpecificationNode node = os.getChild(i);
- if (node.getType().equals(SolrConfig.NODE_FIELDMAP))
+ if (node.getType().equals(SolrConfig.NODE_FIELDMAP) || node.getType().equals(SolrConfig.NODE_KEEPMETADATA))
os.removeChild(i);
else
i++;
@@ -2429,6 +2493,7 @@ public class SolrConnector extends org.a
}
i++;
}
+
String addop = variableContext.getParameter("solr_fieldmapping_op");
if (addop != null && addop.equals("Add"))
{
@@ -2441,6 +2506,18 @@ public class SolrConnector extends org.a
node.setAttribute(SolrConfig.ATTRIBUTE_TARGET,target);
os.addChild(os.getChildCount(),node);
}
+
+ // Gather the keep all metadata parameter to be the last one
+ SpecificationNode node = new SpecificationNode(SolrConfig.NODE_KEEPMETADATA);
+ if(variableContext.getParameter("solr_keepallmetadata") != null && !variableContext.getParameter("solr_keepallmetadata").isEmpty()) {
+ node.setAttribute(SolrConfig.ATTRIBUTE_VALUE, "true");
+ }
+ else {
+ node.setAttribute(SolrConfig.ATTRIBUTE_VALUE, "false");
+ }
+ // Add the new keepallmetadata config parameter
+ os.addChild(os.getChildCount(), node);
+
}
return null;
}
Modified: manifoldcf/branches/CONNECTORS-840-2/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-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1557898&r1=1557897&r2=1557898&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Tue Jan 14 01:00:10 2014
@@ -14,6 +14,7 @@
# limitations under the License.
SolrConnector.Arguments=Arguments
+SolrConnector.KeepAllMetadata=Keep all metadata
SolrConnector.Arguments2=Arguments:
SolrConnector.Commits=Commits
SolrConnector.Documents=Documents
@@ -27,11 +28,10 @@ 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:
-SolrConnector.Port=Port:
SolrConnector.WebApplicationName=Web application name:
SolrConnector.CoreName=Core/Collection name:
SolrConnector.CollectionName=Collection 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,16 +92,7 @@ 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.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.CoreNameCannotHaveCharacters=Core name cannot have '/' characters
-SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=Web application must be specified if core is specified
-SolrConnector.UpdatePathMustStartWithACharacter=Update path must start with a '/' character
-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.CommitWithinValueMustBeAnInteger=Commit-within value must be an integer
SolrConnector.ArgumentNameCannotBeAnEmptyString=Argument name cannot be an empty string
SolrConnector.DeleteCert=Delete cert
SolrConnector.Delete=Delete
Modified: manifoldcf/branches/CONNECTORS-840-2/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-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1557898&r1=1557897&r2=1557898&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties Tue Jan 14 01:00:10 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=åé¤