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 2010/10/04 16:32:28 UTC
svn commit: r1004255 [10/24] - in /incubator/lcf/trunk:
modules/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/
modules/connectors/documentum/connector/src/main/java/org/apache/manifoldc...
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStream.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStream.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStream.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStream.java Mon Oct 4 14:32:19 2010
@@ -47,7 +47,7 @@ public class XMLStream
/** Constructor. This does NOT actually execute the parse yet, because we need the object before that makes any sense.
*/
public XMLStream(boolean laxChecking)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -68,49 +68,49 @@ public class XMLStream
catch (SAXException e)
{
Exception e2 = e.getException();
- if (e2 != null && e2 instanceof ACFException)
- throw (ACFException)e2;
- throw new ACFException("Error setting up parser: "+e.getMessage(),e);
+ if (e2 != null && e2 instanceof ManifoldCFException)
+ throw (ManifoldCFException)e2;
+ throw new ManifoldCFException("Error setting up parser: "+e.getMessage(),e);
}
}
/** Default constructor */
public XMLStream()
- throws ACFException
+ throws ManifoldCFException
{
this(true);
}
public void parse(InputStream xmlInputStream)
- throws ACFException, ServiceInterruption, IOException
+ throws ManifoldCFException, ServiceInterruption, IOException
{
try
{
InputSource is = new InputSource(xmlInputStream);
xr.parse(is);
if (parseException != null)
- throw new ACFException("XML parse error: "+parseException.getMessage(),parseException);
+ throw new ManifoldCFException("XML parse error: "+parseException.getMessage(),parseException);
}
catch (SAXException e)
{
Exception e2 = e.getException();
- if (e2 != null && e2 instanceof ACFException)
- throw (ACFException)e2;
+ if (e2 != null && e2 instanceof ManifoldCFException)
+ throw (ManifoldCFException)e2;
if (e2 != null && e2 instanceof ServiceInterruption)
throw (ServiceInterruption)e2;
- throw new ACFException("Error setting up parser: "+e.getMessage(),e);
+ throw new ManifoldCFException("Error setting up parser: "+e.getMessage(),e);
}
catch (RuntimeException e)
{
// Xerces is unfortunately not constructed in such a way that it doesn't occasionally completely barf on a malformed file.
// So, we catch runtime exceptions and treat them as parse errors.
- throw new ACFException("XML parse error: "+e.getMessage(),e);
+ throw new ManifoldCFException("XML parse error: "+e.getMessage(),e);
}
}
/** Call this method to clean up completely after a parse attempt, whether successful or failure. */
public void cleanup()
- throws ACFException
+ throws ManifoldCFException
{
// This sets currentContext == null as a side effect, unless an error occurs during cleanup!!
currentContext.cleanup();
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStringContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStringContext.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStringContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStringContext.java Mon Oct 4 14:32:19 2010
@@ -53,7 +53,7 @@ public class XMLStringContext extends XM
/** This method is meant to be extended by classes that extend this class */
protected void tagContents(char[] ch, int start, int length)
- throws ACFException
+ throws ManifoldCFException
{
// Append the characters to the buffer
value.append(ch,start,length);
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLWriterContext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLWriterContext.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLWriterContext.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLWriterContext.java Mon Oct 4 14:32:19 2010
@@ -41,7 +41,7 @@ public class XMLWriterContext extends XM
/** Full constructor. Used for individual tags. */
public XMLWriterContext(XMLStream theStream, String namespaceURI, String localname, String qname, Attributes theseAttributes, Writer writer)
- throws ACFException
+ throws ManifoldCFException
{
super(theStream,namespaceURI,localname,qname,theseAttributes);
theWriter = writer;
@@ -49,7 +49,7 @@ public class XMLWriterContext extends XM
/** Flush the data to the underlying output stream */
public void flush()
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -58,21 +58,21 @@ public class XMLWriterContext extends XM
}
catch (java.net.SocketTimeoutException e)
{
- throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
- throw new ACFException("IO exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
}
}
/** This method is meant to be extended by classes that extend this class */
protected void tagContents(char[] ch, int start, int length)
- throws ACFException
+ throws ManifoldCFException
{
try
{
@@ -80,15 +80,15 @@ public class XMLWriterContext extends XM
}
catch (java.net.SocketTimeoutException e)
{
- throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
- throw new ACFException("IO exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
}
}
@@ -96,7 +96,7 @@ public class XMLWriterContext extends XM
* The XMLWriterContext accepts all subtags in their text form.
*/
protected XMLContext beginTag(String namespaceURI, String localName, String qName, Attributes atts)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// First, write out the tag text. We strip off the namespace.
try
@@ -117,15 +117,15 @@ public class XMLWriterContext extends XM
}
catch (java.net.SocketTimeoutException e)
{
- throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
- throw new ACFException("IO exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
}
// Now, start a new context which is also a writer context.
super.beginTag(namespaceURI,localName,qName,atts);
@@ -136,7 +136,7 @@ public class XMLWriterContext extends XM
* The XMLWriterContext accepts all subtags in their text form.
*/
protected void endTag()
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// First, write out the tag text. We strip off the namespace.
try
@@ -148,15 +148,15 @@ public class XMLWriterContext extends XM
}
catch (java.net.SocketTimeoutException e)
{
- throw new ACFException("Socket timeout exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
}
catch (InterruptedIOException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
catch (IOException e)
{
- throw new ACFException("IO exception: "+e.getMessage(),e);
+ throw new ManifoldCFException("IO exception: "+e.getMessage(),e);
}
super.endTag();
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Mon Oct 4 14:32:19 2010
@@ -21,7 +21,7 @@ package org.apache.manifoldcf.agents.inc
import org.apache.manifoldcf.core.interfaces.*;
import org.apache.manifoldcf.agents.interfaces.*;
import org.apache.manifoldcf.agents.system.Logging;
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
import java.util.*;
import java.io.*;
@@ -64,7 +64,7 @@ public class IncrementalIngester extends
/** Constructor.
*/
public IncrementalIngester(IThreadContext threadContext, IDBInterface database)
- throws ACFException
+ throws ManifoldCFException
{
super(database,"ingeststatus");
this.threadContext = threadContext;
@@ -75,7 +75,7 @@ public class IncrementalIngester extends
/** Install the incremental ingestion manager.
*/
public void install()
- throws ACFException
+ throws ManifoldCFException
{
String outputConnectionTableName = connectionManager.getTableName();
String outputConnectionNameField = connectionManager.getConnectionNameColumn();
@@ -146,16 +146,16 @@ public class IncrementalIngester extends
*@return the time, in minutes.
*/
public int getAnalyzeTime()
- throws ACFException
+ throws ManifoldCFException
{
// For this table, we base the wait time on the number of rows in it.
IResultSet set = performQuery("SELECT COUNT("+idField+") FROM "+getTableName(),null,null,null);
if (set.getRowCount() < 1)
- throw new ACFException("Expected result with one row");
+ throw new ManifoldCFException("Expected result with one row");
IResultRow row = set.getRow(0);
Iterator columnNames = row.getColumns();
if (!columnNames.hasNext())
- throw new ACFException("Expected result with one column");
+ throw new ManifoldCFException("Expected result with one column");
String columnName = (String)columnNames.next();
long value = new Long(row.getValue(columnName).toString()).longValue();
if (value < 10000L)
@@ -170,7 +170,7 @@ public class IncrementalIngester extends
/** Analyze database tables.
*/
public void analyzeTables()
- throws ACFException
+ throws ManifoldCFException
{
analyzeTable();
}
@@ -178,7 +178,7 @@ public class IncrementalIngester extends
/** Uninstall the incremental ingestion manager.
*/
public void deinstall()
- throws ACFException
+ throws ManifoldCFException
{
performDrop(null);
}
@@ -186,7 +186,7 @@ public class IncrementalIngester extends
/** Flush all knowledge of what was ingested before.
*/
public void clearAll()
- throws ACFException
+ throws ManifoldCFException
{
performDelete("",null,null);
}
@@ -197,7 +197,7 @@ public class IncrementalIngester extends
*@return true if the mimeType is indexable.
*/
public boolean checkMimeTypeIndexable(String outputConnectionName, String mimeType)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnection connection = connectionManager.load(outputConnectionName);
IOutputConnector connector = OutputConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
@@ -220,7 +220,7 @@ public class IncrementalIngester extends
*@return true if the local file is indexable.
*/
public boolean checkDocumentIndexable(String outputConnectionName, File localFile)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnection connection = connectionManager.load(outputConnectionName);
IOutputConnector connector = OutputConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
@@ -251,7 +251,7 @@ public class IncrementalIngester extends
String identifierClass, String identifierHash,
String documentVersion,
long recordTime, IOutputActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnection connection = connectionManager.load(outputConnectionName);
@@ -290,7 +290,7 @@ public class IncrementalIngester extends
RepositoryDocument data,
long ingestTime, String documentURI,
IOutputActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnection connection = connectionManager.load(outputConnectionName);
@@ -312,14 +312,14 @@ public class IncrementalIngester extends
RepositoryDocument data,
long ingestTime, String documentURI,
IOutputActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// No transactions; not safe because post may take too much time
// First, calculate a document uri hash value
String documentURIHash = null;
if (documentURI != null)
- documentURIHash = ACF.hash(documentURI);
+ documentURIHash = ManifoldCF.hash(documentURI);
// See what uri was used before for this doc, if any
ArrayList list = new ArrayList();
@@ -432,7 +432,7 @@ public class IncrementalIngester extends
public void documentCheckMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes,
long checkTime)
- throws ACFException
+ throws ManifoldCFException
{
beginTransaction();
try
@@ -500,7 +500,7 @@ public class IncrementalIngester extends
if (j > 0)
updateRowIds(list,sb.toString(),checkTime);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -526,7 +526,7 @@ public class IncrementalIngester extends
public void documentCheck(String outputConnectionName,
String identifierClass, String identifierHash,
long checkTime)
- throws ACFException
+ throws ManifoldCFException
{
documentCheckMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash},checkTime);
}
@@ -534,7 +534,7 @@ public class IncrementalIngester extends
/** Update a chunk of row ids.
*/
protected void updateRowIds(ArrayList list, String queryPart, long checkTime)
- throws ACFException
+ throws ManifoldCFException
{
HashMap map = new HashMap();
map.put(lastIngestField,new Long(checkTime));
@@ -550,7 +550,7 @@ public class IncrementalIngester extends
public void documentDeleteMultiple(String[] outputConnectionNames,
String[] identifierClasses, String[] identifierHashes,
IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
// Segregate request by connection names
HashMap keyMap = new HashMap();
@@ -597,7 +597,7 @@ public class IncrementalIngester extends
public void documentDeleteMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes,
IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnection connection = connectionManager.load(outputConnectionName);
@@ -677,7 +677,7 @@ public class IncrementalIngester extends
while (j < validURIArray.length)
{
String docDBString = validURIArray[j++];
- String docDBHashString = ACF.hash(docDBString);
+ String docDBHashString = ManifoldCF.hash(docDBString);
docURIValues.put(docDBString,docDBString);
docURIHashValues.put(docDBHashString,docDBHashString);
}
@@ -797,7 +797,7 @@ public class IncrementalIngester extends
deleteRowIds(list,sb.toString());
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -823,7 +823,7 @@ public class IncrementalIngester extends
*/
protected void findRowIdsForURIs(String outputConnectionName, HashMap rowIDSet, HashMap uris, ArrayList hashParamValues,
String paramList)
- throws ACFException
+ throws ManifoldCFException
{
hashParamValues.add(outputConnectionName);
IResultSet set = performQuery("SELECT "+idField+","+docURIField+" FROM "+
@@ -849,7 +849,7 @@ public class IncrementalIngester extends
*/
protected void findRowIdsForDocIds(String outputConnectionName, HashMap rowIDSet, ArrayList paramValues,
String paramList)
- throws ACFException
+ throws ManifoldCFException
{
paramValues.add(outputConnectionName);
IResultSet set = performQuery("SELECT "+idField+" FROM "+
@@ -866,7 +866,7 @@ public class IncrementalIngester extends
/** Delete a chunk of row ids.
*/
protected void deleteRowIds(ArrayList list, String queryPart)
- throws ACFException
+ throws ManifoldCFException
{
performDelete("WHERE "+idField+" IN ("+queryPart+")",list,null);
}
@@ -880,7 +880,7 @@ public class IncrementalIngester extends
public void documentDelete(String outputConnectionName,
String identifierClass, String identifierHash,
IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
documentDeleteMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash},activities);
}
@@ -891,7 +891,7 @@ public class IncrementalIngester extends
* that don't exist in the index.
*/
protected DeleteInfo[] getDocumentURIMultiple(String outputConnectionName, String[] identifierClasses, String[] identifierHashes)
- throws ACFException
+ throws ManifoldCFException
{
DeleteInfo[] rval = new DeleteInfo[identifierHashes.length];
HashMap map = new HashMap();
@@ -930,7 +930,7 @@ public class IncrementalIngester extends
getDocumentURIChunk(rval,map,outputConnectionName,sb.toString(),list);
return rval;
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -955,7 +955,7 @@ public class IncrementalIngester extends
*/
public DocumentIngestStatus[] getDocumentIngestDataMultiple(String[] outputConnectionNames,
String[] identifierClasses, String[] identifierHashes)
- throws ACFException
+ throws ManifoldCFException
{
// Segregate request by connection names
HashMap keyMap = new HashMap();
@@ -1011,7 +1011,7 @@ public class IncrementalIngester extends
*/
public DocumentIngestStatus[] getDocumentIngestDataMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes)
- throws ACFException
+ throws ManifoldCFException
{
// Build the return array
DocumentIngestStatus[] rval = new DocumentIngestStatus[identifierHashes.length];
@@ -1053,7 +1053,7 @@ public class IncrementalIngester extends
getDocumentIngestDataChunk(rval,indexMap,outputConnectionName,sb.toString(),list);
return rval;
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -1077,7 +1077,7 @@ public class IncrementalIngester extends
*/
public DocumentIngestStatus getDocumentIngestData(String outputConnectionName,
String identifierClass, String identifierHash)
- throws ACFException
+ throws ManifoldCFException
{
return getDocumentIngestDataMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash})[0];
}
@@ -1091,7 +1091,7 @@ public class IncrementalIngester extends
*/
public long getDocumentUpdateInterval(String outputConnectionName,
String identifierClass, String identifierHash)
- throws ACFException
+ throws ManifoldCFException
{
return getDocumentUpdateIntervalMultiple(outputConnectionName,new String[]{identifierClass},new String[]{identifierHash})[0];
}
@@ -1105,7 +1105,7 @@ public class IncrementalIngester extends
*/
public long[] getDocumentUpdateIntervalMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes)
- throws ACFException
+ throws ManifoldCFException
{
// Do these all at once!!
// First, create a return array
@@ -1164,7 +1164,7 @@ public class IncrementalIngester extends
*@param returnMap is a mapping from document id to rval index.
*/
protected void getIntervals(long[] rval, String outputConnectionName, ArrayList list, String queryPart, HashMap returnMap)
- throws ACFException
+ throws ManifoldCFException
{
list.add(outputConnectionName);
IResultSet set = performQuery("SELECT "+docKeyField+","+changeCountField+","+firstIngestField+","+lastIngestField+
@@ -1193,7 +1193,7 @@ public class IncrementalIngester extends
*@param outputConnectionName is the name of the output connection associated with this action.
*/
public void resetOutputConnection(String outputConnectionName)
- throws ACFException
+ throws ManifoldCFException
{
// We're not going to blow away the records, but we are going to set their versions to mean, "reindex required"
HashMap map = new HashMap();
@@ -1218,7 +1218,7 @@ public class IncrementalIngester extends
String docKey, String documentVersion,
String outputVersion, String authorityNameString,
long ingestTime, String documentURI, String documentURIHash)
- throws ACFException
+ throws ManifoldCFException
{
while (true)
{
@@ -1268,11 +1268,11 @@ public class IncrementalIngester extends
conditionallyAnalyzeInsert();
return;
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
// If this is simply a constraint violation, we just want to fall through and try the update!
- if (e.getErrorCode() != ACFException.DATABASE_TRANSACTION_ABORT)
+ if (e.getErrorCode() != ManifoldCFException.DATABASE_TRANSACTION_ABORT)
throw e;
// Otherwise, exit transaction and fall through to 'update' attempt
}
@@ -1329,7 +1329,7 @@ public class IncrementalIngester extends
// Update failed to find a matching record, so cycle back to retry the insert
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -1353,7 +1353,7 @@ public class IncrementalIngester extends
*@param list is the parameter list for the query.
*/
protected void getDocumentURIChunk(DeleteInfo[] rval, Map map, String outputConnectionName, String clause, ArrayList list)
- throws ACFException
+ throws ManifoldCFException
{
list.add(outputConnectionName);
IResultSet set = performQuery("SELECT "+docKeyField+","+docURIField+","+lastOutputVersionField+" FROM "+getTableName()+" WHERE "+
@@ -1383,7 +1383,7 @@ public class IncrementalIngester extends
*@param list is the parameter list for the query.
*/
protected void getDocumentIngestDataChunk(DocumentIngestStatus[] rval, Map map, String outputConnectionName, String clause, ArrayList list)
- throws ACFException
+ throws ManifoldCFException
{
// Get the primary records associated with this hash value
list.add(outputConnectionName);
@@ -1413,7 +1413,7 @@ public class IncrementalIngester extends
/** Add or replace document, using the specified output connection, via the standard pool.
*/
protected int addOrReplaceDocument(IOutputConnection connection, String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnector connector = OutputConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
if (connector == null)
@@ -1432,7 +1432,7 @@ public class IncrementalIngester extends
/** Remove document, using the specified output connection, via the standard pool.
*/
protected void removeDocument(IOutputConnection connection, String documentURI, String outputDescription, IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption
+ throws ManifoldCFException, ServiceInterruption
{
IOutputConnector connector = OutputConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
if (connector == null)
@@ -1457,7 +1457,7 @@ public class IncrementalIngester extends
/** Conditionally do analyze operation.
*/
protected void conditionallyAnalyzeInsert()
- throws ACFException
+ throws ManifoldCFException
{
synchronized (tracker)
{
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentFactory.java Mon Oct 4 14:32:19 2010
@@ -39,7 +39,7 @@ public class AgentFactory
*@return the agent.
*/
public static IAgent make(IThreadContext tc, String className)
- throws ACFException
+ throws ManifoldCFException
{
String agentName = agentIdentifier+className;
Object o = tc.get(agentName);
@@ -56,7 +56,7 @@ public class AgentFactory
arguments[0] = tc;
o = c.newInstance(arguments);
if (!(o instanceof IAgent))
- throw new ACFException("Class '"+className+"' does not implement IAgent.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IAgent.");
tc.save(agentName,o);
}
catch (InvocationTargetException e)
@@ -65,42 +65,42 @@ public class AgentFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
- throw new ACFException("No class implementing IAgent called '"+
+ throw new ManifoldCFException("No class implementing IAgent called '"+
className+"'.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IAgent implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IAgent implementation '"+
className+"'. Need xxx(ConfigParams).",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IAgent implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IAgent implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IAgent implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IAgent implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IAgent implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IAgent implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IAgent implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IAgent implementation '"+className+"'",
e);
}
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentManagerFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/AgentManagerFactory.java Mon Oct 4 14:32:19 2010
@@ -38,15 +38,15 @@ public class AgentManagerFactory
*@return the manager.
*/
public static IAgentManager make(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
Object o = threadContext.get(agentManager);
if (o == null || !(o instanceof IAgentManager))
{
IDBInterface database = DBInterfaceFactory.make(threadContext,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.agents.agentmanager.AgentManager(threadContext,database);
threadContext.save(agentManager,o);
@@ -60,7 +60,7 @@ public class AgentManagerFactory
*@return true if the connection is in use, false otherwise.
*/
public static boolean isOutputConnectionInUse(IThreadContext threadContext, String connName)
- throws ACFException
+ throws ManifoldCFException
{
// Instantiate the list of IAgent objects
IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -79,7 +79,7 @@ public class AgentManagerFactory
*@param connectionNames is the set of connection names.
*/
public static void noteOutputConnectorDeregistration(IThreadContext threadContext, String[] connectionNames)
- throws ACFException
+ throws ManifoldCFException
{
// Instantiate the list of IAgent objects
IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -97,7 +97,7 @@ public class AgentManagerFactory
*@param connectionNames is the set of connection names.
*/
public static void noteOutputConnectorRegistration(IThreadContext threadContext, String[] connectionNames)
- throws ACFException
+ throws ManifoldCFException
{
// Instantiate the list of IAgent objects
IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -114,7 +114,7 @@ public class AgentManagerFactory
*@param connectionName is the connection name.
*/
public static void noteOutputConnectionChange(IThreadContext threadContext, String connectionName)
- throws ACFException
+ throws ManifoldCFException
{
// Instantiate the list of IAgent objects
IAgent[] theAgents = instantiateAllAgents(threadContext);
@@ -130,7 +130,7 @@ public class AgentManagerFactory
*@return the array of such objects.
*/
public static IAgent[] instantiateAllAgents(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
IAgentManager manager = make(threadContext);
String[] allAgents = manager.getAllAgents();
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgent.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgent.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgent.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgent.java Mon Oct 4 14:32:19 2010
@@ -24,7 +24,7 @@ import org.apache.manifoldcf.core.interf
* start-up time; they run independently until the JVM is shut down.
* All agent classes are expected to support the following constructor:
*
-* xxx(IThreadContext tc) throws ACFException
+* xxx(IThreadContext tc) throws ManifoldCFException
*
*/
public interface IAgent
@@ -34,47 +34,47 @@ public interface IAgent
/** Install agent. This usually installs the agent's database tables etc.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall agent. This must clean up everything the agent is responsible for.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Start the agent. This method should spin up the agent threads, and
* then return.
*/
public void startAgent()
- throws ACFException;
+ throws ManifoldCFException;
/** Stop the agent. This should shut down the agent threads.
*/
public void stopAgent()
- throws ACFException;
+ throws ManifoldCFException;
/** Request permission from agent to delete an output connection.
*@param connName is the name of the output connection.
*@return true if the connection is in use, false otherwise.
*/
public boolean isOutputConnectionInUse(String connName)
- throws ACFException;
+ throws ManifoldCFException;
/** Note the deregistration of a set of output connections.
*@param connectionNames are the names of the connections being deregistered.
*/
public void noteOutputConnectorDeregistration(String[] connectionNames)
- throws ACFException;
+ throws ManifoldCFException;
/** Note the registration of a set of output connections.
*@param connectionNames are the names of the connections being registered.
*/
public void noteOutputConnectorRegistration(String[] connectionNames)
- throws ACFException;
+ throws ManifoldCFException;
/** Note a change in configuration for an output connection.
*@param connectionName is the name of the connection being changed.
*/
public void noteOutputConnectionChange(String connectionName)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgentManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgentManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgentManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IAgentManager.java Mon Oct 4 14:32:19 2010
@@ -29,24 +29,24 @@ public interface IAgentManager
/** Install.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall. Also uninstalls all remaining agents.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Register an agent.
*@param className is the class.
*/
public void registerAgent(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Unregister an agent.
*@param className is the class to unregister.
*/
public void unregisterAgent(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Remove an agent.
* Use this when the agent cannot be invoked. The agent becomes unavailable,
@@ -54,12 +54,12 @@ public interface IAgentManager
*@param className is the class to remove.
*/
public void removeAgent(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Get a list of all registered agent class names.
*@return the classnames in an array.
*/
public String[] getAllAgents()
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java Mon Oct 4 14:32:19 2010
@@ -46,28 +46,28 @@ public interface IIncrementalIngester
/** Install the incremental ingestion manager.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall the incremental ingestion manager.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Come up with a maximum time (in minutes) for re-analyzing tables.
*@return the time, in minutes.
*/
public int getAnalyzeTime()
- throws ACFException;
+ throws ManifoldCFException;
/** Analyze database tables.
*/
public void analyzeTables()
- throws ACFException;
+ throws ManifoldCFException;
/** Flush all knowledge of what was ingested before.
*/
public void clearAll()
- throws ACFException;
+ throws ManifoldCFException;
/** Check if a mime type is indexable.
*@param outputConnectionName is the name of the output connection associated with this action.
@@ -75,7 +75,7 @@ public interface IIncrementalIngester
*@return true if the mimeType is indexable.
*/
public boolean checkMimeTypeIndexable(String outputConnectionName, String mimeType)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Check if a file is indexable.
*@param outputConnectionName is the name of the output connection associated with this action.
@@ -83,7 +83,7 @@ public interface IIncrementalIngester
*@return true if the local file is indexable.
*/
public boolean checkDocumentIndexable(String outputConnectionName, File localFile)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Record a document version, but don't ingest it.
* The purpose of this method is to keep track of the frequency at which ingestion "attempts" take place.
@@ -99,7 +99,7 @@ public interface IIncrementalIngester
String identifierClass, String identifierHash,
String documentVersion, long recordTime,
IOutputActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Ingest a document.
* This ingests the document, and notes it. If this is a repeat ingestion of the document, this
@@ -126,7 +126,7 @@ public interface IIncrementalIngester
RepositoryDocument data,
long ingestTime, String documentURI,
IOutputActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Note the fact that we checked a document (and found that it did not need to be ingested, because the
* versions agreed).
@@ -138,7 +138,7 @@ public interface IIncrementalIngester
public void documentCheckMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes,
long checkTime)
- throws ACFException;
+ throws ManifoldCFException;
/** Note the fact that we checked a document (and found that it did not need to be ingested, because the
* versions agreed).
@@ -150,7 +150,7 @@ public interface IIncrementalIngester
public void documentCheck(String outputConnectionName,
String identifierClass, String identifierHash,
long checkTime)
- throws ACFException;
+ throws ManifoldCFException;
/** Delete multiple documents from the search engine index.
*@param outputConnectionNames are the names of the output connections associated with this action.
@@ -161,7 +161,7 @@ public interface IIncrementalIngester
public void documentDeleteMultiple(String[] outputConnectionNames,
String[] identifierClasses, String[] identifierHashes,
IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Delete multiple documents from the search engine index.
*@param outputConnectionName is the name of the output connection associated with this action.
@@ -172,7 +172,7 @@ public interface IIncrementalIngester
public void documentDeleteMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes,
IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Delete a document from the search engine index.
*@param outputConnectionName is the name of the output connection associated with this action.
@@ -183,7 +183,7 @@ public interface IIncrementalIngester
public void documentDelete(String outputConnectionName,
String identifierClass, String identifierHash,
IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Look up ingestion data for a SET of documents.
*@param outputConnectionNames are the names of the output connections associated with this action.
@@ -194,7 +194,7 @@ public interface IIncrementalIngester
*/
public DocumentIngestStatus[] getDocumentIngestDataMultiple(String[] outputConnectionNames,
String[] identifierClasses, String[] identifierHashes)
- throws ACFException;
+ throws ManifoldCFException;
/** Look up ingestion data for a SET of documents.
*@param outputConnectionName is the names of the output connection associated with this action.
@@ -205,7 +205,7 @@ public interface IIncrementalIngester
*/
public DocumentIngestStatus[] getDocumentIngestDataMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes)
- throws ACFException;
+ throws ManifoldCFException;
/** Look up ingestion data for a documents.
*@param outputConnectionName is the name of the output connection associated with this action.
@@ -215,7 +215,7 @@ public interface IIncrementalIngester
*/
public DocumentIngestStatus getDocumentIngestData(String outputConnectionName,
String identifierClass, String identifierHash)
- throws ACFException;
+ throws ManifoldCFException;
/** Calculate the average time interval between changes for a document.
* This is based on the data gathered for the document.
@@ -226,7 +226,7 @@ public interface IIncrementalIngester
*/
public long[] getDocumentUpdateIntervalMultiple(String outputConnectionName,
String[] identifierClasses, String[] identifierHashes)
- throws ACFException;
+ throws ManifoldCFException;
/** Calculate the average time interval between changes for a document.
* This is based on the data gathered for the document.
@@ -237,7 +237,7 @@ public interface IIncrementalIngester
*/
public long getDocumentUpdateInterval(String outputConnectionName,
String identifierClass, String identifierHash)
- throws ACFException;
+ throws ManifoldCFException;
/** Reset all documents belonging to a specific output connection, because we've got information that
* that system has been reconfigured. This will force all such documents to be reindexed the next time
@@ -245,6 +245,6 @@ public interface IIncrementalIngester
*@param outputConnectionName is the name of the output connection associated with this action.
*/
public void resetOutputConnection(String outputConnectionName)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIngestLogger.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIngestLogger.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIngestLogger.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIngestLogger.java Mon Oct 4 14:32:19 2010
@@ -40,7 +40,7 @@ public interface IIngestLogger
*/
public void recordIngestionAttempt(String documentIdentifier, Long startTime, Long dataSize,
String entityIdentifier, String resultCode, String resultDescription)
- throws ACFException;
+ throws ManifoldCFException;
/** Record time-stamped information about a deletion attempt.
*@param documentIdentifier is the internal document identifier being described.
@@ -55,6 +55,6 @@ public interface IIngestLogger
*/
public void recordDeletionAttempt(String documentIdentifier, Long startTime,
String entityIdentifier, String resultCode, String resultDescription)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputAddActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputAddActivity.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputAddActivity.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputAddActivity.java Mon Oct 4 14:32:19 2010
@@ -35,6 +35,6 @@ public interface IOutputAddActivity exte
*@return the properly qualified access token.
*/
public String qualifyAccessToken(String authorityNameString, String accessToken)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectionManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectionManager.java Mon Oct 4 14:32:19 2010
@@ -29,33 +29,33 @@ public interface IOutputConnectionManage
/** Install the manager.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall the manager.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Export configuration */
public void exportConfiguration(java.io.OutputStream os)
- throws java.io.IOException, ACFException;
+ throws java.io.IOException, ManifoldCFException;
/** Import configuration */
public void importConfiguration(java.io.InputStream is)
- throws java.io.IOException, ACFException;
+ throws java.io.IOException, ManifoldCFException;
/** Obtain a list of the output connections, ordered by name.
*@return an array of connection objects.
*/
public IOutputConnection[] getAllConnections()
- throws ACFException;
+ throws ManifoldCFException;
/** Load an output connection by name.
*@param name is the name of the output connection.
*@return the loaded connection object, or null if not found.
*/
public IOutputConnection load(String name)
- throws ACFException;
+ throws ManifoldCFException;
/** Load a set of output connections.
*@param names are the names of the output connections.
@@ -63,41 +63,41 @@ public interface IOutputConnectionManage
* values for those not found.
*/
public IOutputConnection[] loadMultiple(String[] names)
- throws ACFException;
+ throws ManifoldCFException;
/** Create a new output connection object.
*@return the new object.
*/
public IOutputConnection create()
- throws ACFException;
+ throws ManifoldCFException;
/** Save an output connection object.
*@param object is the object to save.
*@return true if the object was created, false otherwise.
*/
public boolean save(IOutputConnection object)
- throws ACFException;
+ throws ManifoldCFException;
/** Delete an output connection.
*@param name is the name of the connection to delete. If the
* name does not exist, no error is returned.
*/
public void delete(String name)
- throws ACFException;
+ throws ManifoldCFException;
/** Get a list of output connections that share the same connector.
*@param className is the class name of the connector.
*@return the repository connections that use that connector.
*/
public String[] findConnectionsForConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Check if underlying connector exists.
*@param name is the name of the connection to check.
*@return true if the underlying connector is registered.
*/
public boolean checkConnectorExists(String name)
- throws ACFException;
+ throws ManifoldCFException;
// Schema related
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java Mon Oct 4 14:32:19 2010
@@ -71,7 +71,7 @@ public interface IOutputConnector extend
*@return true if the resource is found, false if not. In either case, output may be filled in.
*/
public boolean requestInfo(Configuration output, String command)
- throws ACFException;
+ throws ManifoldCFException;
/** 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.
@@ -79,7 +79,7 @@ public interface IOutputConnector extend
*@return true if the mime type is indexable by this connector.
*/
public boolean checkMimeTypeIndexable(String mimeType)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** 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
@@ -88,7 +88,7 @@ public interface IOutputConnector extend
*@return true if the file is indexable.
*/
public boolean checkDocumentIndexable(File localFile)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** 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.
@@ -102,7 +102,7 @@ public interface IOutputConnector extend
* the document will not need to be sent again to the output data store.
*/
public String getOutputDescription(OutputSpecification spec)
- throws ACFException;
+ throws ManifoldCFException;
/** 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
@@ -119,7 +119,7 @@ public interface IOutputConnector extend
*@return the document status (accepted or permanently rejected).
*/
public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Remove a document using the connector.
* Note that the last outputDescription is included, since it may be necessary for the connector to use such information to know how to properly remove the document.
@@ -129,7 +129,7 @@ public interface IOutputConnector extend
*@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.
*/
public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
/** Notify the connector of a completed job.
* This is meant to allow the connector to flush any internal data structures it has been keeping around, or to tell the output repository that this
@@ -137,7 +137,7 @@ public interface IOutputConnector extend
*@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.
*/
public void noteJobComplete(IOutputNotifyActivity activities)
- throws ACFException, ServiceInterruption;
+ throws ManifoldCFException, ServiceInterruption;
// UI support methods.
//
@@ -156,7 +156,7 @@ public interface IOutputConnector extend
*@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, ArrayList tabsArray)
- throws ACFException, IOException;
+ 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.
@@ -167,7 +167,7 @@ public interface IOutputConnector extend
*@param tabName is the current tab name.
*/
public void outputSpecificationBody(IHTTPOutput out, OutputSpecification os, String tabName)
- throws ACFException, IOException;
+ throws ManifoldCFException, IOException;
/** 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
@@ -178,7 +178,7 @@ public interface IOutputConnector extend
*@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 ACFException;
+ throws ManifoldCFException;
/** 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.
@@ -187,7 +187,7 @@ public interface IOutputConnector extend
*@param os is the current output specification for this job.
*/
public void viewSpecification(IHTTPOutput out, OutputSpecification os)
- throws ACFException, IOException;
+ throws ManifoldCFException, IOException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectorManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnectorManager.java Mon Oct 4 14:32:19 2010
@@ -30,12 +30,12 @@ public interface IOutputConnectorManager
/** Install.
*/
public void install()
- throws ACFException;
+ throws ManifoldCFException;
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws ACFException;
+ throws ManifoldCFException;
/** Register a new connector.
* The connector's install method will also be called.
@@ -43,14 +43,14 @@ public interface IOutputConnectorManager
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Unregister a connector.
* The connector's deinstall method will also be called.
*@param className is the connector class to unregister.
*/
public void unregisterConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Remove a connector.
* Use this method when the connector doesn't seem to be in the
@@ -58,27 +58,27 @@ public interface IOutputConnectorManager
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Get ordered list of connectors.
*@return a resultset with the columns "description" and "classname".
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws ACFException;
+ throws ManifoldCFException;
/** Get a description given a class name.
*@param className is the class name.
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws ACFException;
+ throws ManifoldCFException;
/** Check if a particular connector is installed or not.
*@param className is the class name of the connector.
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputHistoryActivity.java Mon Oct 4 14:32:19 2010
@@ -44,6 +44,6 @@ public interface IOutputHistoryActivity
*/
public void recordActivity(Long startTime, String activityType, Long dataSize,
String entityURI, String resultCode, String resultDescription)
- throws ACFException;
+ throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IncrementalIngesterFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IncrementalIngesterFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IncrementalIngesterFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IncrementalIngesterFactory.java Mon Oct 4 14:32:19 2010
@@ -37,15 +37,15 @@ public class IncrementalIngesterFactory
/** Get an appropriate incremental ingest manager handle.
*/
public static IIncrementalIngester make(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
Object o = threadContext.get(ingestManager);
if (o == null || !(o instanceof IIncrementalIngester))
{
IDBInterface database = DBInterfaceFactory.make(threadContext,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.agents.incrementalingest.IncrementalIngester(threadContext,database);
threadContext.save(ingestManager,o);
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java Mon Oct 4 14:32:19 2010
@@ -19,7 +19,7 @@
package org.apache.manifoldcf.agents.interfaces;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
import java.util.*;
@@ -41,15 +41,15 @@ public class OutputConnectionManagerFact
*@return the handle.
*/
public static IOutputConnectionManager make(IThreadContext tc)
- throws ACFException
+ throws ManifoldCFException
{
Object o = tc.get(objectName);
if (o == null || !(o instanceof IOutputConnectionManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.agents.outputconnection.OutputConnectionManager(tc,database);
tc.save(objectName,o);
@@ -62,7 +62,7 @@ public class OutputConnectionManagerFact
*@return the sorted list of output connection activities.
*/
public static String[] getAllOutputActivities(IThreadContext tc)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnectionManager manager = make(tc);
IOutputConnection[] connections = manager.getAllConnections();
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java Mon Oct 4 14:32:19 2010
@@ -19,7 +19,7 @@
package org.apache.manifoldcf.agents.interfaces;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.system.ACF;
+import org.apache.manifoldcf.agents.system.ManifoldCF;
import java.util.*;
import java.io.*;
@@ -45,7 +45,7 @@ public class OutputConnectorFactory
*@param className is the class name.
*/
public static void install(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnector connector = getConnectorNoCheck(className);
connector.install(threadContext);
@@ -55,7 +55,7 @@ public class OutputConnectorFactory
*@param className is the class name.
*/
public static void deinstall(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnector connector = getConnectorNoCheck(className);
connector.deinstall(threadContext);
@@ -66,7 +66,7 @@ public class OutputConnectorFactory
*@return the list of activities.
*/
public static String[] getActivitiesList(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -79,7 +79,7 @@ public class OutputConnectorFactory
/** Output the configuration header section.
*/
public static void outputConfigurationHeader(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
IOutputConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -90,7 +90,7 @@ public class OutputConnectorFactory
/** Output the configuration body section.
*/
public static void outputConfigurationBody(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, String tabName)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
IOutputConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -101,7 +101,7 @@ public class OutputConnectorFactory
/** Process configuration post data for a connector.
*/
public static String processConfigurationPost(IThreadContext threadContext, String className, IPostParameters variableContext, ConfigParams configParams)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -112,7 +112,7 @@ public class OutputConnectorFactory
/** View connector configuration.
*/
public static void viewConfiguration(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams configParams)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
IOutputConnector connector = getConnector(threadContext, className);
// We want to be able to view connections even if they have unregistered connectors.
@@ -126,18 +126,18 @@ public class OutputConnectorFactory
*@return the instance.
*/
public static IOutputConnector getConnectorNoCheck(String className)
- throws ACFException
+ throws ManifoldCFException
{
try
{
- Class theClass = ACF.findClass(className);
+ Class theClass = ManifoldCF.findClass(className);
Class[] argumentClasses = new Class[0];
// Look for a constructor
Constructor c = theClass.getConstructor(argumentClasses);
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IOutputConnector))
- throw new ACFException("Class '"+className+"' does not implement IOutputConnector.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IOutputConnector.");
return (IOutputConnector)o;
}
catch (InvocationTargetException e)
@@ -146,41 +146,41 @@ public class OutputConnectorFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
- throw new ACFException("No output connector class '"+className+"' was found.",
+ throw new ManifoldCFException("No output connector class '"+className+"' was found.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IOutputConnector implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IOutputConnector implementation '"+
className+"'. Need xxx(ConfigParams).",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IOutputConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IOutputConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IOutputConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IOutputConnector implementation '"+className+"'",
e);
}
@@ -191,7 +191,7 @@ public class OutputConnectorFactory
*@return the instance.
*/
protected static IOutputConnector getConnector(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnectorManager connMgr = OutputConnectorManagerFactory.make(threadContext);
if (connMgr.isInstalled(className) == false)
@@ -199,14 +199,14 @@ public class OutputConnectorFactory
try
{
- Class theClass = ACF.findClass(className);
+ Class theClass = ManifoldCF.findClass(className);
Class[] argumentClasses = new Class[0];
// Look for a constructor
Constructor c = theClass.getConstructor(argumentClasses);
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IOutputConnector))
- throw new ACFException("Class '"+className+"' does not implement IOutputConnector.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IOutputConnector.");
return (IOutputConnector)o;
}
catch (InvocationTargetException e)
@@ -215,7 +215,7 @@ public class OutputConnectorFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
@@ -224,37 +224,37 @@ public class OutputConnectorFactory
if (connMgr.isInstalled(className) == false)
return null;
- throw new ACFException("No output connector class '"+className+"' was found.",
+ throw new ManifoldCFException("No output connector class '"+className+"' was found.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IOutputConnector implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IOutputConnector implementation '"+
className+"'. Need xxx(ConfigParams).",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IOutputConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IOutputConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IOutputConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IOutputConnector implementation '"+className+"'",
e);
}
@@ -265,7 +265,7 @@ public class OutputConnectorFactory
*/
public static IOutputConnector[] grabMultiple(IThreadContext threadContext,
String[] orderingKeys, String[] classNames, ConfigParams[] configInfos, int[] maxPoolSizes)
- throws ACFException
+ throws ManifoldCFException
{
IOutputConnector[] rval = new IOutputConnector[classNames.length];
HashMap orderMap = new HashMap();
@@ -273,7 +273,7 @@ public class OutputConnectorFactory
while (i < orderingKeys.length)
{
if (orderMap.get(orderingKeys[i]) != null)
- throw new ACFException("Found duplicate order key");
+ throw new ManifoldCFException("Found duplicate order key");
orderMap.put(orderingKeys[i],new Integer(i));
i++;
}
@@ -302,13 +302,13 @@ public class OutputConnectorFactory
{
release(rval[index]);
}
- catch (ACFException e2)
+ catch (ManifoldCFException e2)
{
}
}
- if (e instanceof ACFException)
+ if (e instanceof ManifoldCFException)
{
- throw (ACFException)e;
+ throw (ManifoldCFException)e;
}
throw (Error)e;
}
@@ -326,7 +326,7 @@ public class OutputConnectorFactory
*/
public static IOutputConnector grab(IThreadContext threadContext,
String className, ConfigParams configInfo, int maxPoolSize)
- throws ACFException
+ throws ManifoldCFException
{
// We want to get handles off the pool and use them. But the
// handles we fetch have to have the right config information.
@@ -356,10 +356,10 @@ public class OutputConnectorFactory
/** Release multiple output connectors.
*/
public static void releaseMultiple(IOutputConnector[] connectors)
- throws ACFException
+ throws ManifoldCFException
{
int i = 0;
- ACFException currentException = null;
+ ManifoldCFException currentException = null;
while (i < connectors.length)
{
IOutputConnector c = connectors[i++];
@@ -367,7 +367,7 @@ public class OutputConnectorFactory
{
release(c);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
if (currentException == null)
currentException = e;
@@ -381,7 +381,7 @@ public class OutputConnectorFactory
*@param connector is the connector to release.
*/
public static void release(IOutputConnector connector)
- throws ACFException
+ throws ManifoldCFException
{
// If the connector is null, skip the release, because we never really got the connector in the first place.
if (connector == null)
@@ -408,7 +408,7 @@ public class OutputConnectorFactory
* This method polls all inactive handles.
*/
public static void pollAllConnectors(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
// System.out.println("Pool stats:");
@@ -433,7 +433,7 @@ public class OutputConnectorFactory
*@param threadContext is the local thread context.
*/
public static void closeAllConnectors(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
// Go through the whole pool and clean it out
synchronized (poolHash)
@@ -525,7 +525,7 @@ public class OutputConnectorFactory
*@return the connector, or null if no connector could be connected.
*/
public synchronized IOutputConnector getConnector(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
while (numFree == 0)
{
@@ -535,7 +535,7 @@ public class OutputConnectorFactory
}
catch (InterruptedException e)
{
- throw new ACFException("Interrupted: "+e.getMessage(),e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
}
@@ -551,14 +551,14 @@ public class OutputConnectorFactory
try
{
- Class theClass = ACF.findClass(className);
+ Class theClass = ManifoldCF.findClass(className);
Class[] argumentClasses = new Class[0];
// Look for a constructor
Constructor c = theClass.getConstructor(argumentClasses);
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IOutputConnector))
- throw new ACFException("Class '"+className+"' does not implement IOutputConnector.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IOutputConnector.");
rc = (IOutputConnector)o;
rc.connect(configParams);
}
@@ -568,7 +568,7 @@ public class OutputConnectorFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
@@ -578,37 +578,37 @@ public class OutputConnectorFactory
if (connMgr.isInstalled(className) == false)
return null;
- throw new ACFException("No output connector class '"+className+"' was found.",
+ throw new ManifoldCFException("No output connector class '"+className+"' was found.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IOutputConnector implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IOutputConnector implementation '"+
className+"'. Need xxx(ConfigParams).",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IOutputConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IOutputConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IOutputConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IOutputConnector implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IOutputConnector implementation '"+className+"'",
e);
}
}
@@ -625,7 +625,7 @@ public class OutputConnectorFactory
*@param connector is the connector.
*/
public synchronized void releaseConnector(IOutputConnector connector)
- throws ACFException
+ throws ManifoldCFException
{
if (connector == null)
return;
@@ -641,7 +641,7 @@ public class OutputConnectorFactory
/** Notify all free connectors.
*/
public synchronized void pollAll(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
int i = 0;
while (i < stack.size())
@@ -657,7 +657,7 @@ public class OutputConnectorFactory
/** Release all free connectors.
*/
public synchronized void releaseAll(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
while (stack.size() > 0)
{
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorManagerFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorManagerFactory.java Mon Oct 4 14:32:19 2010
@@ -38,16 +38,16 @@ public class OutputConnectorManagerFacto
*@return the output connector manager handle.
*/
public static IOutputConnectorManager make(IThreadContext tc)
- throws ACFException
+ throws ManifoldCFException
{
Object o = tc.get(connMgr);
if (o == null || !(o instanceof IOutputConnectorManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.agents.outputconnmgr.OutputConnectorManager(tc,database);
tc.save(connMgr,o);
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputSpecification.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputSpecification.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputSpecification.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputSpecification.java Mon Oct 4 14:32:19 2010
@@ -38,7 +38,7 @@ public class OutputSpecification extends
*@param xml is the input XML.
*/
public OutputSpecification(String xml)
- throws ACFException
+ throws ManifoldCFException
{
super(xml);
}
Modified: incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java (original)
+++ incubator/lcf/trunk/modules/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/RepositoryDocument.java Mon Oct 4 14:32:19 2010
@@ -171,7 +171,7 @@ public class RepositoryDocument
* to remove the entry from the document.
*/
public void addField(String fieldName, Reader[] fieldData)
- throws ACFException
+ throws ManifoldCFException
{
if (fieldData == null)
fields.remove(fieldName);
@@ -184,7 +184,7 @@ public class RepositoryDocument
*@param fieldData is the single-valued data (as a Reader). Null means "no value".
*/
public void addField(String fieldName, Reader fieldData)
- throws ACFException
+ throws ManifoldCFException
{
fields.put(fieldName,new Reader[]{fieldData});
}
@@ -195,7 +195,7 @@ public class RepositoryDocument
* to remove the entry from the document.
*/
public void addField(String fieldName, String[] fieldData)
- throws ACFException
+ throws ManifoldCFException
{
if (fieldData == null)
fields.remove(fieldName);
@@ -208,7 +208,7 @@ public class RepositoryDocument
*@param fieldData is the single-valued data (as a String). Null means "no value".
*/
public void addField(String fieldName, String fieldData)
- throws ACFException
+ throws ManifoldCFException
{
fields.put(fieldName,new String[]{fieldData});
}