Author: kwright
Date: Sat Aug 30 12:28:25 2014
New Revision: 1621449
URL: http://svn.apache.org/r1621449
Log:
Remove deprecated methods from output connectors. Part of CONNECTORS-977
Modified:
manifoldcf/trunk/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
manifoldcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/agents/output/filesystem/FileOutputConnector.java
manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java
manifoldcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
Modified:
manifoldcf/trunk/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java
(original)
+++
manifoldcf/trunk/connectors/amazoncloudsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/amazoncloudsearch/AmazonCloudSearchConnector.java
Sat Aug 30 12:28:25 2014
@@ -704,24 +704,4 @@ public class AmazonCloudSearchConnector
currentTime + 300000L, currentTime + 3 * 60 * 60000L, -1, false);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
}
Modified:
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
(original)
+++
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
Sat Aug 30 12:28:25 2014
@@ -261,26 +261,6 @@ public class ElasticSearchConnector exte
outputResource(EDIT_CONFIG_FORWARD_PARAMETERS, out, locale, config,
tabName, null, null);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
/** Output the specification header section.
* This method is called in the head section of a job page which has selected
a pipeline connection of the current type. Its purpose is to add the required
tabs
* to the list, and to output any javascript methods that might be needed by
the job editing HTML.
@@ -456,10 +436,10 @@ public class ElasticSearchConnector exte
}
@Override
- public boolean checkMimeTypeIndexable(String outputDescription,
- String mimeType) throws ManifoldCFException, ServiceInterruption
+ public boolean checkMimeTypeIndexable(VersionContext outputDescription,
String mimeType, IOutputCheckActivity activities)
+ throws ManifoldCFException, ServiceInterruption
{
- ElasticSearchSpecs specs = getSpecsCache(outputDescription);
+ ElasticSearchSpecs specs =
getSpecsCache(outputDescription.getVersionString());
return specs.checkMimeType(mimeType);
}
@@ -504,11 +484,24 @@ public class ElasticSearchConnector exte
return new String[0];
}
+ /** Add (or replace) a document in the output data store using the connector.
+ * This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
+ * necessary.
+ *@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
+ * and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
+ *@param document is the document data to be processed (handed to the output
data store).
+ *@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
+ *@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
+ * or sending a modified document to the next stage in the pipeline.
+ *@return the document status (accepted or permanently rejected).
+ *@throws IOException only if there's a stream error reading the document
data.
+ */
@Override
- public int addOrReplaceDocument(String documentURI, String outputDescription,
+ public int addOrReplaceDocumentWithException(String documentURI,
VersionContext pipelineDescription,
RepositoryDocument document, String authorityNameString,
IOutputAddActivity activities) throws ManifoldCFException,
- ServiceInterruption
+ ServiceInterruption, IOException
{
HttpClient client = getSession();
ElasticSearchConfig config = getConfigParameters(null);
Modified:
manifoldcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/agents/output/filesystem/FileOutputConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/agents/output/filesystem/FileOutputConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/agents/output/filesystem/FileOutputConnector.java
(original)
+++
manifoldcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/agents/output/filesystem/FileOutputConnector.java
Sat Aug 30 12:28:25 2014
@@ -452,26 +452,6 @@ public class FileOutputConnector extends
activities.recordActivity(null, REMOVE_ACTIVITY, null, documentURI, "OK",
null);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
/** Output the specification header section.
* This method is called in the head section of a job page which has selected
a pipeline connection of the current type. Its purpose is to add the required
tabs
* to the list, and to output any javascript methods that might be needed by
the job editing HTML.
Modified:
manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
(original)
+++
manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
Sat Aug 30 12:28:25 2014
@@ -200,7 +200,7 @@ public class GTSConnector extends org.ap
*@return true if the mime type is indexable by this connector.
*/
@Override
- public boolean checkMimeTypeIndexable(String mimeType)
+ public boolean checkMimeTypeIndexable(VersionContext outputDescription,
String mimeType, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
return (ingestableMimeTypeMap.get(mimeType) != null);
@@ -213,11 +213,9 @@ public class GTSConnector extends org.ap
*@return true if the file is indexable.
*/
@Override
- public boolean checkDocumentIndexable(File localFile)
+ public boolean checkDocumentIndexable(VersionContext outputDescription, File
localFile, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
- if (!super.checkDocumentIndexable(localFile))
- return false;
int docType = fingerprint(localFile);
return (docType == DT_TEXT ||
docType == DT_MSWORD ||
@@ -288,21 +286,22 @@ public class GTSConnector extends org.ap
/** Add (or replace) a document in the output data store using the connector.
* This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
* necessary.
- * The OutputSpecification is *not* provided to this method, because the goal
is consistency, and if output is done it must be consistent with the
- * output description, since that was what was partly used to determine if
output should be taking place. So it may be necessary for this method to decode
- * an output description string in order to determine what should be done.
*@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
* and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
- *@param outputDescription is the description string that was constructed for
this document by the getOutputDescription() method.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
*@param document is the document data to be processed (handed to the output
data store).
*@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
- *@param activities is the handle to an object that the implementer of an
output connector may use to perform operations, such as logging processing
activity.
+ *@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
+ * or sending a modified document to the next stage in the pipeline.
*@return the document status (accepted or permanently rejected).
+ *@throws IOException only if there's a stream error reading the document
data.
*/
@Override
- public int addOrReplaceDocument(String documentURI, String
outputDescription, RepositoryDocument document, String authorityNameString,
IOutputAddActivity activities)
- throws ManifoldCFException, ServiceInterruption
+ public int addOrReplaceDocumentWithException(String documentURI,
VersionContext pipelineDescription, RepositoryDocument document, String
authorityNameString, IOutputAddActivity activities)
+ throws ManifoldCFException, ServiceInterruption, IOException
{
+ String outputDescription = pipelineDescription.getVersionString();
+
// Establish a session
getSession();
@@ -557,26 +556,6 @@ public class GTSConnector extends org.ap
);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
/** Output the specification header section.
* This method is called in the head section of a job page which has selected
a pipeline connection of the current type. Its purpose is to add the required
tabs
* to the list, and to output any javascript methods that might be needed by
the job editing HTML.
Modified:
manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java
(original)
+++
manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java
Sat Aug 30 12:28:25 2014
@@ -256,22 +256,22 @@ public class HDFSOutputConnector extends
}
/** Add (or replace) a document in the output data store using the connector.
- * This method presumes that the connector object has been configured, and
it is thus able to communicate with the output data store should that be
- * necessary.
- * The OutputSpecification is *not* provided to this method, because the
goal is consistency, and if output is done it must be consistent with the
- * output description, since that was what was partly used to determine if
output should be taking place. So it may be necessary for this method to decode
- * an output description string in order to determine what should be done.
- *@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
- * and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
- *@param outputDescription is the description string that was constructed
for this document by the getOutputDescription() method.
- *@param document is the document data to be processed (handed to the output
data store).
- *@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
- *@param activities is the handle to an object that the implementer of an
output connector may use to perform operations, such as logging processing
activity.
- *@return the document status (accepted or permanently rejected).
- */
+ * This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
+ * necessary.
+ *@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
+ * and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
+ *@param document is the document data to be processed (handed to the output
data store).
+ *@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
+ *@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
+ * or sending a modified document to the next stage in the pipeline.
+ *@return the document status (accepted or permanently rejected).
+ *@throws IOException only if there's a stream error reading the document
data.
+ */
@Override
- public int addOrReplaceDocument(String documentURI, String
outputDescription, RepositoryDocument document, String authorityNameString,
IOutputAddActivity activities) throws ManifoldCFException, ServiceInterruption {
-
+ public int addOrReplaceDocumentWithException(String documentURI,
VersionContext pipelineDescription, RepositoryDocument document, String
authorityNameString, IOutputAddActivity activities)
+ throws ManifoldCFException, ServiceInterruption, IOException {
+ String outputDescription = pipelineDescription.getVersionString();
try {
HDFSOutputSpecs specs = new HDFSOutputSpecs(outputDescription);
@@ -391,26 +391,6 @@ public class HDFSOutputConnector extends
outputResource(VIEW_CONFIGURATION_HTML, out, locale,
getConfigParameters(parameters), null, null, null);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
/** Output the specification header section.
* This method is called in the head section of a job page which has selected
a pipeline connection of the current type. Its purpose is to add the required
tabs
* to the list, and to output any javascript methods that might be needed by
the job editing HTML.
Modified:
manifoldcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java
(original)
+++
manifoldcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java
Sat Aug 30 12:28:25 2014
@@ -168,24 +168,4 @@ public class NullConnector extends org.a
activities.recordActivity(null,JOB_COMPLETE_ACTIVITY,null,"","OK",null);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
}
Modified:
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
(original)
+++
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
Sat Aug 30 12:28:25 2014
@@ -37,6 +37,7 @@ import org.apache.http.protocol.HttpRequ
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.IOutputCheckActivity;
import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
import org.apache.manifoldcf.agents.output.BaseOutputConnector;
@@ -260,31 +261,6 @@ public class OpenSearchServerConnector e
}
/**
- * Obtain the name of the form check javascript method to call.
- *
- * @param connectionSequenceNumber is the unique number of this connection
within the job.
- * @return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s" + connectionSequenceNumber + "_checkSpecification";
- }
-
- /**
- * Obtain the name of the form presave check javascript method to call.
- *
- * @param connectionSequenceNumber is the unique number of this connection
within the job.
- * @return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(
- int connectionSequenceNumber)
- {
- return "s" + connectionSequenceNumber + "_checkSpecificationForSave";
- }
-
- /**
* Output the specification header section. This method is called in the head
* section of a job page which has selected a pipeline connection of the
* current type. Its purpose is to add the required tabs to the list, and to
@@ -431,29 +407,21 @@ public class OpenSearchServerConnector e
}
@Override
- public boolean checkLengthIndexable(String outputDescription, long length)
+ public boolean checkLengthIndexable(VersionContext outputDescription, long
length, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
- OpenSearchServerSpecs specs = getSpecsCache(outputDescription);
+ OpenSearchServerSpecs specs =
getSpecsCache(outputDescription.getVersionString());
long maxFileSize = specs.getMaxFileSize();
if (length > maxFileSize)
return false;
- return super.checkLengthIndexable(outputDescription, length);
- }
-
- @Override
- public boolean checkDocumentIndexable(String outputDescription, File
localFile)
- throws ManifoldCFException, ServiceInterruption
- {
return true;
}
@Override
- public boolean checkMimeTypeIndexable(String outputDescription,
- String mimeType)
+ public boolean checkMimeTypeIndexable(VersionContext outputDescription,
String mimeType, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
- OpenSearchServerSpecs specs = getSpecsCache(outputDescription);
+ OpenSearchServerSpecs specs =
getSpecsCache(outputDescription.getVersionString());
return specs.checkMimeType(mimeType);
}
@@ -469,10 +437,10 @@ public class OpenSearchServerConnector e
* @return true if the file is indexable.
*/
@Override
- public boolean checkURLIndexable(String outputDescription, String url)
+ public boolean checkURLIndexable(VersionContext outputDescription, String
url, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
- OpenSearchServerSpecs specs = getSpecsCache(outputDescription);
+ OpenSearchServerSpecs specs =
getSpecsCache(outputDescription.getVersionString());
return specs.checkExtension(FilenameUtils.getExtension(url));
}
@@ -550,11 +518,24 @@ public class OpenSearchServerConnector e
}
}
+ /** Add (or replace) a document in the output data store using the connector.
+ * This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
+ * necessary.
+ *@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
+ * and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
+ *@param document is the document data to be processed (handed to the output
data store).
+ *@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
+ *@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
+ * or sending a modified document to the next stage in the pipeline.
+ *@return the document status (accepted or permanently rejected).
+ *@throws IOException only if there's a stream error reading the document
data.
+ */
@Override
- public int addOrReplaceDocument(String documentURI, String outputDescription,
+ public int addOrReplaceDocumentWithException(String documentURI,
VersionContext pipelineDescription,
RepositoryDocument document, String authorityNameString,
IOutputAddActivity activities)
- throws ManifoldCFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption, IOException
{
HttpClient client = getSession();
OpenSearchServerConfig config = getConfigParameters(null);
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=1621449&r1=1621448&r2=1621449&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
Sat Aug 30 12:28:25 2014
@@ -31,6 +31,7 @@ import java.util.HashSet;
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.IOutputCheckActivity;
import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
import org.apache.manifoldcf.core.interfaces.Specification;
@@ -516,7 +517,7 @@ public class SolrConnector extends org.a
*@return true if the mime type is indexable by this connector.
*/
@Override
- public boolean checkMimeTypeIndexable(String outputDescription, String
mimeType)
+ public boolean checkMimeTypeIndexable(VersionContext outputDescription,
String mimeType, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
getSession();
@@ -526,7 +527,7 @@ public class SolrConnector extends org.a
return false;
if (excludedMimeTypes != null && excludedMimeTypes.get(mimeType) != null)
return false;
- return super.checkMimeTypeIndexable(outputDescription,mimeType);
+ return true;
}
return acceptableMimeTypes.contains(mimeType.toLowerCase(Locale.ROOT));
}
@@ -538,34 +539,33 @@ public class SolrConnector extends org.a
*@return true if the file is indexable.
*/
@Override
- public boolean checkLengthIndexable(String outputDescription, long length)
+ public boolean checkLengthIndexable(VersionContext outputDescription, long
length, IOutputCheckActivity activities)
throws ManifoldCFException, ServiceInterruption
{
getSession();
if (maxDocumentLength != null && length > maxDocumentLength.longValue())
return false;
- return super.checkLengthIndexable(outputDescription,length);
+ return true;
}
/** Add (or replace) a document in the output data store using the connector.
* This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
* necessary.
- * The OutputSpecification is *not* provided to this method, because the goal
is consistency, and if output is done it must be consistent with the
- * output description, since that was what was partly used to determine if
output should be taking place. So it may be necessary for this method to decode
- * an output description string in order to determine what should be done.
*@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
* and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
- *@param outputDescription is the description string that was constructed for
this document by the getOutputDescription() method.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
*@param document is the document data to be processed (handed to the output
data store).
*@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
- *@param activities is the handle to an object that the implementer of an
output connector may use to perform operations, such as logging processing
activity.
+ *@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
+ * or sending a modified document to the next stage in the pipeline.
*@return the document status (accepted or permanently rejected).
+ *@throws IOException only if there's a stream error reading the document
data.
*/
@Override
- public int addOrReplaceDocument(String documentURI, String
outputDescription, RepositoryDocument document, String authorityNameString,
IOutputAddActivity activities)
- throws ManifoldCFException, ServiceInterruption
+ public int addOrReplaceDocumentWithException(String documentURI,
VersionContext pipelineDescription, RepositoryDocument document, String
authorityNameString, IOutputAddActivity activities)
+ throws ManifoldCFException, ServiceInterruption, IOException
{
- SpecPacker sp = new SpecPacker(outputDescription);
+ SpecPacker sp = new SpecPacker(pipelineDescription.getVersionString());
// Establish a session
getSession();
@@ -2177,26 +2177,6 @@ public class SolrConnector extends org.a
);
}
- /** Obtain the name of the form check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form check javascript method.
- */
- @Override
- public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecification";
- }
-
- /** Obtain the name of the form presave check javascript method to call.
- *@param connectionSequenceNumber is the unique number of this connection
within the job.
- *@return the name of the form presave check javascript method.
- */
- @Override
- public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
- {
- return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
- }
-
/** Output the specification header section.
* This method is called in the head section of a job page which has selected
a pipeline connection of the current type. Its purpose is to add the required
tabs
* to the list, and to output any javascript methods that might be needed by
the job editing HTML.
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java
(original)
+++
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java
Sat Aug 30 12:28:25 2014
@@ -101,12 +101,9 @@ public interface IPipelineConnector exte
/** Add (or replace) a document in the output data store using the connector.
* This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
* necessary.
- * The OutputSpecification is *not* provided to this method, because the goal
is consistency, and if output is done it must be consistent with the
- * output description, since that was what was partly used to determine if
output should be taking place. So it may be necessary for this method to decode
- * an output description string in order to determine what should be done.
*@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
* and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
- *@param outputDescription is the description string that was constructed for
this document by the getOutputDescription() method.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
*@param document is the document data to be processed (handed to the output
data store).
*@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
*@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java
(original)
+++
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java
Sat Aug 30 12:28:25 2014
@@ -263,117 +263,6 @@ public class RepositoryDocument
return null;
}
- /** Set the document's "file" allow acls.
- *@param acl is the allowed "file" access control token list for the document.
- */
- @Deprecated
- public void setACL(String[] acl)
- {
- setSecurityACL(SECURITY_TYPE_DOCUMENT,acl);
- }
-
- /** Get the document's "file" allow acl, if any.
- *@return the allow access control token list for the document.
- */
- @Deprecated
- public String[] getACL()
- {
- return getSecurityACL(SECURITY_TYPE_DOCUMENT);
- }
-
- /** Set the document's "file" deny acl.
- *@param acl is the "file" denied access control token list for the document.
- */
- @Deprecated
- public void setDenyACL(String[] acl)
- {
- setSecurityDenyACL(SECURITY_TYPE_DOCUMENT,acl);
- }
-
- /** Get the document's deny acl, if any.
- *@return the deny access control token list for the document.
- */
- @Deprecated
- public String[] getDenyACL()
- {
- return getSecurityDenyACL(SECURITY_TYPE_DOCUMENT);
- }
-
- /** Set document's "share" acl. */
- @Deprecated
- public void setShareACL(String[] acl)
- {
- setSecurityACL(SECURITY_TYPE_SHARE,acl);
- }
-
- /** Get document's "share" acl. */
- @Deprecated
- public String[] getShareACL()
- {
- return getSecurityACL(SECURITY_TYPE_SHARE);
- }
-
- /** Set document's "share" deny acl. */
- @Deprecated
- public void setShareDenyACL(String[] acl)
- {
- setSecurityDenyACL(SECURITY_TYPE_SHARE,acl);
- }
-
- /** Get document's "share" deny acl. */
- @Deprecated
- public String[] getShareDenyACL()
- {
- return getSecurityDenyACL(SECURITY_TYPE_SHARE);
- }
-
- int directoryLevel = 0;
-
- /** Clear all directory acls. */
- @Deprecated
- public void clearDirectoryACLs()
- {
- Iterator<String> securityIterator = securityLevels.keySet().iterator();
- while (securityIterator.hasNext())
- {
- if (securityIterator.next().startsWith(SECURITY_TYPE_DIRECTORY_LEVEL))
- securityIterator.remove();
- }
- directoryLevel = 0;
- }
-
- /** Get a count of directory security entries. */
- @Deprecated
- public int countDirectoryACLs()
- {
- return directoryLevel;
- }
-
- /** Add directory security entry */
- @Deprecated
- public void addDirectoryACLs(String[] allowACL, String[] denyACL)
- {
- if (allowACL != null && denyACL != null)
- {
- setSecurity(SECURITY_TYPE_DIRECTORY_LEVEL +
directoryLevel,allowACL,denyACL);
- }
- directoryLevel++;
- }
-
- /** Get directory security access acl */
- @Deprecated
- public String[] getDirectoryACL(int index)
- {
- return getSecurityACL(SECURITY_TYPE_DIRECTORY_LEVEL + index);
- }
-
- /** Get directory security deny acl */
- @Deprecated
- public String[] getDirectoryDenyACL(int index)
- {
- return getSecurityDenyACL(SECURITY_TYPE_DIRECTORY_LEVEL + index);
- }
-
/** Set the binary field.
*@param binaryFieldData is the input stream containing binary data.
*/
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java?rev=1621449&r1=1621448&r2=1621449&view=diff
==============================================================================
---
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
(original)
+++
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
Sat Aug 30 12:28:25 2014
@@ -92,29 +92,6 @@ public abstract class BaseOutputConnecto
public boolean checkMimeTypeIndexable(VersionContext pipelineDescription,
String mimeType, IOutputCheckActivity checkActivity)
throws ManifoldCFException, ServiceInterruption
{
- return checkMimeTypeIndexable(pipelineDescription.getVersionString(),
mimeType);
- }
-
- /** Detect if a mime type is indexable or not. This method is used by
participating repository connectors to pre-filter the number of
- * unusable documents that will be passed to this output connector.
- *@param outputDescription is the document's output version.
- *@param mimeType is the mime type of the document.
- *@return true if the mime type is indexable by this connector.
- */
- public boolean checkMimeTypeIndexable(String outputDescription, String
mimeType)
- throws ManifoldCFException, ServiceInterruption
- {
- return checkMimeTypeIndexable(mimeType);
- }
-
- /** Detect if a mime type is indexable or not. This method is used by
participating repository connectors to pre-filter the number of
- * unusable documents that will be passed to this output connector.
- *@param mimeType is the mime type of the document.
- *@return true if the mime type is indexable by this connector.
- */
- public boolean checkMimeTypeIndexable(String mimeType)
- throws ManifoldCFException, ServiceInterruption
- {
return true;
}
@@ -130,31 +107,6 @@ public abstract class BaseOutputConnecto
public boolean checkDocumentIndexable(VersionContext pipelineDescription,
File localFile, IOutputCheckActivity checkActivity)
throws ManifoldCFException, ServiceInterruption
{
- return checkDocumentIndexable(pipelineDescription.getVersionString(),
localFile);
- }
-
- /** Pre-determine whether a document (passed here as a File object) is
indexable by this connector. This method is used by participating
- * repository connectors to help reduce the number of unmanageable documents
that are passed to this output connector in advance of an
- * actual transfer. This hook is provided mainly to support search engines
that only handle a small set of accepted file types.
- *@param outputDescription is the document's output version.
- *@param localFile is the local file to check.
- *@return true if the file is indexable.
- */
- public boolean checkDocumentIndexable(String outputDescription, File
localFile)
- throws ManifoldCFException, ServiceInterruption
- {
- return checkDocumentIndexable(localFile);
- }
-
- /** Pre-determine whether a document (passed here as a File object) is
indexable by this connector. This method is used by participating
- * repository connectors to help reduce the number of unmanageable documents
that are passed to this output connector in advance of an
- * actual transfer. This hook is provided mainly to support search engines
that only handle a small set of accepted file types.
- *@param localFile is the local file to check.
- *@return true if the file is indexable.
- */
- public boolean checkDocumentIndexable(File localFile)
- throws ManifoldCFException, ServiceInterruption
- {
return true;
}
@@ -169,18 +121,6 @@ public abstract class BaseOutputConnecto
public boolean checkLengthIndexable(VersionContext pipelineDescription, long
length, IOutputCheckActivity checkActivity)
throws ManifoldCFException, ServiceInterruption
{
- return checkLengthIndexable(pipelineDescription.getVersionString(),
length);
- }
-
- /** Pre-determine whether a document's length is indexable by this
connector. This method is used by participating repository connectors
- * to help filter out documents that are too long to be indexable.
- *@param outputDescription is the document's output version.
- *@param length is the length of the document.
- *@return true if the file is indexable.
- */
- public boolean checkLengthIndexable(String outputDescription, long length)
- throws ManifoldCFException, ServiceInterruption
- {
return true;
}
@@ -195,18 +135,6 @@ public abstract class BaseOutputConnecto
public boolean checkURLIndexable(VersionContext pipelineDescription, String
url, IOutputCheckActivity checkActivity)
throws ManifoldCFException, ServiceInterruption
{
- return checkURLIndexable(pipelineDescription.getVersionString(), url);
- }
-
- /** Pre-determine whether a document's URL is indexable by this connector.
This method is used by participating repository connectors
- * to help filter out documents that are not worth indexing.
- *@param outputDescription is the document's output version.
- *@param url is the URL of the document.
- *@return true if the file is indexable.
- */
- public boolean checkURLIndexable(String outputDescription, String url)
- throws ManifoldCFException, ServiceInterruption
- {
return true;
}
@@ -225,36 +153,15 @@ public abstract class BaseOutputConnecto
public VersionContext getPipelineDescription(Specification spec)
throws ManifoldCFException, ServiceInterruption
{
- return new
VersionContext(getOutputDescription((OutputSpecification)spec),params,spec);
+ return new VersionContext("",params,spec);
}
-
- /** Get an output version string, given an output specification. The output
version string is used to uniquely describe the pertinent details of
- * the output specification and the configuration, to allow the Connector
Framework to determine whether a document will need to be output again.
- * Note that the contents of the document cannot be considered by this
method, and that a different version string (defined in IRepositoryConnector)
- * is used to describe the version of the actual document.
- *
- * This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
- * necessary.
- *@param spec is the current output specification for the job that is doing
the crawling.
- *@return a string, of unlimited length, which uniquely describes output
configuration and specification in such a way that if two such strings are
equal,
- * the document will not need to be sent again to the output data store.
- */
- public String getOutputDescription(OutputSpecification spec)
- throws ManifoldCFException, ServiceInterruption
- {
- // Empty string from the base class.
- return "";
- }
-
+
/** Add (or replace) a document in the output data store using the connector.
* This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
* necessary.
- * The OutputSpecification is *not* provided to this method, because the goal
is consistency, and if output is done it must be consistent with the
- * output description, since that was what was partly used to determine if
output should be taking place. So it may be necessary for this method to decode
- * an output description string in order to determine what should be done.
*@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
* and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
- *@param outputDescription is the description string that was constructed for
this document by the getOutputDescription() method.
+ *@param pipelineDescription includes the description string that was
constructed for this document by the getOutputDescription() method.
*@param document is the document data to be processed (handed to the output
data store).
*@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
*@param activities is the handle to an object that the implementer of a
pipeline connector may use to perform operations, such as logging processing
activity,
@@ -266,26 +173,6 @@ public abstract class BaseOutputConnecto
public int addOrReplaceDocumentWithException(String documentURI,
VersionContext pipelineDescription, RepositoryDocument document, String
authorityNameString, IOutputAddActivity activities)
throws ManifoldCFException, ServiceInterruption, IOException
{
- return addOrReplaceDocument(documentURI,
pipelineDescription.getVersionString(), document, authorityNameString,
activities);
- }
-
- /** Add (or replace) a document in the output data store using the connector.
- * This method presumes that the connector object has been configured, and it
is thus able to communicate with the output data store should that be
- * necessary.
- * The OutputSpecification is *not* provided to this method, because the goal
is consistency, and if output is done it must be consistent with the
- * output description, since that was what was partly used to determine if
output should be taking place. So it may be necessary for this method to decode
- * an output description string in order to determine what should be done.
- *@param documentURI is the URI of the document. The URI is presumed to be
the unique identifier which the output data store will use to process
- * and serve the document. This URI is constructed by the repository
connector which fetches the document, and is thus universal across all output
connectors.
- *@param outputDescription is the description string that was constructed for
this document by the getOutputDescription() method.
- *@param document is the document data to be processed (handed to the output
data store).
- *@param authorityNameString is the name of the authority responsible for
authorizing any access tokens passed in with the repository document. May be
null.
- *@param activities is the handle to an object that the implementer of an
output connector may use to perform operations, such as logging processing
activity.
- *@return the document status (accepted or permanently rejected).
- */
- public int addOrReplaceDocument(String documentURI, String
outputDescription, RepositoryDocument document, String authorityNameString,
IOutputAddActivity activities)
- throws ManifoldCFException, ServiceInterruption
- {
return DOCUMENTSTATUS_REJECTED;
}
@@ -307,6 +194,7 @@ public abstract class BaseOutputConnecto
* This method allows the connector to remove any internal data storage that
is associated with records sent to the index on
* behalf of a connection. It should not attempt to communicate with the
output index.
*/
+ @Override
public void noteAllRecordsRemoved()
throws ManifoldCFException
{
@@ -328,7 +216,7 @@ public abstract class BaseOutputConnecto
@Override
public String getFormCheckJavascriptMethodName(int connectionSequenceNumber)
{
- return "checkOutputSpecification";
+ return "s"+connectionSequenceNumber+"_checkSpecification";
}
/** Obtain the name of the form presave check javascript method to call.
@@ -338,7 +226,7 @@ public abstract class BaseOutputConnecto
@Override
public String getFormPresaveCheckJavascriptMethodName(int
connectionSequenceNumber)
{
- return "checkOutputSpecificationForSave";
+ return "s"+connectionSequenceNumber+"_checkSpecificationForSave";
}
/** Output the specification header section.
@@ -355,47 +243,8 @@ public abstract class BaseOutputConnecto
int connectionSequenceNumber, List<String> tabsArray)
throws ManifoldCFException, IOException
{
- outputSpecificationHeader(out,locale,(OutputSpecification)os,tabsArray);
}
- /** Output the specification header section.
- * This method is called in the head section of a job page which has selected
an output connection of the current type. Its purpose is to add the required
tabs
- * to the list, and to output any javascript methods that might be needed by
the job editing HTML.
- *@param out is the output to which any HTML should be sent.
- *@param locale is the preferred local of the output.
- *@param os is the current output specification for this job.
- *@param tabsArray is an array of tab names. Add to this array any tab names
that are specific to the connector.
- */
- public void outputSpecificationHeader(IHTTPOutput out, Locale locale,
OutputSpecification os, List<String> tabsArray)
- throws ManifoldCFException, IOException
- {
- outputSpecificationHeader(out,os,tabsArray);
- }
-
- /** Output the specification header section.
- * This method is called in the head section of a job page which has selected
an output connection of the current type. Its purpose is to add the required
tabs
- * to the list, and to output any javascript methods that might be needed by
the job editing HTML.
- *@param out is the output to which any HTML should be sent.
- *@param os is the current output specification for this job.
- *@param tabsArray is an array of tab names. Add to this array any tab names
that are specific to the connector.
- */
- public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification
os, List<String> tabsArray)
- throws ManifoldCFException, IOException
- {
- // Call the old method signature, for backwards compatibility
- ArrayList<Object> localTabsArray = new ArrayList<Object>();
- outputSpecificationHeader(out,os,localTabsArray);
- for (Object o : localTabsArray)
- {
- tabsArray.add((String)o);
- }
- }
-
- public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification
os, ArrayList<Object> tabsArray)
- throws ManifoldCFException, IOException
- {
- }
-
/** Output the specification body section.
* This method is called in the body section of a job page which has selected
an output connection of the current type. Its purpose is to present the
required form elements for editing.
* The coder can presume that the HTML that is output from this configuration
will be within appropriate <html>, <body>, and <form> tags. The name of the
@@ -412,35 +261,6 @@ public abstract class BaseOutputConnecto
int connectionSequenceNumber, int actualSequenceNumber, String tabName)
throws ManifoldCFException, IOException
{
- outputSpecificationBody(out,locale,(OutputSpecification)os,tabName);
- }
-
- /** Output the specification body section.
- * This method is called in the body section of a job page which has selected
an output connection of the current type. Its purpose is to present the
required form elements for editing.
- * The coder can presume that the HTML that is output from this configuration
will be within appropriate <html>, <body>, and <form> tags. The name of the
- * form is "editjob".
- *@param out is the output to which any HTML should be sent.
- *@param locale is the preferred local of the output.
- *@param os is the current output specification for this job.
- *@param tabName is the current tab name.
- */
- public void outputSpecificationBody(IHTTPOutput out, Locale locale,
OutputSpecification os, String tabName)
- throws ManifoldCFException, IOException
- {
- outputSpecificationBody(out,os,tabName);
- }
-
- /** Output the specification body section.
- * This method is called in the body section of a job page which has selected
an output connection of the current type. Its purpose is to present the
required form elements for editing.
- * The coder can presume that the HTML that is output from this configuration
will be within appropriate <html>, <body>, and <form> tags. The name of the
- * form is "editjob".
- *@param out is the output to which any HTML should be sent.
- *@param os is the current output specification for this job.
- *@param tabName is the current tab name.
- */
- public void outputSpecificationBody(IHTTPOutput out, OutputSpecification os,
String tabName)
- throws ManifoldCFException, IOException
- {
}
/** Process a specification post.
@@ -458,35 +278,6 @@ public abstract class BaseOutputConnecto
int connectionSequenceNumber)
throws ManifoldCFException
{
- return
processSpecificationPost(variableContext,locale,(OutputSpecification)os);
- }
-
- /** Process a specification post.
- * This method is called at the start of job's edit or view page, whenever
there is a possibility that form data for a connection has been
- * posted. Its purpose is to gather form information and modify the output
specification accordingly.
- * The name of the posted form is "editjob".
- *@param variableContext contains the post data, including binary file-upload
information.
- *@param locale is the preferred local of the output.
- *@param os is the current output specification for this job.
- *@return null if all is well, or a string error message if there is an error
that should prevent saving of the job (and cause a redirection to an error
page).
- */
- public String processSpecificationPost(IPostParameters variableContext,
Locale locale, OutputSpecification os)
- throws ManifoldCFException
- {
- return processSpecificationPost(variableContext,os);
- }
-
- /** Process a specification post.
- * This method is called at the start of job's edit or view page, whenever
there is a possibility that form data for a connection has been
- * posted. Its purpose is to gather form information and modify the output
specification accordingly.
- * The name of the posted form is "editjob".
- *@param variableContext contains the post data, including binary file-upload
information.
- *@param os is the current output specification for this job.
- *@return null if all is well, or a string error message if there is an error
that should prevent saving of the job (and cause a redirection to an error
page).
- */
- public String processSpecificationPost(IPostParameters variableContext,
OutputSpecification os)
- throws ManifoldCFException
- {
return null;
}
@@ -503,33 +294,8 @@ public abstract class BaseOutputConnecto
int connectionSequenceNumber)
throws ManifoldCFException, IOException
{
- viewSpecification(out,locale,(OutputSpecification)os);
}
- /** View specification.
- * This method is called in the body section of a job's view page. Its
purpose is to present the output specification information to the user.
- * The coder can presume that the HTML that is output from this configuration
will be within appropriate <html> and <body> tags.
- *@param out is the output to which any HTML should be sent.
- *@param locale is the preferred local of the output.
- *@param os is the current output specification for this job.
- */
- public void viewSpecification(IHTTPOutput out, Locale locale,
OutputSpecification os)
- throws ManifoldCFException, IOException
- {
- viewSpecification(out,os);
- }
-
- /** View specification.
- * This method is called in the body section of a job's view page. Its
purpose is to present the output specification information to the user.
- * The coder can presume that the HTML that is output from this configuration
will be within appropriate <html> and <body> tags.
- *@param out is the output to which any HTML should be sent.
- *@param os is the current output specification for this job.
- */
- public void viewSpecification(IHTTPOutput out, OutputSpecification os)
- throws ManifoldCFException, IOException
- {
- }
-
}
